helm: use versioned image

Fix bug #190 Signed-off-by: Lianhao Lu <[email protected]>
opea-project · Aug 6, 2024 · df040bf · df040bf
1 parent db29443
commit df040bf
Show file tree

Hide file tree

Showing 73 changed files with 171 additions and 224 deletions.
diff --git a/helm-charts/chatqna/Chart.yaml b/helm-charts/chatqna/Chart.yaml
@@ -34,4 +34,4 @@ dependencies:
     version: 0.8.0
     repository: "file://../common/data-prep"
 version: 0.8.0
-appVersion: "1.0.0"
+appVersion: "v0.8"
diff --git a/helm-charts/chatqna/README.md b/helm-charts/chatqna/README.md
@@ -52,7 +52,7 @@ curl http://localhost:8888/v1/chatqna \
 
 | Key                             | Type   | Default                       | Description                                                                                                                                                                                                                       |
 | ------------------------------- | ------ | ----------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| image.repository                | string | `"opea/chatqna:latest"`       |                                                                                                                                                                                                                                   |
+| image.repository                | string | `"opea/chatqna"`              |                                                                                                                                                                                                                                   |
 | service.port                    | string | `"8888"`                      |                                                                                                                                                                                                                                   |
 | global.HUGGINGFACEHUB_API_TOKEN | string | `""`                          | Your own Hugging Face API token                                                                                                                                                                                                   |
 | global.modelUseHostPath         | string | `"/mnt/opea-models"`          | Cached models directory, tgi will not download if the model is cached here. The host path "modelUseHostPath" will be mounted to container as /data directory. Set this to empty/null will force it to download models every time. |

diff --git a/helm-charts/chatqna/nv-values.yaml b/helm-charts/chatqna/nv-values.yaml
@@ -1,52 +1,11 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-# Default values for chatqna.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  repository: opea/chatqna:latest
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  # tag: "1.0"
-
-port: 8888
-service:
-  type: ClusterIP
-  port: 8888
-
-securityContext:
-  readOnlyRootFilesystem: true
-  allowPrivilegeEscalation: false
-  runAsNonRoot: true
-  runAsUser: 1000
-  capabilities:
-    drop:
-    - ALL
-  seccompProfile:
-    type: RuntimeDefault
-
 # To override values in subchart tgi
 tgi:
-  LLM_MODEL_ID: Intel/neural-chat-7b-v3-3
-  # LLM_MODEL_ID: /data/OpenCodeInterpreter-DS-6.7B
   image:
     repository: ghcr.io/huggingface/text-generation-inference
     tag: "2.0"
   resources:
     limits:
       nvidia.com/gpu: 1
-
-global:
-  http_proxy:
-  https_proxy:
-  no_proxy:
-  HUGGINGFACEHUB_API_TOKEN: "insert-your-huggingface-token-here"
-  LANGCHAIN_TRACING_V2: false
-  LANGCHAIN_API_KEY: "insert-your-langchain-key-here"
-  # set modelUseHostPath to host directory if you want to use hostPath volume for model storage
-  # comment out modeluseHostPath if you want to download the model from huggingface
-  modelUseHostPath: /mnt/opea-models
diff --git a/helm-charts/chatqna/templates/deployment.yaml b/helm-charts/chatqna/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
               value: {{ .Release.Name }}-embedding-usvc
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - mountPath: /tmp

diff --git a/helm-charts/chatqna/values.yaml b/helm-charts/chatqna/values.yaml
@@ -8,10 +8,10 @@
 replicaCount: 1
 
 image:
-  repository: opea/chatqna:latest
+  repository: opea/chatqna
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  # tag: "1.0"
+  tag: ""
 
 port: 8888
 service:
@@ -32,7 +32,6 @@ securityContext:
 # To override values in subchart tgi
 tgi:
   LLM_MODEL_ID: Intel/neural-chat-7b-v3-3
-  # LLM_MODEL_ID: /data/OpenCodeInterpreter-DS-6.7B
 
 global:
   http_proxy:

