Fix merge conflicts

deployments/kubernetes/chart/reloader/Chart.yaml

@@ -3,8 +3,8 @@
 apiVersion: v1
 name: reloader
 description: Reloader chart that runs on kubernetes
-version: v0.0.34
-appVersion: v0.0.34
+version: v0.0.35
+appVersion: v0.0.35
 keywords:
   - Reloader
   - kubernetes

deployments/kubernetes/chart/reloader/templates/clusterrole.yaml

@@ -16,8 +16,12 @@ rules:
   - apiGroups:
       - ""
     resources:
+{{- if .Values.reloader.ignoreSecrets }}{{- else }}
       - secrets
+{{- end }}
+{{- if .Values.reloader.ignoreConfigMaps }}{{- else }}
       - configmaps
+{{- end }}
     verbs:
       - list
       - get

deployments/kubernetes/chart/reloader/templates/deployment.yaml

@@ -101,6 +101,12 @@ spec:
           - "--auto-annotation"
           - "{{ .Values.reloader.custom_annotations.auto }}"
           {{- end }}
+          {{- if eq .Values.reloader.ignoreSecrets true }}
+          - "--resources-to-ignore=secrets"
+          {{- end }}
+          {{- if eq .Values.reloader.ignoreConfigMaps true }}
+          - "--resources-to-ignore=configMaps"
+          {{- end }}
       {{- end }}
       {{- if .Values.reloader.deployment.resources }}
         resources:

deployments/kubernetes/chart/reloader/templates/role.yaml

@@ -16,8 +16,12 @@ rules:
   - apiGroups:
       - ""
     resources:
+{{- if .Values.reloader.ignoreSecrets }}{{- else }}
       - secrets
+{{- end }}
+{{- if .Values.reloader.ignoreConfigMaps }}{{- else }}
       - configmaps
+{{- end }}
     verbs:
       - list
       - get

deployments/kubernetes/chart/reloader/values.yaml

@@ -4,6 +4,8 @@ kubernetes:
   host: https://kubernetes.default
 
 reloader:
+  ignoreSecrets: false
+  ignoreConfigMaps: false
   watchGlobally: true
   # Set to true if you have a pod security policy that enforces readOnlyRootFilesystem
   readOnlyRootFileSystem: false
@@ -35,10 +37,10 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v0.0.34
+      version: v0.0.35
     image:
       name: stakater/reloader
-      tag: "v0.0.34"
+      tag: "v0.0.35"
       pullPolicy: IfNotPresent
     # Support for extra environment variables.
     env:

deployments/kubernetes/manifests/clusterrole.yaml

@@ -6,7 +6,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader-role

deployments/kubernetes/manifests/clusterrolebinding.yaml

@@ -6,7 +6,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader-role-binding

deployments/kubernetes/manifests/deployment.yaml

@@ -5,12 +5,12 @@ kind: Deployment
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
     group: com.stakater.platform
     provider: stakater
-    version: v0.0.34
+    version: v0.0.35
     
   name: reloader
 spec:
@@ -24,17 +24,17 @@ spec:
     metadata:
       labels:
         app: reloader
-        chart: "reloader-v0.0.34"
+        chart: "reloader-v0.0.35"
         release: "RELEASE-NAME"
         heritage: "Tiller"
         group: com.stakater.platform
         provider: stakater
-        version: v0.0.34
+        version: v0.0.35
         
     spec:
       containers:
       - env:
-        image: "stakater/reloader:v0.0.34"
+        image: "stakater/reloader:v0.0.35"
         imagePullPolicy: IfNotPresent
         name: reloader
       serviceAccountName: reloader

deployments/kubernetes/manifests/serviceaccount.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader

deployments/kubernetes/reloader.yaml

@@ -9,12 +9,12 @@ kind: Deployment
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
     group: com.stakater.platform
     provider: stakater
-    version: v0.0.34
+    version: v0.0.35
     
   name: reloader
 spec:
@@ -28,17 +28,17 @@ spec:
     metadata:
       labels:
         app: reloader
-        chart: "reloader-v0.0.34"
+        chart: "reloader-v0.0.35"
         release: "RELEASE-NAME"
         heritage: "Tiller"
         group: com.stakater.platform
         provider: stakater
-        version: v0.0.34
+        version: v0.0.35
         
     spec:
       containers:
       - env:
-        image: "stakater/reloader:v0.0.34"
+        image: "stakater/reloader:v0.0.35"
         imagePullPolicy: IfNotPresent
         name: reloader
       serviceAccountName: reloader
@@ -51,7 +51,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader-role
@@ -100,7 +100,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader-role-binding
@@ -122,7 +122,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.34"
+    chart: "reloader-v0.0.35"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader

deployments/kubernetes/templates/chart/values.yaml.tmpl

@@ -4,6 +4,8 @@ kubernetes:
   host: https://kubernetes.default
 
 reloader:
+  ignoreSecrets: false
+  ignoreConfigMaps: false
   watchGlobally: true
   # Set to true if you have a pod security policy that enforces readOnlyRootFilesystem
   readOnlyRootFileSystem: false