From 14c8258309928af373069e4b3457c5d4606e5d01 Mon Sep 17 00:00:00 2001
From: "David J. M. Karlsen" <david@davidkarlsen.com>
Date: Tue, 10 Dec 2019 21:07:16 +0100
Subject: [PATCH] Add securityContext. Fixes #96

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
---
 charts/argo-cd/Chart.yaml                                     | 2 +-
 .../templates/argocd-application-controller/deployment.yaml   | 1 +
 charts/argo-cd/templates/argocd-repo-server/deployment.yaml   | 1 +
 charts/argo-cd/templates/argocd-server/deployment.yaml        | 1 +
 charts/argo-cd/values.yaml                                    | 4 ++++
 5 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index 7419e346..564c7a9e 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.4"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.4.5
+version: 1.5.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index 12189424..b98632aa 100644
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -35,6 +35,7 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       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 0c66a115..848959cc 100644
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -35,6 +35,7 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       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 5b728d5e..4be92de8 100644
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -35,6 +35,7 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
+      securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       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/values.yaml b/charts/argo-cd/values.yaml
index 632d98f3..df05a6ee 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -12,6 +12,10 @@ global:
     repository: argoproj/argocd
     tag: v1.3.4
     imagePullPolicy: IfNotPresent
+  securityContext:
+    runAsUser: 999
+    runAsGroup: 999
+    fsGroup: 999
 
 ## Controller
 controller: