Skip to content

Commit

Permalink
Sync the value files with Components and Example (#698)
Browse files Browse the repository at this point in the history
* New values file name with newci

Rename custom values files for ci change, and keep consistent with Example and Components.
Remove values files link begin with ci.
Add a script and mapping file to track sync status of duplicated file between repos.
Add default minimal resource requests for all charts.

Signed-off-by: Dolpher Du <dolpher.du@intel.com>

* Remove ci file in helmignore

Signed-off-by: Dolpher Du <dolpher.du@intel.com>

---------

Signed-off-by: Dolpher Du <dolpher.du@intel.com>
  • Loading branch information
yongfengdu authored Jan 16, 2025
1 parent 0934c9d commit d5cfeb4
Show file tree
Hide file tree
Showing 136 changed files with 507 additions and 263 deletions.
1 change: 1 addition & 0 deletions helm-charts/agentqna/gaudi-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# by overriding their subchart values

tgi:
enabled: true
accelDevice: "gaudi"
image:
repository: ghcr.io/huggingface/tgi-gaudi
Expand Down
1 change: 0 additions & 1 deletion helm-charts/audioqna/ci-gaudi-values.yaml

This file was deleted.

1 change: 0 additions & 1 deletion helm-charts/audioqna/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/audioqna/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

tgi:
LLM_MODEL_ID: Intel/neural-chat-7b-v3-3
2 changes: 0 additions & 2 deletions helm-charts/audioqna/gaudi-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,13 @@ tgi:
whisper:
image:
repository: opea/whisper-gaudi
tag: "latest"
resources:
limits:
habana.ai/gaudi: 1

speecht5:
image:
repository: opea/speecht5-gaudi
tag: "latest"
resources:
limits:
habana.ai/gaudi: 1
1 change: 0 additions & 1 deletion helm-charts/chatqna/ci-gaudi-tgi-values.yaml

This file was deleted.

1 change: 0 additions & 1 deletion helm-charts/chatqna/ci-gaudi-vllm-values.yaml

This file was deleted.

1 change: 0 additions & 1 deletion helm-charts/chatqna/ci-guardrails-gaudi-values.yaml

This file was deleted.

1 change: 0 additions & 1 deletion helm-charts/chatqna/ci-values.yaml

This file was deleted.

File renamed without changes.
1 change: 0 additions & 1 deletion helm-charts/chatqna/gaudi-vllm-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ vllm:
accelDevice: "gaudi"
image:
repository: opea/vllm-gaudi
tag: "latest"
resources:
limits:
habana.ai/gaudi: 1
Expand Down
1 change: 0 additions & 1 deletion helm-charts/chatqna/guardrails-gaudi-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

image:
repository: opea/chatqna-guardrails
tag: "latest"

# guardrails related config
guardrails-usvc:
Expand Down
1 change: 0 additions & 1 deletion helm-charts/chatqna/guardrails-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

image:
repository: opea/chatqna-guardrails
tag: "latest"

# guardrails related config
guardrails-usvc:
Expand Down
40 changes: 40 additions & 0 deletions helm-charts/check_values.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#!/bin/bash
# Copyright (C) 2025 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

#set -xe

function check_chart {
chart=$1
valuefiles=$(yq eval ".$chart.values" $configfile |sed 's/^- //')

echo "Checking value files for $chart ..."
src_repo=$(yq eval ".$chart.src_repo" $configfile)
dest_repo=$(yq eval ".$chart.dest_repo" $configfile)
src_dir=$(yq eval ".$chart.src_dir" $configfile)
dest_dir=$(yq eval ".$chart.dest_dir" $configfile)
echo $valuefiles
for valuefile in $valuefiles; do
echo “ Checking $valuefile
# wget https://raw.githubusercontent.com/opea-project/${src_repo}/refs/heads/main/${src_dir}/${valuefile} -qO tmp/src.yaml
# Use local version src values
if [[ -d $chart ]]; then
cp $chart/$valuefile tmp/src.yaml
else
cp common/$chart/$valuefile tmp/src.yaml
fi
wget https://raw.githubusercontent.com/opea-project/${dest_repo}/refs/heads/main/${dest_dir}/${valuefile} -qO tmp/dest.yaml
diff tmp/src.yaml tmp/dest.yaml
rm tmp/src.yaml tmp/dest.yaml
done
}

configfile=valuefiles.yaml

charts_list=${1:-$(cat valuefiles.yaml |grep -v "^#" |grep -v "^ " |grep -v "^$" |sed 's/:/ /')}

echo $charts_list
mkdir -p tmp
for chart in $charts_list;do
check_chart $chart
done
1 change: 0 additions & 1 deletion helm-charts/codegen/ci-gaudi-values.yaml

This file was deleted.

1 change: 0 additions & 1 deletion helm-charts/codegen/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/codegen/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

tgi:
LLM_MODEL_ID: Qwen/Qwen2.5-Coder-7B-Instruct
1 change: 1 addition & 0 deletions helm-charts/codegen/gaudi-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

tgi:
accelDevice: "gaudi"
LLM_MODEL_ID: Qwen/Qwen2.5-Coder-7B-Instruct
image:
repository: ghcr.io/huggingface/tgi-gaudi
tag: "2.0.6"
Expand Down
1 change: 0 additions & 1 deletion helm-charts/codetrans/ci-gaudi-values.yaml

This file was deleted.

1 change: 0 additions & 1 deletion helm-charts/codetrans/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/codetrans/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

tgi:
LLM_MODEL_ID: mistralai/Mistral-7B-Instruct-v0.3
1 change: 0 additions & 1 deletion helm-charts/common/agent/ci-gaudi-values.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions helm-charts/common/agent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,17 @@ service:
# The default port for agent service is 9090
port: 9090

resources: {}
resources:
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
requests:
cpu: 100m
memory: 128Mi

livenessProbe:
httpGet:
Expand Down
2 changes: 0 additions & 2 deletions helm-charts/common/asr/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@
.idea/
*.tmproj
.vscode/
# CI values
ci*-values.yaml
9 changes: 0 additions & 9 deletions helm-charts/common/asr/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/asr/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

whisper:
enabled: true
9 changes: 0 additions & 9 deletions helm-charts/common/chathistory-usvc/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/chathistory-usvc/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

mongodb:
enabled: true
8 changes: 4 additions & 4 deletions helm-charts/common/chathistory-usvc/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ service:
type: ClusterIP
port: 6012

resources: {}
resources:
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
requests:
cpu: 100m
memory: 128Mi

livenessProbe:
httpGet:
Expand Down
3 changes: 0 additions & 3 deletions helm-charts/common/data-prep/milvus-values.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

# Default values for data-prep.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.
milvus:
enabled: true
cluster:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

# Default values for data-prep.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

tei:
enabled: true
redis-vector-db:
Expand Down
8 changes: 4 additions & 4 deletions helm-charts/common/data-prep/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ service:
type: ClusterIP
port: 6007

resources: {}
resources:
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
requests:
cpu: 100m
memory: 128Mi

livenessProbe:
httpGet:
Expand Down
2 changes: 0 additions & 2 deletions helm-charts/common/embedding-usvc/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@
.idea/
*.tmproj
.vscode/
# CI values
ci*-values.yaml
13 changes: 0 additions & 13 deletions helm-charts/common/embedding-usvc/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/embedding-usvc/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

tei:
enabled: true
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

# Default values for embedding-usvc.
# This is a YAML-formatted file.
# Declare variables to be passed into your templates.

tei:
enabled: false
mm-embedding:
Expand Down
2 changes: 0 additions & 2 deletions helm-charts/common/gpt-sovits/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@
.idea/
*.tmproj
.vscode/
# CI values
ci*-values.yaml
1 change: 0 additions & 1 deletion helm-charts/common/gpt-sovits/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/gpt-sovits/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

image:
repository: opea/gpt-sovits
9 changes: 0 additions & 9 deletions helm-charts/common/guardrails-usvc/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/guardrails-usvc/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

tgi-guardrails:
enabled: true
8 changes: 4 additions & 4 deletions helm-charts/common/guardrails-usvc/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ service:
type: ClusterIP
port: 9090

resources: {}
resources:
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
# limits:
# cpu: 100m
# memory: 128Mi
# requests:
# cpu: 100m
# memory: 128Mi
requests:
cpu: 100m
memory: 128Mi

livenessProbe:
httpGet:
Expand Down
2 changes: 0 additions & 2 deletions helm-charts/common/llm-uservice/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@
.idea/
*.tmproj
.vscode/
# CI values
ci*-values.yaml
9 changes: 0 additions & 9 deletions helm-charts/common/llm-uservice/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/llm-uservice/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

tgi:
enabled: true
2 changes: 0 additions & 2 deletions helm-charts/common/lvm-serve/.helmignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,3 @@
.idea/
*.tmproj
.vscode/
# CI values
ci*-values.yaml
1 change: 0 additions & 1 deletion helm-charts/common/lvm-serve/ci-values.yaml

This file was deleted.

5 changes: 5 additions & 0 deletions helm-charts/common/lvm-serve/cpu-values.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

image:
repository: opea/lvm-llava
Loading

0 comments on commit d5cfeb4

Please sign in to comment.