From 069ecf5cc332e0d52f77f58db3c75154dae54982 Mon Sep 17 00:00:00 2001
From: "David J. M. Karlsen" <david@davidkarlsen.com>
Date: Mon, 16 Dec 2019 00:09:48 +0100
Subject: [PATCH] fix review comments

Signed-off-by: David J. M. Karlsen <david@davidkarlsen.com>
---
 .../argocd-application-controller/deployment.yaml        | 2 +-
 .../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                               | 9 ++++-----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
index d1f70b13..8fec2fdb 100644
--- a/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/deployment.yaml
@@ -35,7 +35,7 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
-      {{- if .Values.global.securityContext.enabled }}
+      {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}
       containers:
diff --git a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
index 971855aa..458a7ee3 100644
--- a/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/deployment.yaml
@@ -35,7 +35,7 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
-      {{- if .Values.global.securityContext.enabled }}
+      {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}
       containers:
diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml
index 2cb8ce65..6b84c4ad 100644
--- a/charts/argo-cd/templates/argocd-server/deployment.yaml
+++ b/charts/argo-cd/templates/argocd-server/deployment.yaml
@@ -35,7 +35,7 @@ spec:
 {{- toYaml .Values.controller.podLabels | nindent 8 }}
         {{- end }}
     spec:
-      {{- if .Values.global.securityContext.enabled }}
+      {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}
       containers:
diff --git a/charts/argo-cd/templates/redis/deployment.yaml b/charts/argo-cd/templates/redis/deployment.yaml
index 7b9e9ffb..ada5dc9a 100644
--- a/charts/argo-cd/templates/redis/deployment.yaml
+++ b/charts/argo-cd/templates/redis/deployment.yaml
@@ -25,7 +25,7 @@ spec:
         app.kubernetes.io/component: {{ .Values.redis.name }}
     spec:
       automountServiceAccountToken: false
-      {{- if .Values.global.securityContext.enabled }}
+      {{- if .Values.global.securityContext }}
       securityContext: {{- toYaml .Values.global.securityContext | nindent 8 }}
       {{- end }}
       containers:
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 036e175b..1f74ad44 100644
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -12,11 +12,10 @@ global:
     repository: argoproj/argocd
     tag: v1.3.4
     imagePullPolicy: IfNotPresent
-  securityContext:
-    enabled: true
-    runAsUser: 999
-    runAsGroup: 999
-    fsGroup: 999
+  securityContext: {}
+  #  runAsUser: 999
+  #  runAsGroup: 999
+  #  fsGroup: 999
 
 ## Controller
 controller: