Skip to content

Commit 180e9f8

Browse files
fgiudicidavidcassany
authored andcommitted
Charts: always use camelCase for values (#507)
registry_url slipped in Fixes commit #742b414ba326ae78a30dea4849aa71c478a70d4c Signed-off-by: Francesco Giudici <francesco.giudici@suse.com> (cherry picked from commit 1409e03)
1 parent 71aeacb commit 180e9f8

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ chart:
139139
yq -i '.image.repository = "${REPO}"' $(ROOT_DIR)/build/operator/values.yaml
140140
yq -i '.seedImage.tag = "${TAG}"' $(ROOT_DIR)/build/operator/values.yaml
141141
yq -i '.seedImage.repository = "${REPO_SEEDIMAGE}"' $(ROOT_DIR)/build/operator/values.yaml
142-
yq -i '.registry_url = "${REGISTRY_URL}"' $(ROOT_DIR)/build/operator/values.yaml
142+
yq -i '.registryUrl = "${REGISTRY_URL}"' $(ROOT_DIR)/build/operator/values.yaml
143143
helm package --version ${CHART_VERSION} --app-version ${GIT_TAG} -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/operator
144144
rm -Rf $(ROOT_DIR)/build/operator
145145

charts/operator/templates/_helpers.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
{{- define "registry_url" -}}
1010
{{- if .Values.global.cattle.systemDefaultRegistry -}}
1111
{{ include "system_default_registry" . }}
12-
{{- else if .Values.registry_url -}}
13-
{{- printf "%s/" .Values.registry_url -}}
12+
{{- else if .Values.registryUrl -}}
13+
{{- printf "%s/" .Values.registryUrl -}}
1414
{{- else -}}
1515
{{- "" -}}
1616
{{- end -}}

charts/operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ global:
2727
systemDefaultRegistry: ""
2828

2929
# used only if systemDefaultRegistry is empty
30-
registry_url: ""
30+
registryUrl: ""
3131

3232
# enable debug output for operator
3333
debug: false

0 commit comments

Comments
 (0)