Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(KONFLUX-1503): Set some requests and limits so pods can spread across cluster nodes #1247

Merged
merged 3 commits into from
Aug 12, 2024
Merged

feat(KONFLUX-1503): Set some requests and limits so pods can spread across cluster nodes #1247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a324c3d
feat(KONFLUX-1503): Set some requests and limits so pods can spread a…
jhutar Aug 5, 2024
e981645
chore: Make PR checks happy
jhutar Aug 5, 2024
e98c5da
feat: Adding another 2 big players to the mix
jhutar Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 60 additions & 3 deletions task/buildah-oci-ta/0.2/buildah-oci-ta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,10 +422,11 @@ spec:
echo "$BASE_IMAGES" >/shared/base_images_from_dockerfile
computeResources:
limits:
memory: 4Gi
cpu: "4"
memory: 8Gi
requests:
cpu: 250m
memory: 512Mi
cpu: "1"
memory: 2Gi
lcarva marked this conversation as resolved.
Show resolved Hide resolved
securityContext:
capabilities:
add:
Expand All @@ -444,6 +445,13 @@ spec:
find $(cat /shared/container_path) -xtype l -delete
echo "Running syft on the image filesystem"
syft dir:$(cat /shared/container_path) --output cyclonedx-json=/var/workdir/sbom-image.json
computeResources:
limits:
cpu: "2"
memory: 4Gi
requests:
cpu: 500m
memory: 1Gi
- name: analyse-dependencies-java-sbom
image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
volumeMounts:
Expand All @@ -458,6 +466,13 @@ spec:
else
touch $(results.JAVA_COMMUNITY_DEPENDENCIES.path)
fi
computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
securityContext:
runAsUser: 0
- name: merge-syft-sboms
Expand Down Expand Up @@ -492,6 +507,13 @@ spec:
# write the CycloneDX unified SBOM
with open("./sbom-cyclonedx.json", "w") as f:
json.dump(image_sbom, f, indent=4)
computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
securityContext:
runAsUser: 0
- name: merge-cachi2-sbom
Expand All @@ -505,6 +527,13 @@ spec:
else
echo "Skipping step since no Cachi2 SBOM was produced"
fi
computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
securityContext:
runAsUser: 0
- name: create-purl-sbom
Expand All @@ -522,6 +551,13 @@ spec:

with open("sbom-purl.json", "w") as output_file:
json.dump(purl_content, output_file, indent=4)
computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
securityContext:
runAsUser: 0
- name: create-base-images-sbom
Expand All @@ -532,6 +568,13 @@ spec:
--sbom=sbom-cyclonedx.json \
--base-images-from-dockerfile=/shared/base_images_from_dockerfile \
--base-images-digests=/shared/base_images_digests
computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
securityContext:
runAsUser: 0
- name: inject-sbom-and-push
Expand Down Expand Up @@ -596,6 +639,13 @@ spec:
sbom_digest="$(sha256sum sbom-cyclonedx.json | cut -d' ' -f1)"
# The SBOM_BLOB_URL is created by `cosign attach sbom`.
echo -n "${sbom_repo}@sha256:${sbom_digest}" | tee "$(results.SBOM_BLOB_URL.path)"
computeResources:
limits:
cpu: "4"
memory: 4Gi
requests:
cpu: "1"
memory: 1Gi
securityContext:
capabilities:
add:
Expand All @@ -617,3 +667,10 @@ spec:
fi

