fix(base): add valuesFrom support

This commit is contained in:
WrenIX 2023-11-28 23:02:19 +01:00
parent a27e6c489e
commit 8ef1a469bf
Signed by: wrenix
GPG key ID: 7AFDB012974B1BB5
3 changed files with 13 additions and 1 deletions

View file

@ -1,5 +1,6 @@
commons: commons:
masterPassword: # -- needed, but could be set with componentCommons.helm.release.valuesFrom
# masterPassword:
auth: auth:
enabled: false enabled: false
type: "authentik" type: "authentik"

View file

@ -28,6 +28,12 @@ spec:
optional: true optional: true
valuesKey: init valuesKey: init
targetPath: init.version targetPath: init.version
{{- with $.Values.componentCommons.helm.release.valuesFrom }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with $config.valuesFrom }}
{{- toYaml . | nindent 4 }}
{{- end }}
values: values:
{{- $config.values | default (dict) | mergeOverwrite (dict "commons" $.Values.commons "global" $.Values.global) | toYaml | nindent 4 }} {{- $config.values | default (dict) | mergeOverwrite (dict "commons" $.Values.commons "global" $.Values.global) | toYaml | nindent 4 }}
{{- end }} {{- end }}

View file

@ -10,4 +10,9 @@ commons:
test: {} test: {}
upgrade: {} upgrade: {}
componentCommons:
helm:
release:
valuesFrom: []
components: {} components: {}