From bdaf67ae2506fa614b60778630de325676869395 Mon Sep 17 00:00:00 2001 From: Jan Hutar Date: Wed, 7 Aug 2024 09:34:45 +0200 Subject: [PATCH] feat: Adding another 2 big players to the mix --- task/clair-scan/0.1/clair-scan.yaml | 21 +++++++++++++++++++++ task/clamav-scan/0.1/clamav-scan.yaml | 14 +++++++++++--- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/task/clair-scan/0.1/clair-scan.yaml b/task/clair-scan/0.1/clair-scan.yaml index b95b8613cc..7d4df084dc 100644 --- a/task/clair-scan/0.1/clair-scan.yaml +++ b/task/clair-scan/0.1/clair-scan.yaml @@ -30,6 +30,13 @@ spec: - name: get-image-manifests image: quay.io/redhat-appstudio/konflux-test:v1.4.5@sha256:801a105ba0f9c7f58f5ba5cde1a3b4404009fbebb1028779ca2c5de211e94940 # the clair-in-ci image neither has skopeo or jq installed. Hence, we create an extra step to get the image manifest digests + computeResources: + limits: + memory: 512Mi + cpu: 200m + requests: + memory: 256Mi + cpu: 100m env: - name: IMAGE_URL value: $(params.image-url) @@ -58,6 +65,13 @@ spec: fi - name: get-vulnerabilities image: quay.io/redhat-appstudio/clair-in-ci:v1 # explicit floating tag, daily updates, per arch call this is exempt for now for use of image digest + computeResources: + limits: + memory: 4Gi + cpu: '2' + requests: + memory: 1Gi + cpu: 500m imagePullPolicy: Always env: - name: IMAGE_URL @@ -94,6 +108,13 @@ spec: image: quay.io/redhat-appstudio/konflux-test:v1.4.5@sha256:801a105ba0f9c7f58f5ba5cde1a3b4404009fbebb1028779ca2c5de211e94940 # per https://kubernetes.io/docs/concepts/containers/images/#imagepullpolicy-defaulting # the cluster will set imagePullPolicy to IfNotPresent + computeResources: + limits: + memory: 2Gi + cpu: 500m + requests: + memory: 256Mi + cpu: 100m securityContext: capabilities: add: diff --git a/task/clamav-scan/0.1/clamav-scan.yaml b/task/clamav-scan/0.1/clamav-scan.yaml index dddbc43f85..941a9defe2 100644 --- a/task/clamav-scan/0.1/clamav-scan.yaml +++ b/task/clamav-scan/0.1/clamav-scan.yaml @@ -43,10 +43,11 @@ spec: value: $(params.image-digest) computeResources: limits: - memory: 4Gi + memory: 8Gi + cpu: '2' requests: - memory: 512Mi - cpu: 10m + memory: 2Gi + cpu: 500m script: | #!/usr/bin/env bash set -euo pipefail @@ -144,6 +145,13 @@ spec: name: work - name: upload image: quay.io/konflux-ci/oras:latest@sha256:f4b891ee3038a5f13cd92ff4f473faad5601c2434d1c6b9bccdfc134d9d5f820 + computeResources: + limits: + memory: 512Mi + cpu: 200m + requests: + memory: 256Mi + cpu: 100m env: - name: IMAGE_URL value: $(params.image-url)