Skip to content

Commit b609d9b

Browse files
committed
[helm] Do not override user-defined 'csm.platform.azure.containerRegistries.solutions'
1 parent 29cad99 commit b609d9b

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,10 @@ csm:
128128
{{- if eq .Values.config.csm.platform.vendor "azure" }}
129129
azure:
130130
containerRegistries:
131+
{{- if .Values.config.csm.platform.azure.containerRegistries.solutions }}
132+
solutions: "{{ .Values.config.csm.platform.azure.containerRegistries.solutions }}"
133+
{{- else }}
131134
solutions: "{{- default "" .Values.argo.imageCredentials.registry -}}"
135+
{{- end }}
132136
{{- end }}
133137
{{- end }}

api/kubernetes/helm-chart/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@ config:
155155
# -- Azure storage account access key. Can be retrieved from the Azure portal
156156
account-key: "changeme"
157157
containerRegistries:
158-
solutions: "changeme"
158+
solutions: ""

0 commit comments

Comments
 (0)