Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/hami/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ maintainers:
email: [email protected]
- name: zhangxiao
email: [email protected]
appVersion: "2.5.0"
appVersion: "v2.5.0"

4 changes: 2 additions & 2 deletions charts/hami/templates/device-plugin/daemonsetnvidia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion charts/hami/templates/scheduler/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
1 change: 0 additions & 1 deletion charts/hami/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
nameOverride: ""
fullnameOverride: ""
imagePullSecrets: [ ]
version: "v2.5.0"

#Nvidia GPU Parameters
resourceName: "nvidia.com/gpu"
Expand Down
1 change: 0 additions & 1 deletion docs/release-process.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/verify-chart-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down