mirror of https://git.rancher.io/rke2-charts
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
--- charts-original/templates/_helpers.tpl
|
|
+++ charts/templates/_helpers.tpl
|
|
@@ -118,7 +118,7 @@
|
|
Check the ingress controller version tag is at most three versions behind the last release
|
|
*/}}
|
|
{{- define "isControllerTagValid" -}}
|
|
-{{- if not (semverCompare ">=0.27.0-0" .Values.controller.image.tag) -}}
|
|
+{{- if not (semverCompare ">=0.27.0-0" (trimPrefix "nginx-" .Values.controller.image.tag)) -}}
|
|
{{- fail "Controller container image tag should be 0.27.0 or higher" -}}
|
|
{{- end -}}
|
|
{{- end -}}
|
|
@@ -132,3 +132,15 @@
|
|
{{ toYaml .Values.controller.ingressClassResource.parameters | indent 4}}
|
|
{{ end }}
|
|
{{- end -}}
|
|
+
|
|
+{{- define "system_default_registry" -}}
|
|
+{{- if .Values.global.systemDefaultRegistry -}}
|
|
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
|
|
+{{- else -}}
|
|
+{{- "" -}}
|
|
+{{- end -}}
|
|
+{{- end -}}
|
|
+
|
|
+{{- define "repository_or_registry_and_image" -}}
|
|
+{{- if .repository -}}{{ .repository }}{{ else }}{{ .registry }}/{{ .image }}{{- end -}}:{{ .tag }}{{- if (.digest) -}} @{{.digest}} {{- end -}}
|
|
+{{- end -}}
|