Skip to content

Commit 0cdb597

Browse files
committed
Add tls.* properties in _helpers.tpl + change mustMergeOverwrite params order
- mustMergeOverwrite params order has changed: basedConfig (defined in _helpers.tpl) should be used as based and values added during chart installation should overwrite these values if needed. This should allow customization even on predefined helm chart configuration
1 parent adc839a commit 0cdb597

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

api/kubernetes/helm-chart/templates/_helpers.tpl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,17 @@ csm:
199199
{{- end }}
200200
blobPersistence:
201201
path: {{ include "cosmotech-api.blobPersistencePath" . }}
202+
identityProvider:
203+
tls:
204+
enabled: {{ .Values.api.tlsTruststore.enabled }}
205+
bundle: {{ include "cosmotech-api.custom-rootca-bundle" . }}
206+
twincache:
207+
tls:
208+
enabled: {{ .Values.api.tlsTruststore.enabled }}
209+
bundle: {{ include "cosmotech-api.custom-rootca-bundle" . }}
210+
internalResultServices:
211+
eventBus:
212+
tls:
213+
enabled: {{ .Values.api.tlsTruststore.enabled }}
214+
bundle: {{ include "cosmotech-api.custom-rootca-bundle" . }}
202215
{{- end }}

api/kubernetes/helm-chart/templates/secret.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{- $baseConfig := include "cosmotech-api.baseConfig" . | fromYaml -}}
2-
{{- $mergedConfig := mustMergeOverwrite (dict) .Values.config $baseConfig -}}
2+
{{- $mergedConfig := mustMergeOverwrite (dict) $baseConfig .Values.config -}}
33
kind: Secret
44
apiVersion: v1
55
metadata:

0 commit comments

Comments
 (0)