Allow overriding appVersion via Helm values

stackhpc · Aug 30, 2024 · 2992cdc · 2992cdc
1 parent 65e99e2
commit 2992cdc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git a/deployment/helm/templates/api-deployment.yaml b/deployment/helm/templates/api-deployment.yaml
@@ -37,7 +37,7 @@ spec:
         - name: api-server
           securityContext:
             {{- toYaml .Values.api.securityContext | nindent 12 }}
-          image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.api.image.repository }}:{{ .Values.api.image.tag | default .Values.appVersionOverride | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.api.image.pullPolicy }}
           command:
             - "/bin/sh"

diff --git a/deployment/helm/templates/background-deployment.yaml b/deployment/helm/templates/background-deployment.yaml
@@ -37,7 +37,7 @@ spec:
         - name: background
           securityContext:
             {{- toYaml .Values.background.securityContext | nindent 12 }}
-          image: "{{ .Values.background.image.repository }}:{{ .Values.background.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.background.image.repository }}:{{ .Values.background.image.tag | default .Values.appVersionOverride | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.background.image.pullPolicy }}
           command: ["/usr/bin/supervisord"]
           resources:

diff --git a/deployment/helm/templates/indexing-model-deployment.yaml b/deployment/helm/templates/indexing-model-deployment.yaml
@@ -28,7 +28,7 @@ spec:
     spec:
       containers:
       - name: indexing-model-server
-        image: "{{ .Values.indexCapability.deployment.image.repository }}:{{ .Values.indexCapability.deployment.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.indexCapability.deployment.image.repository }}:{{ .Values.indexCapability.deployment.image.tag | default .Values.appVersionOverride | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.indexCapability.deployment.image.pullPolicy }}
         command: [ "uvicorn", "model_server.main:app", "--host", "0.0.0.0", "--port", "9000", "--limit-concurrency", "10" ]
         {{- if .Values.indexCapability.deployment.resources }}

diff --git a/deployment/helm/templates/inference-model-deployment.yaml b/deployment/helm/templates/inference-model-deployment.yaml
@@ -22,7 +22,7 @@ spec:
     spec:
       containers:
       - name: {{ .Values.inferenceCapability.service.name }}
-        image: "{{ .Values.inferenceCapability.deployment.image.repository }}:{{ .Values.inferenceCapability.deployment.image.tag | default .Chart.AppVersion }}"
+        image: "{{ .Values.inferenceCapability.deployment.image.repository }}:{{ .Values.inferenceCapability.deployment.image.tag | default .Values.appVersionOverride | default .Chart.AppVersion }}"
         imagePullPolicy: {{ .Values.inferenceCapability.deployment.image.pullPolicy }}
         command: {{ toYaml .Values.inferenceCapability.deployment.command | nindent 14 }}
         ports:

diff --git a/deployment/helm/templates/webserver-deployment.yaml b/deployment/helm/templates/webserver-deployment.yaml
@@ -37,7 +37,7 @@ spec:
         - name: web-server
           securityContext:
             {{- toYaml .Values.webserver.securityContext | nindent 12 }}
-          image: "{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag | default .Chart.AppVersion }}"
+          image: "{{ .Values.webserver.image.repository }}:{{ .Values.webserver.image.tag | default .Values.appVersionOverride | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.webserver.image.pullPolicy }}
           ports:
             - name: http

diff --git a/deployment/helm/values.yaml b/deployment/helm/values.yaml
@@ -5,6 +5,7 @@
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
+appVersionOverride: # e.g "v0.3.93"
 
 inferenceCapability:
   service: