From 24d6d8d9452a151cc4a7366be8d66e1de36796be Mon Sep 17 00:00:00 2001 From: ChengjieLi Date: Thu, 1 Aug 2024 15:52:26 +0800 Subject: [PATCH] BUG: cannot pull older version of xinference --- charts/xinference/Chart.yaml | 2 +- charts/xinference/templates/deployment-supervisor.yaml | 4 ++++ charts/xinference/templates/deployment-worker.yaml | 4 ++++ charts/xinference/values.yaml | 2 +- examples/values-distributed-case.yaml | 2 +- examples/values-local-storage.yaml | 2 +- 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/charts/xinference/Chart.yaml b/charts/xinference/Chart.yaml index e2baf2d..4a9a2c4 100644 --- a/charts/xinference/Chart.yaml +++ b/charts/xinference/Chart.yaml @@ -18,4 +18,4 @@ version: 0.0.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "0.14.0" +appVersion: "v0.14.0" diff --git a/charts/xinference/templates/deployment-supervisor.yaml b/charts/xinference/templates/deployment-supervisor.yaml index ee41d19..0b80073 100644 --- a/charts/xinference/templates/deployment-supervisor.yaml +++ b/charts/xinference/templates/deployment-supervisor.yaml @@ -78,7 +78,11 @@ spec: - name: {{ $key }} value: {{ $value }} {{- end }} +{{- if .Values.config.xinference_image }} image: {{ .Values.config.xinference_image | quote }} +{{- else }} + image: "xprobe/xinference:{{ .Chart.AppVersion }}" +{{- end }} {{- if .Values.config.image_pull_policy }} imagePullPolicy: {{ .Values.config.image_pull_policy }} {{- end }} diff --git a/charts/xinference/templates/deployment-worker.yaml b/charts/xinference/templates/deployment-worker.yaml index 2196e4d..d67d91b 100644 --- a/charts/xinference/templates/deployment-worker.yaml +++ b/charts/xinference/templates/deployment-worker.yaml @@ -45,7 +45,11 @@ spec: valueFrom: fieldRef: fieldPath: metadata.name +{{- if .Values.config.xinference_image }} image: {{ .Values.config.xinference_image | quote }} +{{- else }} + image: "xprobe/xinference:{{ .Chart.AppVersion }}" +{{- end }} {{- if .Values.config.image_pull_policy }} imagePullPolicy: {{ .Values.config.image_pull_policy }} {{- end }} diff --git a/charts/xinference/values.yaml b/charts/xinference/values.yaml index eb8d83a..4e2b3b7 100644 --- a/charts/xinference/values.yaml +++ b/charts/xinference/values.yaml @@ -1,6 +1,6 @@ # common used configurations config: - xinference_image: xprobe/xinference:latest + xinference_image: "" curl_image: curlimages/curl:8.8.0 image_pull_policy: "" worker_num: 1 diff --git a/examples/values-distributed-case.yaml b/examples/values-distributed-case.yaml index c9a2c03..c391e16 100644 --- a/examples/values-distributed-case.yaml +++ b/examples/values-distributed-case.yaml @@ -9,7 +9,7 @@ # common used configurations config: - xinference_image: xprobe/xinference:latest + xinference_image: "" curl_image: curlimages/curl:8.8.0 image_pull_policy: "" worker_num: 4 diff --git a/examples/values-local-storage.yaml b/examples/values-local-storage.yaml index 37260c7..77b1275 100644 --- a/examples/values-local-storage.yaml +++ b/examples/values-local-storage.yaml @@ -12,7 +12,7 @@ # common used configurations config: - xinference_image: xprobe/xinference:latest + xinference_image: "" curl_image: curlimages/curl:8.8.0 image_pull_policy: "" worker_num: 2