Skip to content

Commit 878cbc1

Browse files
fix: kube-vip registry (#322)
Signed-off-by: PoAn Yang <[email protected]>
1 parent 1c75fe5 commit 878cbc1

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

charts/harvester-cloud-provider/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ keywords:
1818
# This is the chart version. This version number should be incremented each time you make changes
1919
# to the chart and its templates, including the app version.
2020
# Versions are expected to follow Semantic Versioning (https://semver.org/)
21-
version: 0.2.8
21+
version: 0.2.9
2222

2323
# This is the version number of the application being deployed. This version number should be
2424
# incremented each time you make changes to the application. Versions are not expected to
@@ -31,7 +31,7 @@ annotations:
3131
catalog.cattle.io/kube-version: '>= 1.23.0-0'
3232
catalog.cattle.io/release-name: harvester-cloud-provider
3333
catalog.cattle.io/os: linux
34-
catalog.cattle.io/rancher-version: '>= 2.7.0-0 < 2.10.0-0'
34+
catalog.cattle.io/rancher-version: '>= 2.7.0-0'
3535
catalog.cattle.io/ui-component: harvester-cloud-provider
3636
catalog.cattle.io/display-name: Harvester Cloud Provider
3737
# The version of the upstream chart or app. It prevents the unexpected "downgrade"
65 Bytes
Binary file not shown.

charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/_helpers.tpl

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,3 +78,14 @@ Convert string to boolean
7878
{{- default . false -}}
7979
{{- end -}}
8080
{{- end -}}
81+
82+
{{/*
83+
Global system default registry
84+
*/}}
85+
{{- define "system_default_registry" -}}
86+
{{- if .Values.global.cattle.systemDefaultRegistry -}}
87+
{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
88+
{{- else -}}
89+
{{- "" -}}
90+
{{- end -}}
91+
{{- end -}}

charts/harvester-cloud-provider/dependency_charts/kube-vip/templates/daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ spec:
5353
envFrom:
5454
{{- toYaml . | nindent 8 }}
5555
{{- end }}
56-
image: {{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
56+
image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
5757
imagePullPolicy: {{ .Values.image.pullPolicy }}
5858
name: kube-vip
5959
resources:

0 commit comments

Comments
 (0)