diff --git a/helm-charts/codegen/Chart.yaml b/helm-charts/codegen/Chart.yaml
@@ -13,4 +13,4 @@ dependencies:
     version: 0.8.0
     repository: "file://../common/llm-uservice"
 version: 0.8.0
-appVersion: "1.0.0"
+appVersion: "v0.8"
diff --git a/helm-charts/codegen/README.md b/helm-charts/codegen/README.md
@@ -45,7 +45,7 @@ curl http://localhost:7778/v1/codegen \
 
 | Key                             | Type   | Default                        | Description                                                                                                                                                                                                                       |
 | ------------------------------- | ------ | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| image.repository                | string | `"opea/codegen:latest"`        |                                                                                                                                                                                                                                   |
+| image.repository                | string | `"opea/codegen"`               |                                                                                                                                                                                                                                   |
 | service.port                    | string | `"7778"`                       |                                                                                                                                                                                                                                   |
 | global.HUGGINGFACEHUB_API_TOKEN | string | `""`                           | Your own Hugging Face API token                                                                                                                                                                                                   |
 | global.modelUseHostPath         | string | `"/mnt/opea-models"`           | Cached models directory, tgi will not download if the model is cached here. The host path "modelUseHostPath" will be mounted to container as /data directory. Set this to empty/null will force it to download models every time. |

diff --git a/helm-charts/codegen/templates/deployment.yaml b/helm-charts/codegen/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
             #  value: {{ .Values.port }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - mountPath: /tmp

diff --git a/helm-charts/codegen/values.yaml b/helm-charts/codegen/values.yaml
@@ -8,10 +8,10 @@
 replicaCount: 1
 
 image:
-  repository: opea/codegen:latest
+  repository: opea/codegen
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  # tag: "1.0"
+  tag: ""
 
 port: 7778
 service:
@@ -29,12 +29,6 @@ securityContext:
   seccompProfile:
     type: RuntimeDefault
 
-# To override values in subchart llm-uservice
-llm-uservice:
-  image:
-    repository: opea/llm-tgi:latest
-  service:
-    port: 9000
 # To override values in subchart tgi
 tgi:
   LLM_MODEL_ID: meta-llama/CodeLlama-7b-hf

diff --git a/helm-charts/codetrans/Chart.yaml b/helm-charts/codetrans/Chart.yaml
@@ -13,4 +13,4 @@ dependencies:
     version: 0.8.0
     repository: "file://../common/llm-uservice"
 version: 0.8.0
-appVersion: "1.0.0"
+appVersion: "v0.8"
diff --git a/helm-charts/codetrans/README.md b/helm-charts/codetrans/README.md
@@ -38,7 +38,7 @@ curl http://localhost:7777/v1/codetrans \
 
 | Key                             | Type   | Default                           | Description                                                                                                                                                  |
 | ------------------------------- | ------ | --------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| image.repository                | string | `"opea/codetrans:latest"`         |                                                                                                                                                              |
+| image.repository                | string | `"opea/codetrans"`                |                                                                                                                                                              |
 | service.port                    | string | `"7777"`                          |                                                                                                                                                              |
 | global.HUGGINGFACEHUB_API_TOKEN | string | `""`                              | Your own Hugging Face API token                                                                                                                              |
 | global.modelUseHostPath         | string | `"/mnt/opea-models"`              | Cached models directory, tgi will not download if the model is cached here. The host path "modelUseHostPath" will be mounted to container as /data directory |

diff --git a/helm-charts/codetrans/templates/deployment.yaml b/helm-charts/codetrans/templates/deployment.yaml
@@ -40,7 +40,7 @@ spec:
             #  value: {{ .Values.port }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           volumeMounts:
             - mountPath: /tmp

diff --git a/helm-charts/codetrans/values.yaml b/helm-charts/codetrans/values.yaml
@@ -9,10 +9,10 @@ replicaCount: 1
 LLM_SERVICE_HOST_IP: ""
 
 image:
-  repository: opea/codetrans:latest
+  repository: opea/codetrans
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  # tag: "1.0"
+  tag: ""
 
 port: 7777
 service:
