Skip to content

Commit

Permalink
Use default kubernetes imagePullPolicy (#587)
Browse files Browse the repository at this point in the history
* Use kubernetes default imagePullPolicy.
* Use 0-latest as dev version for helm charts
* Add comments for pullPolicy and set as Optional value

Signed-off-by: Dolpher Du <dolpher.du@intel.com>
  • Loading branch information
yongfengdu authored Nov 27, 2024
1 parent da0846e commit 0f21681
Show file tree
Hide file tree
Showing 149 changed files with 394 additions and 325 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/manual-freeze-tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@ on:
workflow_dispatch:
inputs:
oldversion:
default: "1.1-dev"
default: "0-latest"
description: "Old helm version to be replaced"
required: true
type: string
newversion:
default: "1.1.0"
default: "1.2.0"
description: "New helm version to replace"
required: true
type: string
imageversion:
default: "1.1"
default: "1.2"
description: "New image version to replace"
required: true
type: string
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/manual-release-charts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
workflow_dispatch:
inputs:
version:
default: "1.1.0"
default: "0-latest"
description: "Release Version"
required: true
type: string
Expand Down
22 changes: 11 additions & 11 deletions helm-charts/agentqna/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,37 +7,37 @@ description: The Helm chart to deploy AgentQnA
type: application
dependencies:
- name: agent
version: 1.0.0
version: 0-latest
alias: worker
repository: "file://../common/agent"
- name: agent
version: 1.0.0
version: 0-latest
alias: supervisor
repository: "file://../common/agent"
- name: tgi
version: 1.0.0
version: 0-latest
repository: "file://../common/tgi"
condition: tgi.enabled
- name: tei
version: 1.0.0
version: 0-latest
repository: "file://../common/tei"
- name: embedding-usvc
version: 1.0.0
version: 0-latest
repository: "file://../common/embedding-usvc"
- name: teirerank
version: 1.0.0
version: 0-latest
repository: "file://../common/teirerank"
- name: reranking-usvc
version: 1.0.0
version: 0-latest
repository: "file://../common/reranking-usvc"
- name: redis-vector-db
version: 1.0.0
version: 0-latest
repository: "file://../common/redis-vector-db"
- name: retriever-usvc
version: 1.0.0
version: 0-latest
repository: "file://../common/retriever-usvc"
- name: data-prep
version: 1.0.0
version: 0-latest
repository: "file://../common/data-prep"
version: 1.0.0
version: 0-latest
appVersion: "v1.0"
2 changes: 2 additions & 0 deletions helm-charts/agentqna/templates/crag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.crag.image.repository }}:{{ .Values.crag.image.tag | default .Chart.AppVersion }}"
{{- if .Values.crag.image.pullPolicy }}
imagePullPolicy: {{ .Values.crag.image.pullPolicy }}
{{- end }}
volumeMounts:
- mountPath: /tmp
name: tmp
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/agentqna/templates/docretriever.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,9 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.docretriever.image.repository }}:{{ .Values.docretriever.image.tag | default .Chart.AppVersion }}"
{{- if .Values.docretriever.image.pullPolicy }}
imagePullPolicy: {{ .Values.docretriever.image.pullPolicy }}
{{- end }}
volumeMounts:
- mountPath: /tmp
name: tmp
Expand Down
12 changes: 8 additions & 4 deletions helm-charts/agentqna/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ horizontalPodAutoscaler:
docretriever:
image:
repository: opea/doc-index-retriever
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"

Expand All @@ -42,7 +43,8 @@ worker:
port: 9095
image:
repository: opea/agent-langchain
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
strategy: rag_agent_llama
Expand All @@ -63,7 +65,8 @@ supervisor:
port: 9090
image:
repository: opea/agent-langchain
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"
strategy: react_llama
Expand All @@ -82,7 +85,8 @@ supervisor:
crag:
image:
repository: aicrowd/kdd-cup-24-crag-mock-api
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "v0"

Expand Down
16 changes: 8 additions & 8 deletions helm-charts/audioqna/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@ description: The Helm chart to deploy AudioQnA
type: application
dependencies:
- name: asr
version: 1.0.0
version: 0-latest
repository: "file://../common/asr"
- name: whisper
version: 1.0.0
version: 0-latest
repository: "file://../common/whisper"
- name: tts
version: 1.0.0
version: 0-latest
repository: "file://../common/tts"
- name: speecht5
version: 1.0.0
version: 0-latest
repository: "file://../common/speecht5"
- name: tgi
version: 1.0.0
version: 0-latest
repository: "file://../common/tgi"
- name: llm-uservice
version: 1.0.0
version: 0-latest
repository: "file://../common/llm-uservice"
# Uncomment the following to enable UI when the UI image is ready on DockerHub
# - name: ui
# version: 1.0.0
# version: 0-latest
# repository: "file://../common/ui"
# alias: audioqna-ui
version: 1.0.0
version: 0-latest
appVersion: "1.1"
2 changes: 2 additions & 0 deletions helm-charts/audioqna/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
volumeMounts:
- mountPath: /tmp
name: tmp
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/audioqna/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ spec:
spec:
containers:
- image: nginx:1.27.1
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
name: nginx
volumeMounts:
- mountPath: /etc/nginx/conf.d
Expand Down
3 changes: 2 additions & 1 deletion helm-charts/audioqna/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ replicaCount: 1

