Skip to content

Commit

Permalink
Use multi-arch origin-oauth-proxy image
Browse files Browse the repository at this point in the history
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 <jacobbaungard@redhat.com>
  • Loading branch information
jacobbaungard committed Nov 7, 2024
1 parent cef6b04 commit d09962e
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit d09962e

Please sign in to comment.