From 734b33ba551d5d94895e5b138e4577de8950447e Mon Sep 17 00:00:00 2001
From: Marcos Estevez <marcos.stvz@gmail.com>
Date: Thu, 10 Oct 2019 14:29:51 +0200
Subject: [PATCH] Sync with upstream helm/charts/stable/reloader

Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>
---
 .../chart/reloader/templates/deployment.yaml          |  4 +++-
 .../chart/reloader/templates/serviceaccount.yaml      |  3 +++
 deployments/kubernetes/chart/reloader/values.yaml     | 11 ++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
index 2beb581f..e6a5bad8 100644
--- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml
@@ -88,7 +88,6 @@ spec:
             name: tmp-volume
       {{- end }}
         args:
-          
           {{- if .Values.reloader.ignoreSecrets }}
           - "--resources-to-ignore=secrets"
           {{- end }}
@@ -115,6 +114,9 @@ spec:
         resources:
 {{ toYaml .Values.reloader.deployment.resources | indent 10 }}
       {{- end }}
+{{- if .Values.reloader.deployment.securityContext }}
+      securityContext: {{ toYaml .Values.reloader.deployment.securityContext | nindent 8 }}
+{{- end }}
       serviceAccountName: {{ template "reloader-serviceAccountName" . }}
     {{- if eq .Values.reloader.readOnlyRootFileSystem true }}
       volumes:
diff --git a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
index c3a0b7c4..62e5f1a0 100644
--- a/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
+++ b/deployments/kubernetes/chart/reloader/templates/serviceaccount.yaml
@@ -1,6 +1,9 @@
 {{- if .Values.reloader.serviceAccount.create }}
 apiVersion: v1
 kind: ServiceAccount
+{{- if .Values.global.imagePullSecrets }}
+imagePullSecrets: {{ toYaml .Values.global.imagePullSecrets | nindent 2 }}
+{{- end }}
 metadata:
   labels:
 {{ include "reloader-labels.chart" . | indent 4 }}
diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml
index 8bb5b587..02536aab 100644
--- a/deployments/kubernetes/chart/reloader/values.yaml
+++ b/deployments/kubernetes/chart/reloader/values.yaml
@@ -1,4 +1,10 @@
 # Generated from deployments/kubernetes/templates/chart/values.yaml.tmpl
+global:
+  ## Reference to one or more secrets to be used when pulling images
+  ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
+  ##
+  imagePullSecrets: []
+  # - name: "image-pull-secret"
 
 kubernetes:
   host: https://kubernetes.default
@@ -62,6 +68,9 @@ reloader:
     #     cpu: "10m"
     #     memory: "128Mi"
     resources: {}
+    # https://kubernetes.io/docs/tasks/configure-pod-container/security-context/
+    securityContext: {}
+    # runAsUser: 1000
 
   rbac:
     enabled: true
@@ -73,7 +82,7 @@ reloader:
     labels: {}
     # The name of the ServiceAccount to use.
     # If not set and create is true, a name is generated using the fullname template
-    name: 
+    name:
   # Optional flags to pass to the Reloader entrypoint
   # Example:
   #   custom_annotations: