Merge "Chart: Use k8s secret to store config"

charts/deckhand/templates/configmap-etc.yaml

@@ -66,16 +66,13 @@
 
 ---
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
   name: deckhand-etc
+type: Opaque
 data:
-  deckhand.conf: |+
+  deckhand.conf: {{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.deckhand | b46enc }}
-{{ include "helm-toolkit.utils.to_oslo_conf" .Values.conf.deckhand | indent 4 }}
+  logging.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.logging | b46enc }}
-  logging.conf: |+
+  deckhand-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b46enc }}
-{{ include "helm-toolkit.utils.to_ini" .Values.conf.logging | indent 4 }}
+  policy.yaml: {{ toYaml .Values.conf.policy | b46enc }}
-  deckhand-paste.ini: |+
-{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }}
-  policy.yaml: |+
-{{ toYaml .Values.conf.policy | indent 4 }}
 {{- end }}

charts/deckhand/templates/deployment.yaml

@@ -102,8 +102,8 @@ spec:
         - name: etc-deckhand
           emptyDir: {}
         - name: deckhand-etc
-          configMap:
+          secret:
-            name: deckhand-etc
+            secretName: deckhand-etc
             defaultMode: 0444
 {{ if $mounts_deckhand.volumes }}{{ toYaml $mounts_deckhand.volumes | indent 8 }}{{ end }}
 {{- end }}

charts/deckhand/templates/job-db-init.yaml

@@ -101,8 +101,8 @@ spec:
         - name: etc-deckhand
           emptyDir: {}
         - name: deckhand-etc
-          configMap:
+          secret:
-            name: deckhand-etc
+            secretName: deckhand-etc
             defaultMode: 0444
         - name: deckhand-bin
           configMap:

charts/deckhand/templates/job-db-sync.yaml

@@ -101,8 +101,8 @@ spec:
         - name: etc-deckhand
           emptyDir: {}
         - name: deckhand-etc
-          configMap:
+          secret:
-            name: deckhand-etc
+            secretName: deckhand-etc
             defaultMode: 0444
         - name: deckhand-bin
           configMap: