Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/argo-cd/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.13
version: 9.4.14
home: https://github.com/argoproj/argo-helm
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
sources:
Expand All @@ -26,5 +26,5 @@ annotations:
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
artifacthub.io/changes: |
- kind: changed
description: Rename crd-project.yaml to crd-appproject.yaml to match upstream. Contents not changed.
- kind: fixed
description: Omit runAsUser for dex when deployed on OpenShift
12 changes: 10 additions & 2 deletions charts/argo-cd/templates/dex/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Expand Down Expand Up @@ -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 }}
Expand Down
Loading