From 30ab7d7653fea403e015522d278c592f5302c357 Mon Sep 17 00:00:00 2001 From: clnrmn Date: Tue, 17 Mar 2026 17:51:36 +0100 Subject: [PATCH] fix(argo-cd): Omit runAsUser for dex when deployed on OpenShift Signed-off-by: clnrmn --- charts/argo-cd/Chart.yaml | 6 +++--- charts/argo-cd/templates/dex/deployment.yaml | 12 ++++++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index de007e961..375978cc0 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -3,7 +3,7 @@ appVersion: v3.3.4 kubeVersion: ">=1.25.0-0" description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 9.4.12 +version: 9.4.14 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: @@ -26,5 +26,5 @@ annotations: fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252 url: https://argoproj.github.io/argo-helm/pgp_keys.asc artifacthub.io/changes: | - - kind: changed - description: Enable ServerSideApply for ArgoCD CRDs by default + - kind: fixed + description: Omit runAsUser for dex when deployed on OpenShift diff --git a/charts/argo-cd/templates/dex/deployment.yaml b/charts/argo-cd/templates/dex/deployment.yaml index ae786a57f..b7c628c1c 100644 --- a/charts/argo-cd/templates/dex/deployment.yaml +++ b/charts/argo-cd/templates/dex/deployment.yaml @@ -156,7 +156,11 @@ spec: {{- toYaml .Values.dex.resources | nindent 10 }} {{- with .Values.dex.containerSecurityContext }} securityContext: - {{- toYaml . | nindent 10 }} + {{- if $.Values.openshift.enabled }} + {{- omit . "runAsUser" | toYaml | nindent 10 }} + {{- else }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- end }} volumeMounts: {{- with (concat .Values.global.extraVolumeMounts .Values.dex.volumeMounts) }} @@ -189,7 +193,11 @@ spec: {{- toYaml (default .Values.dex.resources .Values.dex.initImage.resources) | nindent 10 }} {{- with .Values.dex.containerSecurityContext }} securityContext: - {{- toYaml . | nindent 10 }} + {{- if $.Values.openshift.enabled }} + {{- omit . "runAsUser" | toYaml | nindent 10 }} + {{- else }} + {{- toYaml . | nindent 10 }} + {{- end }} {{- end }} {{- with .Values.dex.initContainers }} {{- tpl (toYaml .) $ | nindent 6 }}