airship
/
promenade
Code Issues Proposed changes

Merge "promenade: convert configmap-etc to secret"

This commit is contained in:
Zuul 2020-02-12 21:39:29 +00:00 committed by Gerrit Code Review
parent 7d5baf4e25 bfd4924452
commit 146a9a5b8e
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
charts/promenade/templates/configmap-etc.yaml
View File

@ -47,14 +47,11 @@ limitations under the License.
--- ---
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: Secret
metadata: metadata:
name: promenade-etc name: promenade-etc
data: data:
api-paste.ini: |+ api-paste.ini: {{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | b64enc }}
{{ include "helm-toolkit.utils.to_ini" .Values.conf.paste | indent 4 }} promenade.conf: {{ include "helm-toolkit.utils.to_ini" .Values.conf.promenade | b64enc }}
promenade.conf: |+ policy.yaml: {{ toYaml .Values.conf.policy | b64enc }}
{{ include "helm-toolkit.utils.to_ini" .Values.conf.promenade | indent 4 }}
policy.yaml: |+
{{ toYaml .Values.conf.policy | indent 4 }}
{{- end }} {{- end }}

4
charts/promenade/templates/deployment-api.yaml
View File

@ -118,8 +118,8 @@ spec:
{{ if $mounts_promenade_api.volumeMounts }}{{ toYaml $mounts_promenade_api.volumeMounts | indent 12 }}{{ end }} {{ if $mounts_promenade_api.volumeMounts }}{{ toYaml $mounts_promenade_api.volumeMounts | indent 12 }}{{ end }}
volumes: volumes:
- name: promenade-etc - name: promenade-etc
configMap: secret:
name: promenade-etc secretName: promenade-etc
defaultMode: 0444 defaultMode: 0444
{{ if $mounts_promenade_api.volumes }}{{ toYaml $mounts_promenade_api.volumes | indent 8 }}{{ end }} {{ if $mounts_promenade_api.volumes }}{{ toYaml $mounts_promenade_api.volumes | indent 8 }}{{ end }}
{{- end }} {{- end }}