From c5ec102f0d94fd82f33fb5d23cc84b4317a965b0 Mon Sep 17 00:00:00 2001 From: Flavius Lacatusu Date: Thu, 16 Jan 2025 12:59:43 +0100 Subject: [PATCH 1/4] feat(KFLUXDP-19): Move dora metrics image to konflux-ci org (#5294) --- components/dora-metrics/development/kustomization.yaml | 6 +++--- components/dora-metrics/production/kustomization.yaml | 6 +++--- components/dora-metrics/staging/kustomization.yaml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/components/dora-metrics/development/kustomization.yaml b/components/dora-metrics/development/kustomization.yaml index 3eefc3e3b18..befc55330a3 100644 --- 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 \ No newline at end of file + newName: quay.io/konflux-ci/dora-metrics + newTag: 5c6ee5f7130dabfddab0b775bd36c867cbdf8403 \ No newline at end of file diff --git a/components/dora-metrics/production/kustomization.yaml b/components/dora-metrics/production/kustomization.yaml index fb79074e5f0..dbfb90110b1 100644 --- 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 \ No newline at end of file + newName: quay.io/konflux-ci/dora-metrics + newTag: 5c6ee5f7130dabfddab0b775bd36c867cbdf8403 \ No newline at end of file diff --git a/components/dora-metrics/staging/kustomization.yaml b/components/dora-metrics/staging/kustomization.yaml index 73a2c62a28b..0c4d0cb42c6 100644 --- 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 \ No newline at end of file From 01df3b8f20943e18786aa190cef39b4674518037 Mon Sep 17 00:00:00 2001 From: Gal Ben Haim Date: Thu, 16 Jan 2025 15:23:48 +0200 Subject: [PATCH 2/4] Promote konflux-ui from stage to prod (#5295) Signed-off-by: Gal Ben Haim --- components/konflux-ui/production/base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/konflux-ui/production/base/kustomization.yaml b/components/konflux-ui/production/base/kustomization.yaml index 43dee747d70..2a7e1c46c91 100644 --- 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 From 0808d75bec51abebb1c46ccf1eed21bd2a5914f2 Mon Sep 17 00:00:00 2001 From: Francesco Ilario Date: Thu, 16 Jan 2025 16:45:21 +0100 Subject: [PATCH 3/4] fix configmap name for namespace-lister's test proxy (#5296) Signed-off-by: Francesco Ilario --- components/namespace-lister/base/kustomization.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/namespace-lister/base/kustomization.yaml b/components/namespace-lister/base/kustomization.yaml index 292d6cceb10..28c42d2a017 100644 --- a/components/namespace-lister/base/kustomization.yaml +++ b/components/namespace-lister/base/kustomization.yaml @@ -11,7 +11,7 @@ namespace: namespace-lister configMapGenerator: - files: - nginx.conf=nginx.conf - name: nginx + name: proxy-konflux options: disableNameSuffixHash: true images: From 48665c16513ca152cbfda1d951ed39e65488bc63 Mon Sep 17 00:00:00 2001 From: Hector Martinez Lopez <87312991+rh-hemartin@users.noreply.github.com> Date: Thu, 16 Jan 2025 17:36:15 +0100 Subject: [PATCH 4/4] Make Knative Eventing MT Broker Controller Guaranteed (#5291) --- components/knative-eventing/base/kustomization.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/components/knative-eventing/base/kustomization.yaml b/components/knative-eventing/base/kustomization.yaml index c5106659bba..7795285c823 100644 --- 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