From 878cbc1f103e852bffeff1bb01f2e911edcaf9ab Mon Sep 17 00:00:00 2001 From: PoAn Yang Date: Thu, 9 Jan 2025 14:09:46 +0800 Subject: [PATCH] fix: kube-vip registry (#322) Signed-off-by: PoAn Yang --- charts/harvester-cloud-provider/Chart.yaml | 4 ++-- .../charts/kube-vip-0.6.4.tgz | Bin 3454 -> 3519 bytes .../kube-vip/templates/_helpers.tpl | 11 +++++++++++ .../kube-vip/templates/daemonset.yaml | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/charts/harvester-cloud-provider/Chart.yaml b/charts/harvester-cloud-provider/Chart.yaml index 2ecb8229..b4bd73b5 100644 --- 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 index 3e703157f3d398e0ab53691c1bb96d7523ab75cb..091fbd87316fa0e342dfb38afbfa5106458640fe 100644 GIT binary patch delta 3493 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 To7=ww00960g)*T~06qW!4S4SU delta 3427 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 F003kMr>_72 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 index e1d1776d..22eac910 100644 --- 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 index 77e3e598..f8e698e4 100644 --- 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: