Merge branch 'main' into integrate-namespace-lister-ui

redhat-appstudio · Jan 16, 2025 · 7c062c9 · 7c062c9
2 parents cefda74 + 48665c1
commit 7c062c9
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 10 deletions.
diff --git a/components/dora-metrics/development/kustomization.yaml b/components/dora-metrics/development/kustomization.yaml
@@ -1,10 +1,10 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/redhat-appstudio/dora-metrics/deploy/base?ref=630e08a427f4a6cd3a5fd869d224de34d03874c2
+- https://github.com/redhat-appstudio/dora-metrics/deploy/base?ref=5c6ee5f7130dabfddab0b775bd36c867cbdf8403
 - ../base
 
 images:
   - name: quay.io/redhat-appstudio/dora-metrics
-    newName: quay.io/redhat-appstudio/dora-metrics
-    newTag: 630e08a427f4a6cd3a5fd869d224de34d03874c2
+    newName: quay.io/konflux-ci/dora-metrics
+    newTag: 5c6ee5f7130dabfddab0b775bd36c867cbdf8403
diff --git a/components/dora-metrics/production/kustomization.yaml b/components/dora-metrics/production/kustomization.yaml
@@ -1,7 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/redhat-appstudio/dora-metrics/deploy/base?ref=630e08a427f4a6cd3a5fd869d224de34d03874c2
+- https://github.com/redhat-appstudio/dora-metrics/deploy/base?ref=5c6ee5f7130dabfddab0b775bd36c867cbdf8403
 - ../base
 - ../base/external-secrets
 patches:
@@ -14,5 +14,5 @@ patches:
 
 images:
   - name: quay.io/redhat-appstudio/dora-metrics
-    newName: quay.io/redhat-appstudio/dora-metrics
-    newTag: 630e08a427f4a6cd3a5fd869d224de34d03874c2
+    newName: quay.io/konflux-ci/dora-metrics
+    newTag: 5c6ee5f7130dabfddab0b775bd36c867cbdf8403
diff --git a/components/dora-metrics/staging/kustomization.yaml b/components/dora-metrics/staging/kustomization.yaml
@@ -1,11 +1,11 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/redhat-appstudio/dora-metrics/deploy/base?ref=630e08a427f4a6cd3a5fd869d224de34d03874c2
+- https://github.com/redhat-appstudio/dora-metrics/deploy/base?ref=5c6ee5f7130dabfddab0b775bd36c867cbdf8403
 - ../base
 - ../base/external-secrets
 
 images:
   - name: quay.io/redhat-appstudio/dora-metrics
-    newName: quay.io/redhat-appstudio/dora-metrics
-    newTag: 630e08a427f4a6cd3a5fd869d224de34d03874c2
+    newName: quay.io/konflux-ci/dora-metrics
+    newTag: 5c6ee5f7130dabfddab0b775bd36c867cbdf8403
diff --git a/components/knative-eventing/base/kustomization.yaml b/components/knative-eventing/base/kustomization.yaml
@@ -64,6 +64,7 @@ patches:
                   memory: 200Mi
 
 # Requests are cpu 100m and memory 100Mi by default
+# This is QoS Guaranteed (150m, 200Mi) because it was OOMKilled on Burstable (100m, 100Mi)
 - patch: |-
     apiVersion: apps/v1
     kind: Deployment
@@ -76,6 +77,9 @@ patches:
           containers:
             - name: mt-broker-controller
               resources:
+                requests:
+                  cpu: 150m
+                  memory: 200Mi
                 limits:
                   cpu: 150m
                   memory: 200Mi

diff --git a/components/konflux-ui/production/base/kustomization.yaml b/components/konflux-ui/production/base/kustomization.yaml
@@ -11,6 +11,6 @@ images:
     digest: sha256:0b32c063d9fbce1af4f851d7cf1f8bc0ad1eda06dafaa4ad2bd4a0d5fbba62c7
 
   - name: quay.io/konflux-ci/konflux-ui
-    newTag: 7f329d6fae2ee1a68b84805d0c29a11a2d60a9c7
+    newTag: f381e706998f2562d021266405912473884a528d
 
 namespace: konflux-ui