From 59e91a411c94f34c7543b3f21187c9e130a12784 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Thu, 12 Dec 2019 09:39:58 +0100 Subject: [PATCH] make securityContext optional Signed-off-by: David J. M. Karlsen --- .../templates/argocd-application-controller/deployment.yaml | 2 ++ charts/argo-cd/templates/argocd-repo-server/deployment.yaml | 2 ++ charts/argo-cd/templates/argocd-server/deployment.yaml | 2 ++ charts/argo-cd/templates/redis/deployment.yaml | 2 ++ charts/argo-cd/values.yaml | 1 + 5 files changed, 9 insertions(+) diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml index b98632aa..7e8bf6b6 100644 --- 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 index 848959cc..d5abe9a3 100644 --- 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 index 4be92de8..ecdeb556 100644 --- 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 index 5f55ab92..819fb27c 100644 --- 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 index df05a6ee..036e175b 100644 --- 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