From d09962e81f64f162640a49ae7156ea4a0ec8494a Mon Sep 17 00:00:00 2001 From: Jacob Baungard Hansen Date: Thu, 7 Nov 2024 16:00:23 +0100 Subject: [PATCH] Use multi-arch origin-oauth-proxy image During upgrade from ACM2.11->ACM2.12 for a (currently not fully understood reason) we use the proxy image from the base templates. This seem to happen only for a short while, on later reconciles we appear get the correct image from the OCP imagestream. The image previously set in the base template were amd64 only, causing the pods to crash on any other architecture. From rbac-query-proxy and Grafana it eventually resolves, however alertmanager uses a stateful set and gets stuck due the known Kubernetes issue described here: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#forced-rollback Ideally we'd never want to use these images, but meanwhile this should at least ensure we don't crash and leave a unhealthy stateful set for alertmanager. Signed-off-by: Jacob Baungard Hansen --- .../manifests/base/alertmanager/alertmanager-statefulset.yaml | 2 +- .../manifests/base/grafana/deployment.yaml | 2 +- .../manifests/base/proxy/deployment.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/operators/multiclusterobservability/manifests/base/alertmanager/alertmanager-statefulset.yaml b/operators/multiclusterobservability/manifests/base/alertmanager/alertmanager-statefulset.yaml index 7569a6da6..455c687d2 100644 --- a/operators/multiclusterobservability/manifests/base/alertmanager/alertmanager-statefulset.yaml +++ b/operators/multiclusterobservability/manifests/base/alertmanager/alertmanager-statefulset.yaml @@ -125,7 +125,7 @@ spec: - --skip-provider-button=true - --openshift-ca=/etc/pki/tls/cert.pem - --openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt - image: quay.io/stolostron/origin-oauth-proxy:4.5 + image: quay.io/stolostron/origin-oauth-proxy:4.16 imagePullPolicy: IfNotPresent name: alertmanager-proxy ports: diff --git a/operators/multiclusterobservability/manifests/base/grafana/deployment.yaml b/operators/multiclusterobservability/manifests/base/grafana/deployment.yaml index ede8d8f2b..8655795bb 100644 --- a/operators/multiclusterobservability/manifests/base/grafana/deployment.yaml +++ b/operators/multiclusterobservability/manifests/base/grafana/deployment.yaml @@ -101,7 +101,7 @@ spec: mountPath: /etc/tls/private - mountPath: /etc/proxy/secrets name: cookie-secret - image: quay.io/stolostron/origin-oauth-proxy:4.5 + image: quay.io/stolostron/origin-oauth-proxy:4.16 args: - '--provider=openshift' - '--upstream=http://localhost:3001' diff --git a/operators/multiclusterobservability/manifests/base/proxy/deployment.yaml b/operators/multiclusterobservability/manifests/base/proxy/deployment.yaml index a5fad9c47..a1836799d 100644 --- a/operators/multiclusterobservability/manifests/base/proxy/deployment.yaml +++ b/operators/multiclusterobservability/manifests/base/proxy/deployment.yaml @@ -91,7 +91,7 @@ spec: - --skip-provider-button=true - --openshift-ca=/etc/pki/tls/cert.pem - --openshift-ca=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt - image: quay.io/stolostron/origin-oauth-proxy:4.5 + image: quay.io/stolostron/origin-oauth-proxy:4.16 imagePullPolicy: IfNotPresent name: oauth-proxy ports: