Fix conflicts

.dockerignore

@@ -0,0 +1 @@
+vendor

.version

@@ -1 +1 @@
-v0.1.0
+v0.1.0

deployments/kubernetes/chart/reloader/Chart.yaml

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

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

@@ -87,27 +87,30 @@ spec:
           - mountPath: /tmp/
             name: tmp-volume
       {{- end }}
-      {{- if .Values.reloader.custom_annotations }}
         args:
-          {{- if .Values.reloader.custom_annotations.configmap }}
+          
-          - "--configmap-annotation"
+          {{- if .Values.reloader.ignoreSecrets }}
-          - "{{ .Values.reloader.custom_annotations.configmap }}"
-          {{- end }}
-          {{- if .Values.reloader.custom_annotations.secret }}
-          - "--secret-annotation"
-          - "{{ .Values.reloader.custom_annotations.secret }}"
-          {{- end }}
-          {{- if .Values.reloader.custom_annotations.auto }}
-          - "--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.custom_annotations }}
+            {{- if .Values.reloader.custom_annotations.configmap }}
+            - "--configmap-annotation"
+            - "{{ .Values.reloader.custom_annotations.configmap }}"
+            {{- end }}
+            {{- if .Values.reloader.custom_annotations.secret }}
+            - "--secret-annotation"
+            - "{{ .Values.reloader.custom_annotations.secret }}"
+            {{- end }}
+            {{- if .Values.reloader.custom_annotations.auto }}
+            - "--auto-annotation"
+            - "{{ .Values.reloader.custom_annotations.auto }}"
+            {{- end }}
+          {{- end }}
+
       {{- if .Values.reloader.deployment.resources }}
         resources:
 {{ toYaml .Values.reloader.deployment.resources | indent 10 }}

deployments/kubernetes/chart/reloader/values.yaml

@@ -37,10 +37,10 @@ reloader:
     labels:
       provider: stakater
       group: com.stakater.platform
-      version: v0.0.35
+      version: v0.0.36
     image:
       name: stakater/reloader
-      tag: "v0.0.35"
+      tag: "v0.0.36"
       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.35"
+    chart: "reloader-v0.0.36"
     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.35"
+    chart: "reloader-v0.0.36"
     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.35"
+    chart: "reloader-v0.0.36"
     release: "RELEASE-NAME"
     heritage: "Tiller"
     group: com.stakater.platform
     provider: stakater
-    version: v0.0.35
+    version: v0.0.36
     
   name: reloader
 spec:
@@ -24,18 +24,19 @@ spec:
     metadata:
       labels:
         app: reloader
-        chart: "reloader-v0.0.35"
+        chart: "reloader-v0.0.36"
         release: "RELEASE-NAME"
         heritage: "Tiller"
         group: com.stakater.platform
         provider: stakater
-        version: v0.0.35
+        version: v0.0.36
         
     spec:
       containers:
       - env:
-        image: "stakater/reloader:v0.0.35"
+        image: "stakater/reloader:v0.0.36"
         imagePullPolicy: IfNotPresent
         name: reloader
+        args:
       serviceAccountName: reloader
 

deployments/kubernetes/manifests/serviceaccount.yaml

@@ -6,7 +6,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.35"
+    chart: "reloader-v0.0.36"
     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.35"
+    chart: "reloader-v0.0.36"
     release: "RELEASE-NAME"
     heritage: "Tiller"
     group: com.stakater.platform
     provider: stakater
-    version: v0.0.35
+    version: v0.0.36
     
   name: reloader
 spec:
@@ -28,19 +28,20 @@ spec:
     metadata:
       labels:
         app: reloader
-        chart: "reloader-v0.0.35"
+        chart: "reloader-v0.0.36"
         release: "RELEASE-NAME"
         heritage: "Tiller"
         group: com.stakater.platform
         provider: stakater
-        version: v0.0.35
+        version: v0.0.36
         
     spec:
       containers:
       - env:
-        image: "stakater/reloader:v0.0.35"
+        image: "stakater/reloader:v0.0.36"
         imagePullPolicy: IfNotPresent
         name: reloader
+        args:
       serviceAccountName: reloader
 
 ---
@@ -51,7 +52,7 @@ kind: ClusterRole
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.35"
+    chart: "reloader-v0.0.36"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader-role
@@ -100,7 +101,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.35"
+    chart: "reloader-v0.0.36"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader-role-binding
@@ -122,7 +123,7 @@ kind: ServiceAccount
 metadata:
   labels:
     app: reloader
-    chart: "reloader-v0.0.35"
+    chart: "reloader-v0.0.36"
     release: "RELEASE-NAME"
     heritage: "Tiller"
   name: reloader