@@ -30,16 +30,9 @@ securityContext:
   seccompProfile:
     type: RuntimeDefault
 
-# To override values in subchart llm-uservice
-llm-uservice:
-  image:
-    repository: opea/llm-tgi:latest
-  service:
-    port: 9000
 # To override values in subchart tgi
 tgi:
   LLM_MODEL_ID: HuggingFaceH4/mistral-7b-grok
-  # LLM_MODEL_ID: /data/OpenCodeInterpreter-DS-6.7B
 
 global:
   http_proxy: ""

diff --git a/helm-charts/common/asr/Chart.yaml b/helm-charts/common/asr/Chart.yaml
@@ -7,7 +7,7 @@ description: The Helm chart for deploying asr as microservice
 type: application
 version: 0.8.0
 # The asr microservice server version
-appVersion: "1.0.0"
+appVersion: "v0.8"
 dependencies:
   - name: whisper
     version: 0.8.0

diff --git a/helm-charts/common/asr/README.md b/helm-charts/common/asr/README.md
@@ -44,8 +44,8 @@ curl http://localhost:9099/v1/audio/transcriptions \
 
 ## Values
 
-| Key              | Type   | Default             | Description |
-| ---------------- | ------ | ------------------- | ----------- |
-| image.repository | string | `"opea/asr:latest"` |             |
-| service.port     | string | `"9099"`            |             |
-| ASR_ENDPOINT     | string | `""`                |             |
+| Key              | Type   | Default      | Description |
+| ---------------- | ------ | ------------ | ----------- |
+| image.repository | string | `"opea/asr"` |             |
+| service.port     | string | `"9099"`     |             |
+| ASR_ENDPOINT     | string | `""`         |             |
diff --git a/helm-charts/common/asr/templates/deployment.yaml b/helm-charts/common/asr/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
             {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: asr

diff --git a/helm-charts/common/asr/values.yaml b/helm-charts/common/asr/values.yaml
@@ -13,10 +13,10 @@ replicaCount: 1
 ASR_ENDPOINT: ""
 
 image:
-  repository: opea/asr:latest
+  repository: opea/asr
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  # tag: "1.0"
+  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/helm-charts/common/data-prep/Chart.yaml b/helm-charts/common/data-prep/Chart.yaml
@@ -7,7 +7,7 @@ description: The Helm chart for deploying data prep as microservice
 type: application
 version: 0.8.0
 # The data prep microservice server version
-appVersion: "1.0.0"
+appVersion: "v0.8"
 dependencies:
   - name: tei
     version: 0.8.0

diff --git a/helm-charts/common/data-prep/README.md b/helm-charts/common/data-prep/README.md
@@ -45,9 +45,9 @@ curl http://localhost:6007/v1/dataprep  \
 
 ## Values
 
-| Key                    | Type   | Default                        | Description |
-| ---------------------- | ------ | ------------------------------ | ----------- |
-| image.repository       | string | `"opea/dataprep-redis:latest"` |             |
-| service.port           | string | `"6007"`                       |             |
-| REDIS_URL              | string | `""`                           |             |
-| TEI_EMBEDDING_ENDPOINT | string | `""`                           |             |
+| Key                    | Type   | Default                 | Description |
+| ---------------------- | ------ | ----------------------- | ----------- |
+| image.repository       | string | `"opea/dataprep-redis"` |             |
+| service.port           | string | `"6007"`                |             |
+| REDIS_URL              | string | `""`                    |             |
+| TEI_EMBEDDING_ENDPOINT | string | `""`                    |             |
diff --git a/helm-charts/common/data-prep/templates/deployment.yaml b/helm-charts/common/data-prep/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
             {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}"
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: data-prep

diff --git a/helm-charts/common/data-prep/values.yaml b/helm-charts/common/data-prep/values.yaml
@@ -11,10 +11,10 @@ autodependency:
 replicaCount: 1
 
 image:
-  repository: opea/dataprep-redis:latest
+  repository: opea/dataprep-redis
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  # tag: "1.0"
+  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/helm-charts/common/embedding-usvc/Chart.yaml b/helm-charts/common/embedding-usvc/Chart.yaml
@@ -7,7 +7,7 @@ description: The Helm chart for deploying embedding as microservice
 type: application
 version: 0.8.0
 # The embedding microservice server version
-appVersion: "1.0.0"
+appVersion: "v0.8"
 dependencies:
   - name: tei
     version: 0.8.0

diff --git a/helm-charts/common/embedding-usvc/README.md b/helm-charts/common/embedding-usvc/README.md
@@ -44,8 +44,8 @@ curl http://localhost:6000/v1/embeddings \
 
 ## Values
 
-| Key                    | Type   | Default                       | Description |
-| ---------------------- | ------ | ----------------------------- | ----------- |
-| image.repository       | string | `"opea/embedding-tei:latest"` |             |
-| service.port           | string | `"6000"`                      |             |
-| TEI_EMBEDDING_ENDPOINT | string | `""`                          |             |
+| Key                    | Type   | Default                | Description |
+| ---------------------- | ------ | ---------------------- | ----------- |
+| image.repository       | string | `"opea/embedding-tei"` |             |
+| service.port           | string | `"6000"`               |             |
+| TEI_EMBEDDING_ENDPOINT | string | `""`                   |             |
diff --git a/helm-charts/common/embedding-usvc/templates/deployment.yaml b/helm-charts/common/embedding-usvc/templates/deployment.yaml
@@ -39,8 +39,8 @@ spec:
             {{- end }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}"
-          imagePullPolicy: IfNotPresent
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: embedding-usvc
               containerPort: 6000

diff --git a/helm-charts/common/embedding-usvc/values.yaml b/helm-charts/common/embedding-usvc/values.yaml
@@ -12,10 +12,10 @@ replicaCount: 1
 
 TEI_EMBEDDING_ENDPOINT: ""
 image:
-  repository: opea/embedding-tei:latest
+  repository: opea/embedding-tei
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  #tag: "1.0"
+  tag: ""
 
 imagePullSecrets: []
 nameOverride: ""

diff --git a/helm-charts/common/llm-uservice/Chart.yaml b/helm-charts/common/llm-uservice/Chart.yaml
@@ -7,7 +7,7 @@ description: The Helm chart for deploying llm as microservice
 type: application
 version: 0.8.0
 # The llm microservice server version
-appVersion: "1.0.0"
+appVersion: "v0.8"
 dependencies:
   - name: tgi
     version: 0.8.0

diff --git a/helm-charts/common/llm-uservice/README.md b/helm-charts/common/llm-uservice/README.md
@@ -46,10 +46,10 @@ curl http://localhost:9000/v1/chat/completions \
 
 ## Values
 
-| Key                             | Type   | Default                 | Description                                                                                                                                                  |
-| ------------------------------- | ------ | ----------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| global.HUGGINGFACEHUB_API_TOKEN | string | `""`                    | Your own Hugging Face API token                                                                                                                              |
-| global.modelUseHostPath         | string | `"/mnt/opea-models"`    | Cached models directory, tgi will not download if the model is cached here. The host path "modelUseHostPath" will be mounted to container as /data directory |
-| image.repository                | string | `"opea/llm-tgi:latest"` |                                                                                                                                                              |
-| service.port                    | string | `"9000"`                |                                                                                                                                                              |
-| TGI_LLM_ENDPOINT                | string | `""`                    | LLM endpoint                                                                                                                                                 |
+| Key                             | Type   | Default              | Description                                                                                                                                                  |
+| ------------------------------- | ------ | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| global.HUGGINGFACEHUB_API_TOKEN | string | `""`                 | Your own Hugging Face API token                                                                                                                              |
+| global.modelUseHostPath         | string | `"/mnt/opea-models"` | Cached models directory, tgi will not download if the model is cached here. The host path "modelUseHostPath" will be mounted to container as /data directory |
+| image.repository                | string | `"opea/llm-tgi"`     |                                                                                                                                                              |
+| service.port                    | string | `"9000"`             |                                                                                                                                                              |
+| TGI_LLM_ENDPOINT                | string | `""`                 | LLM endpoint                                                                                                                                                 |