make securityContext optional

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
argoproj · Dec 12, 2019 · 59e91a4 · 59e91a4
1 parent d283eb7
commit 59e91a4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 0 deletions.
diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -35,7 +35,9 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.securityContext.enabled }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
+      {{- end }}
       containers:
       - command:
         - argocd-application-controller

diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -35,7 +35,9 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.securityContext.enabled }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ .Values.repoServer.name }}
         image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default .Values.global.image.tag .Values.repoServer.image.tag }}

diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -35,7 +35,9 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      {{- if .Values.securityContext.enabled }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ .Values.server.name }}
         image: {{ default .Values.global.image.repository .Values.server.image.repository }}:{{ default .Values.global.image.tag .Values.server.image.tag }}

diff --git a/charts/argo-cd/templates/redis/deployment.yaml b/charts/argo-cd/templates/redis/deployment.yaml
@@ -25,7 +25,9 @@ spec:
         app.kubernetes.io/component: {{ .Values.redis.name }}
     spec:
       automountServiceAccountToken: false
+      {{- if .Values.securityContext.enabled }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
+      {{- end }}
       containers:
       - name: {{ template "argo-cd.redis.fullname" . }}
         args:

diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
@@ -13,6 +13,7 @@ global:
     tag: v1.3.4
     imagePullPolicy: IfNotPresent
   securityContext:
+    enabled: true
     runAsUser: 999
     runAsGroup: 999
     fsGroup: 999