fix: kube-vip registry (#322)

Signed-off-by: PoAn Yang <poan.yang@suse.com>
harvester · Jan 9, 2025 · 878cbc1 · 878cbc1
1 parent 1c75fe5
commit 878cbc1
Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/charts/harvester-cloud-provider/Chart.yaml b/charts/harvester-cloud-provider/Chart.yaml
@@ -18,7 +18,7 @@ keywords:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.8
+version: 0.2.9
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -31,7 +31,7 @@ annotations:
   catalog.cattle.io/kube-version: '>= 1.23.0-0'
   catalog.cattle.io/release-name: harvester-cloud-provider
   catalog.cattle.io/os: linux
-  catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.10.0-0'
+  catalog.cattle.io/rancher-version: '>= 2.7.0-0'
   catalog.cattle.io/ui-component: harvester-cloud-provider
   catalog.cattle.io/display-name: Harvester Cloud Provider
   # The version of the upstream chart or app. It prevents the unexpected "downgrade"

diff --git a/charts/harvester-cloud-provider/charts/kube-vip-0.6.4.tgz b/charts/harvester-cloud-provider/charts/kube-vip-0.6.4.tgz
diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/_helpers.tpl b/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/_helpers.tpl
@@ -78,3 +78,14 @@ Convert string to boolean
 {{- default . false -}}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Global system default registry
+*/}}
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/daemonset.yaml b/charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/daemonset.yaml
@@ -53,7 +53,7 @@ spec:
         envFrom:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-        image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+        image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         name: kube-vip
         resources: