Merge branch 'RedHatInsights:master' into master

RedHatInsights · Oct 29, 2024 · 0e92a1c · 0e92a1c
2 parents 516b415 + 7e6013f
commit 0e92a1c
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 38 deletions.
diff --git a/.tekton/playbook-dispatcher-pull-request.yaml b/.tekton/playbook-dispatcher-pull-request.yaml
@@ -39,7 +39,7 @@ spec:
         - name: name
           value: show-sbom
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:9bfc6b99ef038800fe131d7b45ff3cd4da3a415dd536f7c657b3527b01c4a13b
+          value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:52f8b96b96ce4203d4b74d850a85f963125bf8eef0683ea5acdd80818d335a28
         - name: kind
           value: task
         resolver: bundles
@@ -221,7 +221,7 @@ spec:
         - name: name
           value: buildah-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:06946a3a676a9daa1efb16120ba0d81e0c3ce38c9f6242439e2169f27d5d2a2a
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:2a0c67ea7d5d82b4ec47930c12397f94b3af0b3855d8e5ad9f6e088c93e42bf0
         - name: kind
           value: task
         resolver: bundles
@@ -293,7 +293,7 @@ spec:
         - name: name
           value: clair-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:37b9187c1d5f6672bbc9c61d88fc71a3ee688076cb16edef42d1ff92a59027fb
+          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:28fee4bf5da87f2388c973d9336086749cad8436003f9a514e22ac99735e056b
         - name: kind
           value: task
         resolver: bundles
@@ -333,7 +333,7 @@ spec:
         - name: name
           value: sast-snyk-check-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.2@sha256:c10a095a48bffe898cc95644eb9a826ea0667c6ba9e9ec35b6149337ece234fd
+          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.2@sha256:7e99a122bc9e84fd9fb29062e825d3345177337d2448dcb50324f86ec5560c7a
         - name: kind
           value: task
         resolver: bundles
@@ -355,7 +355,7 @@ spec:
         - name: name
           value: clamav-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
+          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:a94b6523ba0b691dc276e37594321c2eff3594d2753014e5c920803b47627df1
         - name: kind
           value: task
         resolver: bundles
@@ -420,7 +420,7 @@ spec:
         - name: name
           value: push-dockerfile-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:b048f99ab1ba013e809dc00523978542c2cb3fcd133b408267dd849eb40d1d0a
+          value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:e32feb2c815116730917fe5665d9f003e53f2e1718f60bcbabf0ab3abad5d7d4
         - name: kind
           value: task
         resolver: bundles

diff --git a/.tekton/playbook-dispatcher-push.yaml b/.tekton/playbook-dispatcher-push.yaml
@@ -36,7 +36,7 @@ spec:
         - name: name
           value: show-sbom
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:9bfc6b99ef038800fe131d7b45ff3cd4da3a415dd536f7c657b3527b01c4a13b
+          value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:52f8b96b96ce4203d4b74d850a85f963125bf8eef0683ea5acdd80818d335a28
         - name: kind
           value: task
         resolver: bundles
@@ -218,7 +218,7 @@ spec:
         - name: name
           value: buildah-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:06946a3a676a9daa1efb16120ba0d81e0c3ce38c9f6242439e2169f27d5d2a2a
+          value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.2@sha256:2a0c67ea7d5d82b4ec47930c12397f94b3af0b3855d8e5ad9f6e088c93e42bf0
         - name: kind
           value: task
         resolver: bundles
@@ -290,7 +290,7 @@ spec:
         - name: name
           value: clair-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:37b9187c1d5f6672bbc9c61d88fc71a3ee688076cb16edef42d1ff92a59027fb
+          value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:28fee4bf5da87f2388c973d9336086749cad8436003f9a514e22ac99735e056b
         - name: kind
           value: task
         resolver: bundles
@@ -330,7 +330,7 @@ spec:
         - name: name
           value: sast-snyk-check-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.2@sha256:c10a095a48bffe898cc95644eb9a826ea0667c6ba9e9ec35b6149337ece234fd
+          value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.2@sha256:7e99a122bc9e84fd9fb29062e825d3345177337d2448dcb50324f86ec5560c7a
         - name: kind
           value: task
         resolver: bundles
@@ -352,7 +352,7 @@ spec:
         - name: name
           value: clamav-scan
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:5ac9b24cff7cfb391bc54cd5135536892090354862327d1028fa08872d759c03
+          value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:a94b6523ba0b691dc276e37594321c2eff3594d2753014e5c920803b47627df1
         - name: kind
           value: task
         resolver: bundles
@@ -417,7 +417,7 @@ spec:
         - name: name
           value: push-dockerfile-oci-ta
         - name: bundle
-          value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:b048f99ab1ba013e809dc00523978542c2cb3fcd133b408267dd849eb40d1d0a
+          value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:e32feb2c815116730917fe5665d9f003e53f2e1718f60bcbabf0ab3abad5d7d4
         - name: kind
           value: task
         resolver: bundles

