feat(chart): support appVersion as the default image tag

Signed-off-by: Zubiao Xiong <[email protected]>
Project-HAMi · Jan 23, 2025 · 3589c95 · 3589c95
1 parent 7fe6183
commit 3589c95
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/charts/Makefile b/charts/Makefile
@@ -20,7 +20,7 @@ update-versions:
 	hami_version="$(VERSION)";		\
 	chart_version=` echo $(VERSION) | tr -d 'v' ` ; \
 	sed -i 's/version: "*'$(VERSION_REGEX)'"*/version: '$$chart_version'/g' $(CHART_FILE);		\
-	sed -i 's/appVersion: "*'$(VERSION_REGEX)'"*/appVersion: "'$$chart_version'"/g' $(CHART_FILE);	\
+	sed -i 's/appVersion: "*'$(VERSION_REGEX)'"*/appVersion: "'$$hami_version'"/g' $(CHART_FILE);	\
 	sed -i 's/version: "*'$(VERSION_REGEX)'"*/version: "'$$hami_version'"/g' $(VALUES_FILE)
 
 lint: update-versions

diff --git a/charts/hami/Chart.yaml b/charts/hami/Chart.yaml
@@ -12,5 +12,5 @@ maintainers:
     email: [email protected]
   - name: zhangxiao
     email: [email protected]
-appVersion: "2.4.1"
+appVersion: "v2.4.1"
 
diff --git a/charts/hami/templates/device-plugin/daemonsetnvidia.yaml b/charts/hami/templates/device-plugin/daemonsetnvidia.yaml
@@ -40,7 +40,7 @@ spec:
       hostNetwork: true
       containers:
         - name: device-plugin
-          image: {{ .Values.devicePlugin.image }}:{{ .Values.version }}
+          image: {{ .Values.devicePlugin.image }}:{{ .Values.version | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.devicePlugin.imagePullPolicy | quote }}
           lifecycle:
             postStart:
@@ -90,7 +90,7 @@ spec:
               mountPath: /device-config.yaml
               subPath: device-config.yaml
         - name: vgpu-monitor
-          image: {{ .Values.devicePlugin.image }}:{{ .Values.version }}
+          image: {{ .Values.devicePlugin.image }}:{{ .Values.version | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.devicePlugin.imagePullPolicy | quote }}
           command: ["vGPUmonitor"]
           securityContext:

diff --git a/charts/hami/templates/scheduler/deployment.yaml b/charts/hami/templates/scheduler/deployment.yaml
@@ -69,7 +69,7 @@ spec:
             timeoutSeconds: 15
           {{- end }}
         - name: vgpu-scheduler-extender
-          image: {{ .Values.scheduler.extender.image }}:{{ .Values.version }}
+          image: {{ .Values.scheduler.extender.image }}:{{ .Values.version | default .Chart.AppVersion }}
           imagePullPolicy: {{ .Values.scheduler.extender.imagePullPolicy | quote }}
           env:
           {{- if .Values.global.managedNodeSelectorEnable }}

diff --git a/charts/hami/values.yaml b/charts/hami/values.yaml
@@ -2,8 +2,7 @@
 
 nameOverride: ""
 fullnameOverride: ""
-imagePullSecrets: [ ]
-version: "v2.4.1"
+imagePullSecrets: []
 
 #Nvidia GPU Parameters
 resourceName: "nvidia.com/gpu"

diff --git a/docs/release-process.md b/docs/release-process.md
@@ -59,7 +59,6 @@ This is the architecture diagram of the HAMi release process
 Update version information through PR and create a new tag
 
 * update 'version' and 'appVersion' filed in 'charts/hami/Chart.yaml' by pr
-* update 'version' in 'charts/hami/values.yaml' by pr
 * update version in '/VERSION' by pr
 * a version tag should be set on right branch. The version should go with
   * v0.1.0

diff --git a/hack/verify-chart-version.sh b/hack/verify-chart-version.sh
@@ -31,7 +31,7 @@ else
   util::install_helm
 fi
 
-APP_VERSION=$(helm show chart ./charts/hami | grep '^appVersion' |grep -E '[0-9].*.[0-9]' | awk -F ':' '{print $2}' | tr -d ' ')
+APP_VERSION=$(helm show chart ./charts/hami | grep '^appVersion' |grep -E '[0-9].*.[0-9]' | awk -F ':' '{print $2}' | tr -d ' ' | cut -c2-)
 VERSION=$(helm show chart ./charts/hami | grep '^version' |grep -E '[0-9].*.[0-9]' | awk -F ':' '{print $2}' | tr -d ' ')
 
 if [[ ${APP_VERSION} != ${VERSION} ]]; then