cosign attach sbom --sbom sbom-cyclonedx.json --type cyclonedx "$(cat "$(results.IMAGE_REF.path)")"
computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
71 changes: 60 additions & 11 deletions task/buildah-remote-oci-ta/0.2/buildah-remote-oci-ta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,10 +206,11 @@ spec:
- $(params.BUILD_ARGS[*])
computeResources:
limits:
memory: 4Gi
cpu: "4"
memory: 8Gi
requests:
cpu: 250m
memory: 512Mi
cpu: "1"
memory: 2Gi
hugares marked this conversation as resolved.
Show resolved Hide resolved
env:
- name: COMMIT_SHA
value: $(params.COMMIT_SHA)
Expand Down Expand Up @@ -502,7 +503,13 @@ spec:
name: ssh
readOnly: true
workingDir: /var/workdir
- computeResources: {}
- computeResources:
limits:
cpu: "2"
memory: 4Gi
requests:
cpu: 500m
memory: 1Gi
image: quay.io/redhat-appstudio/syft:v0.105.1@sha256:1910b829997650c696881e5fc2fc654ddf3184c27edb1b2024e9cb2ba51ac431
name: sbom-syft-generate
script: |
Expand All @@ -522,7 +529,13 @@ spec:
- mountPath: /shared
name: shared
workingDir: /var/workdir/source
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
name: analyse-dependencies-java-sbom
script: |
Expand All @@ -544,7 +557,13 @@ spec:
name: varlibcontainers
- mountPath: /shared
name: shared
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: registry.access.redhat.com/ubi9/python-39:1-192.1722518946@sha256:0176b477075984d5a502253f951d2502f0763c551275f9585ac515b9f241d73d
name: merge-syft-sboms
script: |
Expand Down Expand Up @@ -579,7 +598,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: /var/workdir
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/redhat-appstudio/cachi2:0.9.1@sha256:df67f9e063b544a8c49a271359377fed560562615e0278f6d0b9a3485f3f8fad
name: merge-cachi2-sbom
script: |
Expand All @@ -598,7 +623,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: /var/workdir
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: registry.access.redhat.com/ubi9/python-39:1-192.1722518946@sha256:0176b477075984d5a502253f951d2502f0763c551275f9585ac515b9f241d73d
name: create-purl-sbom
script: |
Expand All @@ -616,7 +647,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: /var/workdir
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/redhat-appstudio/base-images-sbom-script@sha256:667669e3def018f9dbb8eaf8868887a40bc07842221e9a98f6787edcff021840
name: create-base-images-sbom
script: |
Expand All @@ -632,7 +669,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: /var/workdir
- computeResources: {}
- computeResources:
limits:
cpu: "4"
memory: 4Gi
requests:
cpu: "1"
memory: 1Gi
image: quay.io/konflux-ci/buildah:latest@sha256:7cb5a35b7fe44e397fbf3b834f3bd8dcd9403a7c0a0b51469e6ec75b107d0846
name: inject-sbom-and-push
script: |
Expand Down Expand Up @@ -703,7 +746,13 @@ spec:
name: trusted-ca
readOnly: true
workingDir: /var/workdir
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/konflux-ci/appstudio-utils:ab6b0b8e40e440158e7288c73aff1cf83a2cc8a9@sha256:24179f0efd06c65d16868c2d7eb82573cce8e43533de6cea14fec3b7446e0b14
name: upload-sbom
script: |
Expand Down
71 changes: 60 additions & 11 deletions task/buildah-remote/0.2/buildah-remote.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,11 @@ spec:
- $(params.BUILD_ARGS[*])
computeResources:
limits:
memory: 4Gi
cpu: "4"
memory: 8Gi
requests:
cpu: 250m
memory: 512Mi
cpu: "1"
memory: 2Gi
env:
- name: COMMIT_SHA
value: $(params.COMMIT_SHA)
Expand Down Expand Up @@ -484,7 +485,13 @@ spec:
name: ssh
readOnly: true
workingDir: $(workspaces.source.path)
- computeResources: {}
- computeResources:
limits:
cpu: "2"
memory: 4Gi
requests:
cpu: 500m
memory: 1Gi
image: quay.io/redhat-appstudio/syft:v0.105.1@sha256:1910b829997650c696881e5fc2fc654ddf3184c27edb1b2024e9cb2ba51ac431
name: sbom-syft-generate
script: |
Expand All @@ -504,7 +511,13 @@ spec:
- mountPath: /shared
name: shared
workingDir: $(workspaces.source.path)/source
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/redhat-appstudio/hacbs-jvm-build-request-processor:127ee0c223a2b56a9bd20a6f2eaeed3bd6015f77
name: analyse-dependencies-java-sbom
script: |
Expand All @@ -526,7 +539,13 @@ spec:
name: varlibcontainers
- mountPath: /shared
name: shared
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: registry.access.redhat.com/ubi9/python-39:1-192.1722518946@sha256:0176b477075984d5a502253f951d2502f0763c551275f9585ac515b9f241d73d
name: merge-syft-sboms
script: |
Expand Down Expand Up @@ -561,7 +580,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: $(workspaces.source.path)
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/redhat-appstudio/cachi2:0.9.1@sha256:df67f9e063b544a8c49a271359377fed560562615e0278f6d0b9a3485f3f8fad
name: merge-cachi2-sbom
script: |
Expand All @@ -580,7 +605,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: $(workspaces.source.path)
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: registry.access.redhat.com/ubi9/python-39:1-192.1722518946@sha256:0176b477075984d5a502253f951d2502f0763c551275f9585ac515b9f241d73d
name: create-purl-sbom
script: |
Expand All @@ -598,7 +629,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: $(workspaces.source.path)
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/redhat-appstudio/base-images-sbom-script@sha256:667669e3def018f9dbb8eaf8868887a40bc07842221e9a98f6787edcff021840
name: create-base-images-sbom
script: |
Expand All @@ -614,7 +651,13 @@ spec:
securityContext:
runAsUser: 0
workingDir: $(workspaces.source.path)
- computeResources: {}
- computeResources:
limits:
cpu: "4"
memory: 4Gi
requests:
cpu: "1"
memory: 1Gi
image: quay.io/konflux-ci/buildah:latest@sha256:7cb5a35b7fe44e397fbf3b834f3bd8dcd9403a7c0a0b51469e6ec75b107d0846
name: inject-sbom-and-push
script: |
Expand Down Expand Up @@ -685,7 +728,13 @@ spec:
name: trusted-ca
readOnly: true
workingDir: $(workspaces.source.path)
- computeResources: {}
- computeResources:
limits:
cpu: 200m
memory: 512Mi
requests:
cpu: 100m
memory: 256Mi
image: quay.io/konflux-ci/appstudio-utils:ab6b0b8e40e440158e7288c73aff1cf83a2cc8a9@sha256:24179f0efd06c65d16868c2d7eb82573cce8e43533de6cea14fec3b7446e0b14
name: upload-sbom
script: |
Expand Down
Loading
Loading