Skip to content

moqui / k8s-moqui

Go to a project
Toggle navigation
Toggle navigation pinning
c91e7447 by Adam Heath
Options

Switch extraConfigMap/extraSecrets/generatedComponent.sources to 

dictionaries.
1 parent 1306dd3f
Inline Side-by-side
Showing 4 changed files with 10 additions and 7 deletions
...@@ -6,7 +6,7 @@ metadata: ...@@ -6,7 +6,7 @@ metadata:
6 {{- include "moqui.labels" . | nindent 4 }} 6 {{- include "moqui.labels" . | nindent 4 }}
7 data: {{ .Values.configMap | toYaml | nindent 2 }} 7 data: {{ .Values.configMap | toYaml | nindent 2 }}
8 8
9 {{- range .Values.extraConfigMaps }} 9 {{- range $key, $value := .Values.extraConfigMaps }}
10 --- 10 ---
11 {{ . | toYaml }} 11 {{ $value | toYaml }}
12 {{- end }} 12 {{- end }}
......
...@@ -51,7 +51,10 @@ spec: ...@@ -51,7 +51,10 @@ spec:
51 - name: generated-component 51 - name: generated-component
52 projected: 52 projected:
53 sources: 53 sources:
54 {{ .Values.generatedComponent.sources | toYaml | nindent 14 }} 54 {{- range $key, $value := .Values.generatedComponent.sources }}
55 -
56 {{ $value | toYaml | nindent 14 }}
57 {{- end }}
55 {{- end }} 58 {{- end }}
56 59
57 initContainers: 60 initContainers:
......
...@@ -20,7 +20,7 @@ metadata: ...@@ -20,7 +20,7 @@ metadata:
20 stringData: 20 stringData:
21 elasticsearch_password: admin 21 elasticsearch_password: admin
22 22
23 {{- range .Values.extraSecrets }} 23 {{- range $key, $value := .Values.extraSecrets }}
24 --- 24 ---
25 {{ . | toYaml }} 25 {{ $value | toYaml }}
26 {{- end }} 26 {{- end }}
......
...@@ -19,8 +19,8 @@ configMap: ...@@ -19,8 +19,8 @@ configMap:
19 19
20 extraEnvs: [] 20 extraEnvs: []
21 21
22 extraConfigMaps: [] 22 extraConfigMaps: {}
23 extraSecrets: [] 23 extraSecrets: {}
24 generatedComponent: 24 generatedComponent:
25 enabled: false 25 enabled: false
26 sources: [] 26 sources: []
......