image:
repository: opea/audioqna
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"

Expand Down
20 changes: 10 additions & 10 deletions helm-charts/chatqna/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,35 +7,35 @@ description: The Helm chart to deploy ChatQnA
type: application
dependencies:
- name: tgi
version: 1.0.0
version: 0-latest
alias: tgi-guardrails
repository: "file://../common/tgi"
condition: guardrails-usvc.enabled
- name: guardrails-usvc
version: 1.0.0
version: 0-latest
repository: "file://../common/guardrails-usvc"
condition: guardrails-usvc.enabled
- name: tgi
version: 1.0.0
version: 0-latest
repository: "file://../common/tgi"
- name: tei
version: 1.0.0
version: 0-latest
repository: "file://../common/tei"
- name: teirerank
version: 1.0.0
version: 0-latest
repository: "file://../common/teirerank"
- name: redis-vector-db
version: 1.0.0
version: 0-latest
repository: "file://../common/redis-vector-db"
- name: retriever-usvc
version: 1.0.0
version: 0-latest
repository: "file://../common/retriever-usvc"
- name: data-prep
version: 1.0.0
version: 0-latest
repository: "file://../common/data-prep"
- name: ui
alias: chatqna-ui
version: 1.0.0
version: 0-latest
repository: "file://../common/ui"
version: 1.0.0
version: 0-latest
appVersion: "v1.0"
2 changes: 2 additions & 0 deletions helm-charts/chatqna/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,9 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
volumeMounts:
- mountPath: /tmp
name: tmp
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/chatqna/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ spec:
spec:
containers:
- image: nginx:1.27.1
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
name: nginx
volumeMounts:
- mountPath: /etc/nginx/conf.d
Expand Down
3 changes: 2 additions & 1 deletion helm-charts/chatqna/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ replicaCount: 1

image:
repository: opea/chatqna
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"

Expand Down
8 changes: 4 additions & 4 deletions helm-charts/codegen/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ description: The Helm chart to deploy CodeGen
type: application
dependencies:
- name: tgi
version: 1.0.0
version: 0-latest
repository: "file://../common/tgi"
- name: llm-uservice
version: 1.0.0
version: 0-latest
repository: "file://../common/llm-uservice"
- name: ui
version: 1.0.0
version: 0-latest
repository: "file://../common/ui"
alias: codegen-ui
version: 1.0.0
version: 0-latest
appVersion: "v1.0"
2 changes: 2 additions & 0 deletions helm-charts/codegen/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
volumeMounts:
- mountPath: /tmp
name: tmp
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/codegen/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ spec:
spec:
containers:
- image: nginx:1.27.1
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
name: nginx
volumeMounts:
- mountPath: /etc/nginx/conf.d
Expand Down
3 changes: 2 additions & 1 deletion helm-charts/codegen/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ replicaCount: 1

image:
repository: opea/codegen
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"

Expand Down
8 changes: 4 additions & 4 deletions helm-charts/codetrans/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ description: The Helm chart to deploy CodeTrans
type: application
dependencies:
- name: tgi
version: 1.0.0
version: 0-latest
repository: "file://../common/tgi"
- name: llm-uservice
version: 1.0.0
version: 0-latest
repository: "file://../common/llm-uservice"
- name: ui
version: 1.0.0
version: 0-latest
repository: "file://../common/ui"
alias: codetrans-ui
version: 1.0.0
version: 0-latest
appVersion: "v1.0"
2 changes: 2 additions & 0 deletions helm-charts/codetrans/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
volumeMounts:
- mountPath: /tmp
name: tmp
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/codetrans/templates/nginx-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ spec:
spec:
containers:
- image: nginx:1.27.1
{{- if .Values.image.pullPolicy }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- end }}
name: nginx
volumeMounts:
- mountPath: /etc/nginx/conf.d
Expand Down
3 changes: 2 additions & 1 deletion helm-charts/codetrans/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ LLM_SERVICE_HOST_IP: ""

image:
repository: opea/codetrans
pullPolicy: IfNotPresent
# Uncomment the following line to set desired image pull policy if needed, as one of Always, IfNotPresent, Never.
# pullPolicy: ""
# Overrides the image tag whose default is the chart appVersion.
tag: "latest"

Expand Down
6 changes: 3 additions & 3 deletions helm-charts/common/agent/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ apiVersion: v2
name: agent
description: The Helm chart for deploying agent microservice
type: application
version: 1.0.0
version: 0-latest
# The llm microservice server version
appVersion: "v1.0"
dependencies:
- name: tgi
version: 1.0.0
version: 0-latest
repository: file://../tgi
condition: tgi.enabled
- name: vllm
version: 1.0.0
version: 0-latest
repository: file://../vllm
condition: vllm.enabled
Loading

0 comments on commit 0f21681

Please sign in to comment.