diff --git a/deploy/clowdapp.yaml b/deploy/clowdapp.yaml
@@ -180,11 +180,11 @@ objects:
 
         resources:
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${API_CPU_LIMIT}
+            memory: ${API_MEMORY_LIMIT}
           requests:
-            cpu: 250m
-            memory: 256Mi
+            cpu: ${API_CPU_REQUEST}
+            memory: ${API_MEMORY_REQUEST}
 
     - name: response-consumer
       minReplicas: ${{REPLICAS_RESPONSE_CONSUMER}}
@@ -226,11 +226,11 @@ objects:
             value: ${DB_SSLMODE}
         resources:
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${RESPONSE_CONSUMER_CPU_LIMIT}
+            memory: ${RESPONSE_CONSUMER_MEMORY_LIMIT}
           requests:
-            cpu: 250m
-            memory: 256Mi
+            cpu: ${RESPONSE_CONSUMER_CPU_REQUEST}
+            memory: ${RESPONSE_CONSUMER_MEMORY_REQUEST}
 
     - name: validator
       minReplicas: ${{REPLICAS_VALIDATOR}}
@@ -273,11 +273,11 @@ objects:
             value: ${BLOCKLIST_ORG_IDS}
         resources:
           limits:
-            cpu: ${CPU_LIMIT}
-            memory: ${MEMORY_LIMIT}
+            cpu: ${VALIDATOR_CPU_LIMIT}
+            memory: ${VALIDATOR_MEMORY_LIMIT}
           requests:
-            cpu: 250m
-            memory: 256Mi
+            cpu: ${VALIDATOR_CPU_REQUEST}
+            memory: ${VALIDATOR_MEMORY_REQUEST}
 
     jobs:
     - name: cleaner
@@ -312,10 +312,30 @@ parameters:
 
 - name: LOG_LEVEL
   value: INFO
-- name: CPU_LIMIT
+- name: API_CPU_LIMIT
   value: 500m
-- name: MEMORY_LIMIT
+- name: API_CPU_REQUEST
+  value: 250m
+- name: API_MEMORY_LIMIT
   value: 512Mi
+- name: API_MEMORY_REQUEST
+  value: 256Mi
+- name: RESPONSE_CONSUMER_CPU_LIMIT
+  value: 500m
+- name: RESPONSE_CONSUMER_CPU_REQUEST
+  value: 250m
+- name: RESPONSE_CONSUMER_MEMORY_LIMIT
+  value: 512Mi
+- name: RESPONSE_CONSUMER_MEMORY_REQUEST
+  value: 256Mi
+- name: VALIDATOR_CPU_LIMIT
+  value: 500m
+- name: VALIDATOR_CPU_REQUEST
+  value: 250m
+- name: VALIDATOR_MEMORY_LIMIT
+  value: 512Mi
+- name: VALIDATOR_MEMORY_REQUEST
+  value: 256Mi
 
 - name: REPLICAS_API
   value: "3"

diff --git a/deploy/connect.yaml b/deploy/connect.yaml
@@ -35,14 +35,22 @@ parameters:
   value: '1'
 - name: VERSION
   value: '2.7.1'
-- name: CPU_REQUESTS
+- name: CPU_REQUEST
   value: 500m
-- name: CPU_LIMITS
+- name: CPU_LIMIT
   value: '1'
-- name: MEMORY_REQUESTS
+- name: MEMORY_REQUEST
   value: 2Gi
-- name: MEMORY_LIMITS
+- name: MEMORY_LIMIT
   value: 4Gi
+- name: EVENT_CONSUMER_CPU_REQUEST
+  value: 100m
+- name: EVENT_CONSUMER_CPU_LIMIT
+  value: 200m
+- name: EVENT_CONSUMER_MEMORY_REQUEST
+  value: 128Mi
+- name: EVENT_CONSUMER_MEMORY_LIMIT
+  value: 256Mi
 - name: XMX
   value: 4G
 - name: XMS
@@ -187,11 +195,11 @@ objects:
     replicas: ${{NUM_REPLICAS}}
     resources:
       limits:
-        cpu: ${CPU_LIMITS}
-        memory: ${MEMORY_LIMITS}
+        cpu: ${CPU_LIMIT}
+        memory: ${MEMORY_LIMIT}
       requests:
-        cpu: ${CPU_REQUESTS}
-        memory: ${MEMORY_REQUESTS}
+        cpu: ${CPU_REQUEST}
+        memory: ${MEMORY_REQUEST}
     jvmOptions:
       "-Xmx": ${XMX}
       "-Xms": ${XMS}
@@ -336,11 +344,11 @@ objects:
           name: playbook-dispatcher-event-consumer
           resources:
             requests:
-              cpu: 100m
-              memory: 128Mi
+              cpu: ${EVENT_CONSUMER_CPU_REQUEST}
+              memory: ${EVENT_CONSUMER_MEMORY_REQUEST}
             limits:
-              cpu: 200m
-              memory: 256Mi
+              cpu: ${EVENT_CONSUMER_CPU_LIMIT}
+              memory: ${EVENT_CONSUMER_MEMORY_LIMIT}
 
 # this service is only used in ephemeral to give the ephemeral kafka a stable address
 - apiVersion: v1