diff --git a/helm-charts/agentqna/gaudi-values.yaml b/helm-charts/agentqna/gaudi-values.yaml index 0759ddb5c..91ef5d102 100644 --- a/helm-charts/agentqna/gaudi-values.yaml +++ b/helm-charts/agentqna/gaudi-values.yaml @@ -5,6 +5,7 @@ # by overriding their subchart values tgi: + enabled: true accelDevice: "gaudi" image: repository: ghcr.io/huggingface/tgi-gaudi diff --git a/helm-charts/audioqna/ci-gaudi-values.yaml b/helm-charts/audioqna/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/audioqna/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/audioqna/ci-values.yaml b/helm-charts/audioqna/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/audioqna/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/audioqna/cpu-values.yaml b/helm-charts/audioqna/cpu-values.yaml new file mode 100644 index 000000000..97818ae44 --- /dev/null +++ b/helm-charts/audioqna/cpu-values.yaml @@ -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 diff --git a/helm-charts/audioqna/gaudi-values.yaml b/helm-charts/audioqna/gaudi-values.yaml index 7630657ac..090bfa40d 100644 --- a/helm-charts/audioqna/gaudi-values.yaml +++ b/helm-charts/audioqna/gaudi-values.yaml @@ -35,7 +35,6 @@ tgi: whisper: image: repository: opea/whisper-gaudi - tag: "latest" resources: limits: habana.ai/gaudi: 1 @@ -43,7 +42,6 @@ whisper: speecht5: image: repository: opea/speecht5-gaudi - tag: "latest" resources: limits: habana.ai/gaudi: 1 diff --git a/helm-charts/chatqna/ci-gaudi-tgi-values.yaml b/helm-charts/chatqna/ci-gaudi-tgi-values.yaml deleted file mode 120000 index 8702c8f68..000000000 --- a/helm-charts/chatqna/ci-gaudi-tgi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-tgi-values.yaml \ No newline at end of file diff --git a/helm-charts/chatqna/ci-gaudi-vllm-values.yaml b/helm-charts/chatqna/ci-gaudi-vllm-values.yaml deleted file mode 120000 index d9ab8c698..000000000 --- a/helm-charts/chatqna/ci-gaudi-vllm-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-vllm-values.yaml \ No newline at end of file diff --git a/helm-charts/chatqna/ci-guardrails-gaudi-values.yaml b/helm-charts/chatqna/ci-guardrails-gaudi-values.yaml deleted file mode 120000 index 088821006..000000000 --- a/helm-charts/chatqna/ci-guardrails-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -guardrails-gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/chatqna/ci-values.yaml b/helm-charts/chatqna/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/chatqna/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/chatqna/gaudi-tgi-values.yaml b/helm-charts/chatqna/gaudi-values.yaml similarity index 100% rename from helm-charts/chatqna/gaudi-tgi-values.yaml rename to helm-charts/chatqna/gaudi-values.yaml diff --git a/helm-charts/chatqna/gaudi-vllm-values.yaml b/helm-charts/chatqna/gaudi-vllm-values.yaml index 3b1873330..6c1a44ebf 100644 --- a/helm-charts/chatqna/gaudi-vllm-values.yaml +++ b/helm-charts/chatqna/gaudi-vllm-values.yaml @@ -12,7 +12,6 @@ vllm: accelDevice: "gaudi" image: repository: opea/vllm-gaudi - tag: "latest" resources: limits: habana.ai/gaudi: 1 diff --git a/helm-charts/chatqna/guardrails-gaudi-values.yaml b/helm-charts/chatqna/guardrails-gaudi-values.yaml index 6edc7febe..aad83623d 100644 --- a/helm-charts/chatqna/guardrails-gaudi-values.yaml +++ b/helm-charts/chatqna/guardrails-gaudi-values.yaml @@ -3,7 +3,6 @@ image: repository: opea/chatqna-guardrails - tag: "latest" # guardrails related config guardrails-usvc: diff --git a/helm-charts/chatqna/guardrails-values.yaml b/helm-charts/chatqna/guardrails-values.yaml index f83507f19..d37a41060 100644 --- a/helm-charts/chatqna/guardrails-values.yaml +++ b/helm-charts/chatqna/guardrails-values.yaml @@ -3,7 +3,6 @@ image: repository: opea/chatqna-guardrails - tag: "latest" # guardrails related config guardrails-usvc: diff --git a/helm-charts/check_values.sh b/helm-charts/check_values.sh new file mode 100755 index 000000000..ec7926c1d --- /dev/null +++ b/helm-charts/check_values.sh @@ -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 diff --git a/helm-charts/codegen/ci-gaudi-values.yaml b/helm-charts/codegen/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/codegen/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/codegen/ci-values.yaml b/helm-charts/codegen/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/codegen/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/codegen/cpu-values.yaml b/helm-charts/codegen/cpu-values.yaml new file mode 100644 index 000000000..b49541359 --- /dev/null +++ b/helm-charts/codegen/cpu-values.yaml @@ -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 diff --git a/helm-charts/codegen/gaudi-values.yaml b/helm-charts/codegen/gaudi-values.yaml index e5367383a..e26bb4a5e 100644 --- a/helm-charts/codegen/gaudi-values.yaml +++ b/helm-charts/codegen/gaudi-values.yaml @@ -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" diff --git a/helm-charts/codetrans/ci-gaudi-values.yaml b/helm-charts/codetrans/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/codetrans/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/codetrans/ci-values.yaml b/helm-charts/codetrans/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/codetrans/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/codetrans/cpu-values.yaml b/helm-charts/codetrans/cpu-values.yaml new file mode 100644 index 000000000..313f05075 --- /dev/null +++ b/helm-charts/codetrans/cpu-values.yaml @@ -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 diff --git a/helm-charts/common/agent/ci-gaudi-values.yaml b/helm-charts/common/agent/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/common/agent/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/common/agent/values.yaml b/helm-charts/common/agent/values.yaml index 7516aef04..0668bb5eb 100644 --- a/helm-charts/common/agent/values.yaml +++ b/helm-charts/common/agent/values.yaml @@ -72,7 +72,7 @@ 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 @@ -80,9 +80,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/asr/.helmignore b/helm-charts/common/asr/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/asr/.helmignore +++ b/helm-charts/common/asr/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/asr/ci-values.yaml b/helm-charts/common/asr/ci-values.yaml deleted file mode 100644 index b0f302d8b..000000000 --- a/helm-charts/common/asr/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for asr. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -whisper: - enabled: true diff --git a/helm-charts/common/asr/cpu-values.yaml b/helm-charts/common/asr/cpu-values.yaml new file mode 100644 index 000000000..221ea994d --- /dev/null +++ b/helm-charts/common/asr/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +whisper: + enabled: true diff --git a/helm-charts/common/chathistory-usvc/ci-values.yaml b/helm-charts/common/chathistory-usvc/ci-values.yaml deleted file mode 100644 index b2ce309f3..000000000 --- a/helm-charts/common/chathistory-usvc/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for chathistory-usvc. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -mongodb: - enabled: true diff --git a/helm-charts/common/chathistory-usvc/cpu-values.yaml b/helm-charts/common/chathistory-usvc/cpu-values.yaml new file mode 100644 index 000000000..7850c0ee9 --- /dev/null +++ b/helm-charts/common/chathistory-usvc/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +mongodb: + enabled: true diff --git a/helm-charts/common/chathistory-usvc/values.yaml b/helm-charts/common/chathistory-usvc/values.yaml index 17cf7b22a..c33af3539 100644 --- a/helm-charts/common/chathistory-usvc/values.yaml +++ b/helm-charts/common/chathistory-usvc/values.yaml @@ -52,7 +52,7 @@ 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 @@ -60,9 +60,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/data-prep/milvus-values.yaml b/helm-charts/common/data-prep/milvus-values.yaml index 3a3cb76b7..e2bc6c243 100644 --- a/helm-charts/common/data-prep/milvus-values.yaml +++ b/helm-charts/common/data-prep/milvus-values.yaml @@ -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: diff --git a/helm-charts/common/data-prep/ci-values.yaml b/helm-charts/common/data-prep/redis-values.yaml similarity index 56% rename from helm-charts/common/data-prep/ci-values.yaml rename to helm-charts/common/data-prep/redis-values.yaml index 473698ec0..54853db04 100644 --- a/helm-charts/common/data-prep/ci-values.yaml +++ b/helm-charts/common/data-prep/redis-values.yaml @@ -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: diff --git a/helm-charts/common/data-prep/values.yaml b/helm-charts/common/data-prep/values.yaml index 9073ca606..f3d19b00b 100644 --- a/helm-charts/common/data-prep/values.yaml +++ b/helm-charts/common/data-prep/values.yaml @@ -57,7 +57,7 @@ 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 @@ -65,9 +65,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/embedding-usvc/.helmignore b/helm-charts/common/embedding-usvc/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/embedding-usvc/.helmignore +++ b/helm-charts/common/embedding-usvc/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/embedding-usvc/ci-values.yaml b/helm-charts/common/embedding-usvc/ci-values.yaml deleted file mode 100644 index 20ecaabf4..000000000 --- a/helm-charts/common/embedding-usvc/ci-values.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# 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: true -mm-embedding: - enabled: false - -EMBEDDING_BACKEND: "TEI" diff --git a/helm-charts/common/embedding-usvc/cpu-values.yaml b/helm-charts/common/embedding-usvc/cpu-values.yaml new file mode 100644 index 000000000..e2d62ff26 --- /dev/null +++ b/helm-charts/common/embedding-usvc/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tei: + enabled: true diff --git a/helm-charts/common/embedding-usvc/ci-multimodal-values.yaml b/helm-charts/common/embedding-usvc/multimodal-values.yaml similarity index 56% rename from helm-charts/common/embedding-usvc/ci-multimodal-values.yaml rename to helm-charts/common/embedding-usvc/multimodal-values.yaml index d379a3fda..592bb06b5 100644 --- a/helm-charts/common/embedding-usvc/ci-multimodal-values.yaml +++ b/helm-charts/common/embedding-usvc/multimodal-values.yaml @@ -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: diff --git a/helm-charts/common/gpt-sovits/.helmignore b/helm-charts/common/gpt-sovits/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/gpt-sovits/.helmignore +++ b/helm-charts/common/gpt-sovits/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/gpt-sovits/ci-values.yaml b/helm-charts/common/gpt-sovits/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/gpt-sovits/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/gpt-sovits/cpu-values.yaml b/helm-charts/common/gpt-sovits/cpu-values.yaml new file mode 100644 index 000000000..087e8b334 --- /dev/null +++ b/helm-charts/common/gpt-sovits/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/gpt-sovits diff --git a/helm-charts/common/guardrails-usvc/ci-values.yaml b/helm-charts/common/guardrails-usvc/ci-values.yaml deleted file mode 100644 index 3aef2fce5..000000000 --- a/helm-charts/common/guardrails-usvc/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for guardrails-usvc. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -tgi-guardrails: - enabled: true diff --git a/helm-charts/common/guardrails-usvc/cpu-values.yaml b/helm-charts/common/guardrails-usvc/cpu-values.yaml new file mode 100644 index 000000000..346a39496 --- /dev/null +++ b/helm-charts/common/guardrails-usvc/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tgi-guardrails: + enabled: true diff --git a/helm-charts/common/guardrails-usvc/values.yaml b/helm-charts/common/guardrails-usvc/values.yaml index eb75b7e2a..0ca63bcf8 100644 --- a/helm-charts/common/guardrails-usvc/values.yaml +++ b/helm-charts/common/guardrails-usvc/values.yaml @@ -61,7 +61,7 @@ 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 @@ -69,9 +69,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/llm-uservice/.helmignore b/helm-charts/common/llm-uservice/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/llm-uservice/.helmignore +++ b/helm-charts/common/llm-uservice/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/llm-uservice/ci-values.yaml b/helm-charts/common/llm-uservice/ci-values.yaml deleted file mode 100644 index 88eef5b4a..000000000 --- a/helm-charts/common/llm-uservice/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for llm-uservice. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -tgi: - enabled: true diff --git a/helm-charts/common/llm-uservice/cpu-values.yaml b/helm-charts/common/llm-uservice/cpu-values.yaml new file mode 100644 index 000000000..3de5b26fc --- /dev/null +++ b/helm-charts/common/llm-uservice/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tgi: + enabled: true diff --git a/helm-charts/common/llm-uservice/ci-docsum-values.yaml b/helm-charts/common/llm-uservice/docsum-values.yaml similarity index 100% rename from helm-charts/common/llm-uservice/ci-docsum-values.yaml rename to helm-charts/common/llm-uservice/docsum-values.yaml diff --git a/helm-charts/common/llm-uservice/ci-faqgen-values.yaml b/helm-charts/common/llm-uservice/faqgen-values.yaml similarity index 100% rename from helm-charts/common/llm-uservice/ci-faqgen-values.yaml rename to helm-charts/common/llm-uservice/faqgen-values.yaml diff --git a/helm-charts/common/llm-uservice/ci-vllm-docsum-gaudi-values.yaml b/helm-charts/common/llm-uservice/vllm-docsum-gaudi-values.yaml similarity index 100% rename from helm-charts/common/llm-uservice/ci-vllm-docsum-gaudi-values.yaml rename to helm-charts/common/llm-uservice/vllm-docsum-gaudi-values.yaml diff --git a/helm-charts/common/llm-uservice/ci-vllm-gaudi-values.yaml b/helm-charts/common/llm-uservice/vllm-gaudi-values.yaml similarity index 100% rename from helm-charts/common/llm-uservice/ci-vllm-gaudi-values.yaml rename to helm-charts/common/llm-uservice/vllm-gaudi-values.yaml diff --git a/helm-charts/common/lvm-serve/.helmignore b/helm-charts/common/lvm-serve/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/lvm-serve/.helmignore +++ b/helm-charts/common/lvm-serve/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/lvm-serve/ci-values.yaml b/helm-charts/common/lvm-serve/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/lvm-serve/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/lvm-serve/cpu-values.yaml b/helm-charts/common/lvm-serve/cpu-values.yaml new file mode 100644 index 000000000..f0d3c1498 --- /dev/null +++ b/helm-charts/common/lvm-serve/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/lvm-llava diff --git a/helm-charts/common/lvm-uservice/.helmignore b/helm-charts/common/lvm-uservice/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/lvm-uservice/.helmignore +++ b/helm-charts/common/lvm-uservice/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/lvm-uservice/cpu-values.yaml b/helm-charts/common/lvm-uservice/cpu-values.yaml new file mode 100644 index 000000000..3de5b26fc --- /dev/null +++ b/helm-charts/common/lvm-uservice/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tgi: + enabled: true diff --git a/helm-charts/common/lvm-uservice/ci-llava-values.yaml b/helm-charts/common/lvm-uservice/llava-values.yaml similarity index 100% rename from helm-charts/common/lvm-uservice/ci-llava-values.yaml rename to helm-charts/common/lvm-uservice/llava-values.yaml diff --git a/helm-charts/common/mm-embedding/.helmignore b/helm-charts/common/mm-embedding/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/mm-embedding/.helmignore +++ b/helm-charts/common/mm-embedding/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/mm-embedding/ci-clip-values.yaml b/helm-charts/common/mm-embedding/ci-clip-values.yaml deleted file mode 120000 index 4c7b02d4f..000000000 --- a/helm-charts/common/mm-embedding/ci-clip-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_clip-values.yaml \ No newline at end of file diff --git a/helm-charts/common/mm-embedding/ci-values.yaml b/helm-charts/common/mm-embedding/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/mm-embedding/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/mm-embedding/cpu-values.yaml b/helm-charts/common/mm-embedding/cpu-values.yaml new file mode 100644 index 000000000..b194c9fe0 --- /dev/null +++ b/helm-charts/common/mm-embedding/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/embedding-multimodal-bridgetower diff --git a/helm-charts/common/mongodb/ci-values.yaml b/helm-charts/common/mongodb/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/mongodb/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/mongodb/cpu-values.yaml b/helm-charts/common/mongodb/cpu-values.yaml new file mode 100644 index 000000000..4d8105318 --- /dev/null +++ b/helm-charts/common/mongodb/cpu-values.yaml @@ -0,0 +1,4 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +image: + repository: mongo diff --git a/helm-charts/common/mongodb/values.yaml b/helm-charts/common/mongodb/values.yaml index 43e51b7d5..3b8c218eb 100644 --- a/helm-charts/common/mongodb/values.yaml +++ b/helm-charts/common/mongodb/values.yaml @@ -54,7 +54,7 @@ startupProbe: initialDelaySeconds: 5 periodSeconds: 5 failureThreshold: 120 -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 @@ -62,9 +62,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi nodeSelector: {} diff --git a/helm-charts/common/nginx/cpu-values.yaml b/helm-charts/common/nginx/cpu-values.yaml new file mode 100644 index 000000000..98e8182d2 --- /dev/null +++ b/helm-charts/common/nginx/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/nginx diff --git a/helm-charts/common/nginx/values.yaml b/helm-charts/common/nginx/values.yaml index 58e65f44c..483cdbb1b 100644 --- a/helm-charts/common/nginx/values.yaml +++ b/helm-charts/common/nginx/values.yaml @@ -62,16 +62,16 @@ service: # This sets the ports more information can be found here: https://kubernetes.io/docs/concepts/services-networking/service/#field-spec-ports port: 80 -resources: {} +resources: # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. 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 # This section is for setting up autoscaling more information can be found here: https://kubernetes.io/docs/concepts/workloads/autoscaling/ # Note: do not use (above) "replicaCount" with HPA (Chart ignores value=1 as it's k8s default) diff --git a/helm-charts/common/prompt-usvc/ci-values.yaml b/helm-charts/common/prompt-usvc/ci-values.yaml deleted file mode 100644 index 1e0d5c386..000000000 --- a/helm-charts/common/prompt-usvc/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for prompt-usvc. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -mongodb: - enabled: true diff --git a/helm-charts/common/prompt-usvc/cpu-values.yaml b/helm-charts/common/prompt-usvc/cpu-values.yaml new file mode 100644 index 000000000..7850c0ee9 --- /dev/null +++ b/helm-charts/common/prompt-usvc/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +mongodb: + enabled: true diff --git a/helm-charts/common/prompt-usvc/values.yaml b/helm-charts/common/prompt-usvc/values.yaml index 82562fca4..4502552d7 100644 --- a/helm-charts/common/prompt-usvc/values.yaml +++ b/helm-charts/common/prompt-usvc/values.yaml @@ -55,7 +55,7 @@ service: # Change the port to 6012 if you are using 1.0 docker images # https://github.com/opea-project/GenAIComps/pull/740 port: 6018 -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 @@ -63,9 +63,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/redis-vector-db/ci-values.yaml b/helm-charts/common/redis-vector-db/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/redis-vector-db/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/redis-vector-db/cpu-values.yaml b/helm-charts/common/redis-vector-db/cpu-values.yaml new file mode 100644 index 000000000..415b0aee8 --- /dev/null +++ b/helm-charts/common/redis-vector-db/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: redis/redis-stack diff --git a/helm-charts/common/redis-vector-db/values.yaml b/helm-charts/common/redis-vector-db/values.yaml index 26a851283..fb8611dba 100644 --- a/helm-charts/common/redis-vector-db/values.yaml +++ b/helm-charts/common/redis-vector-db/values.yaml @@ -55,7 +55,7 @@ service: port: 8001 targetPort: 8001 protocol: TCP -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 @@ -63,9 +63,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi nodeSelector: {} diff --git a/helm-charts/common/reranking-usvc/.helmignore b/helm-charts/common/reranking-usvc/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/reranking-usvc/.helmignore +++ b/helm-charts/common/reranking-usvc/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/reranking-usvc/ci-values.yaml b/helm-charts/common/reranking-usvc/ci-values.yaml deleted file mode 100644 index 1118483f4..000000000 --- a/helm-charts/common/reranking-usvc/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for reranking-usvc. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -teirerank: - enabled: true diff --git a/helm-charts/common/reranking-usvc/cpu-values.yaml b/helm-charts/common/reranking-usvc/cpu-values.yaml new file mode 100644 index 000000000..f16bb5641 --- /dev/null +++ b/helm-charts/common/reranking-usvc/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +teirerank: + enabled: true diff --git a/helm-charts/common/retriever-usvc/ci-values.yaml b/helm-charts/common/retriever-usvc/redis-values.yaml similarity index 100% rename from helm-charts/common/retriever-usvc/ci-values.yaml rename to helm-charts/common/retriever-usvc/redis-values.yaml diff --git a/helm-charts/common/retriever-usvc/values.yaml b/helm-charts/common/retriever-usvc/values.yaml index 0e2540d63..be04ba910 100644 --- a/helm-charts/common/retriever-usvc/values.yaml +++ b/helm-charts/common/retriever-usvc/values.yaml @@ -68,7 +68,7 @@ service: # The default port for retriever service is 7000 port: 7000 -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 @@ -76,9 +76,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/speecht5/.helmignore b/helm-charts/common/speecht5/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/speecht5/.helmignore +++ b/helm-charts/common/speecht5/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/speecht5/ci-gaudi-values.yaml b/helm-charts/common/speecht5/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/common/speecht5/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/common/speecht5/ci-values.yaml b/helm-charts/common/speecht5/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/speecht5/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/speecht5/cpu-values.yaml b/helm-charts/common/speecht5/cpu-values.yaml new file mode 100644 index 000000000..56e0cd0cd --- /dev/null +++ b/helm-charts/common/speecht5/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/speecht5 diff --git a/helm-charts/common/speecht5/gaudi-values.yaml b/helm-charts/common/speecht5/gaudi-values.yaml index aefd9f373..c7e5295bd 100644 --- a/helm-charts/common/speecht5/gaudi-values.yaml +++ b/helm-charts/common/speecht5/gaudi-values.yaml @@ -1,14 +1,8 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for speecht5. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - image: repository: opea/speecht5-gaudi - tag: "latest" - resources: limits: habana.ai/gaudi: 1 diff --git a/helm-charts/common/tei/ci-gaudi-values.yaml b/helm-charts/common/tei/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/common/tei/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/common/tei/ci-values.yaml b/helm-charts/common/tei/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/tei/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/tei/cpu-values.yaml b/helm-charts/common/tei/cpu-values.yaml new file mode 100644 index 000000000..5eaa0d274 --- /dev/null +++ b/helm-charts/common/tei/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: ghcr.io/huggingface/text-embeddings-inference diff --git a/helm-charts/common/tei/gaudi-values.yaml b/helm-charts/common/tei/gaudi-values.yaml index 45627caf3..aa8c36da4 100644 --- a/helm-charts/common/tei/gaudi-values.yaml +++ b/helm-charts/common/tei/gaudi-values.yaml @@ -1,10 +1,6 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for tei. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - accelDevice: "gaudi" OMPI_MCA_btl_vader_single_copy_mechanism: "none" diff --git a/helm-charts/common/tei/values.yaml b/helm-charts/common/tei/values.yaml index cdef58b2b..d4714cd83 100644 --- a/helm-charts/common/tei/values.yaml +++ b/helm-charts/common/tei/values.yaml @@ -68,7 +68,7 @@ securityContext: service: type: ClusterIP -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 @@ -76,9 +76,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/teirerank/ci-values.yaml b/helm-charts/common/teirerank/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/teirerank/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/teirerank/cpu-values.yaml b/helm-charts/common/teirerank/cpu-values.yaml new file mode 100644 index 000000000..5eaa0d274 --- /dev/null +++ b/helm-charts/common/teirerank/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: ghcr.io/huggingface/text-embeddings-inference diff --git a/helm-charts/common/teirerank/gaudi-values.yaml b/helm-charts/common/teirerank/gaudi-values.yaml index a5d6c1b14..aa8c36da4 100644 --- a/helm-charts/common/teirerank/gaudi-values.yaml +++ b/helm-charts/common/teirerank/gaudi-values.yaml @@ -1,10 +1,6 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for teirerank. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - accelDevice: "gaudi" OMPI_MCA_btl_vader_single_copy_mechanism: "none" diff --git a/helm-charts/common/teirerank/values.yaml b/helm-charts/common/teirerank/values.yaml index 745d71849..61c0885fa 100644 --- a/helm-charts/common/teirerank/values.yaml +++ b/helm-charts/common/teirerank/values.yaml @@ -68,7 +68,7 @@ securityContext: service: type: ClusterIP -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 @@ -76,9 +76,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi livenessProbe: httpGet: diff --git a/helm-charts/common/text2image/.helmignore b/helm-charts/common/text2image/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/text2image/.helmignore +++ b/helm-charts/common/text2image/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/text2image/ci-gaudi-values.yaml b/helm-charts/common/text2image/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/common/text2image/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/common/text2image/ci-values.yaml b/helm-charts/common/text2image/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/text2image/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/text2image/cpu-values.yaml b/helm-charts/common/text2image/cpu-values.yaml new file mode 100644 index 000000000..8558896d4 --- /dev/null +++ b/helm-charts/common/text2image/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/text2image diff --git a/helm-charts/common/tgi/ci-gaudi-values.yaml b/helm-charts/common/tgi/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/common/tgi/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/common/tgi/ci-values.yaml b/helm-charts/common/tgi/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/tgi/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/tgi/cpu-values.yaml b/helm-charts/common/tgi/cpu-values.yaml new file mode 100644 index 000000000..38297ab3d --- /dev/null +++ b/helm-charts/common/tgi/cpu-values.yaml @@ -0,0 +1,26 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +# Resource requirements for Intel/neural-chat-7b-v3-3 @ 32-bit: +resources: + limits: + cpu: 8 + memory: 70Gi + requests: + cpu: 6 + memory: 65Gi + +livenessProbe: + initialDelaySeconds: 8 + periodSeconds: 8 + failureThreshold: 24 + timeoutSeconds: 4 +readinessProbe: + initialDelaySeconds: 16 + periodSeconds: 8 + timeoutSeconds: 4 +startupProbe: + initialDelaySeconds: 10 + periodSeconds: 5 + failureThreshold: 180 + timeoutSeconds: 2 diff --git a/helm-charts/common/tgi/gaudi-values.yaml b/helm-charts/common/tgi/gaudi-values.yaml index 9c46415cc..8e04769ae 100644 --- a/helm-charts/common/tgi/gaudi-values.yaml +++ b/helm-charts/common/tgi/gaudi-values.yaml @@ -1,10 +1,6 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for tgi. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - accelDevice: "gaudi" image: @@ -23,6 +19,9 @@ FLASH_ATTENTION_RECOMPUTE: "true" resources: limits: habana.ai/gaudi: 1 + requests: + cpu: 1 + memory: 16Gi livenessProbe: initialDelaySeconds: 5 diff --git a/helm-charts/common/tts/.helmignore b/helm-charts/common/tts/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/tts/.helmignore +++ b/helm-charts/common/tts/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/tts/ci-values.yaml b/helm-charts/common/tts/ci-values.yaml deleted file mode 100644 index 8eda0bf5b..000000000 --- a/helm-charts/common/tts/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for tts. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -speecht5: - enabled: true diff --git a/helm-charts/common/tts/cpu-values.yaml b/helm-charts/common/tts/cpu-values.yaml new file mode 100644 index 000000000..c735ab48a --- /dev/null +++ b/helm-charts/common/tts/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +speecht5: + enabled: true diff --git a/helm-charts/common/ui/ci-values.yaml b/helm-charts/common/ui/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/ui/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_audioqna_svelte-values.yaml b/helm-charts/common/ui/ci-variant_audioqna_svelte-values.yaml deleted file mode 120000 index 5fe6ba114..000000000 --- a/helm-charts/common/ui/ci-variant_audioqna_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_audioqna_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_chatqna_svelte-values.yaml b/helm-charts/common/ui/ci-variant_chatqna_svelte-values.yaml deleted file mode 120000 index 83ad22951..000000000 --- a/helm-charts/common/ui/ci-variant_chatqna_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_chatqna_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_codegen_react-values.yaml b/helm-charts/common/ui/ci-variant_codegen_react-values.yaml deleted file mode 120000 index dca8edda6..000000000 --- a/helm-charts/common/ui/ci-variant_codegen_react-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_codegen_react-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_codegen_svelte-values.yaml b/helm-charts/common/ui/ci-variant_codegen_svelte-values.yaml deleted file mode 120000 index 92b8a5e59..000000000 --- a/helm-charts/common/ui/ci-variant_codegen_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_codegen_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_codetrans_svelte-values.yaml b/helm-charts/common/ui/ci-variant_codetrans_svelte-values.yaml deleted file mode 120000 index 8034cb024..000000000 --- a/helm-charts/common/ui/ci-variant_codetrans_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_codetrans_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_docsum_react-values.yaml b/helm-charts/common/ui/ci-variant_docsum_react-values.yaml deleted file mode 120000 index a06c0a483..000000000 --- a/helm-charts/common/ui/ci-variant_docsum_react-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_docsum_react-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_docsum_svelte-values.yaml b/helm-charts/common/ui/ci-variant_docsum_svelte-values.yaml deleted file mode 120000 index c0a3e63ff..000000000 --- a/helm-charts/common/ui/ci-variant_docsum_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_docsum_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_faqgen_react-values.yaml b/helm-charts/common/ui/ci-variant_faqgen_react-values.yaml deleted file mode 120000 index 29846e96d..000000000 --- a/helm-charts/common/ui/ci-variant_faqgen_react-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_faqgen_react-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_faqgen_svelte-values.yaml b/helm-charts/common/ui/ci-variant_faqgen_svelte-values.yaml deleted file mode 120000 index f1976d3a9..000000000 --- a/helm-charts/common/ui/ci-variant_faqgen_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_faqgen_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/ci-variant_visualqna_svelte-values.yaml b/helm-charts/common/ui/ci-variant_visualqna_svelte-values.yaml deleted file mode 120000 index b14d59afd..000000000 --- a/helm-charts/common/ui/ci-variant_visualqna_svelte-values.yaml +++ /dev/null @@ -1 +0,0 @@ -variant_visualqna_svelte-values.yaml \ No newline at end of file diff --git a/helm-charts/common/ui/values.yaml b/helm-charts/common/ui/values.yaml index 793f19453..168e14d37 100644 --- a/helm-charts/common/ui/values.yaml +++ b/helm-charts/common/ui/values.yaml @@ -77,7 +77,7 @@ startupProbe: periodSeconds: 5 failureThreshold: 120 -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 @@ -85,9 +85,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi nodeSelector: {} diff --git a/helm-charts/common/vllm/ci-gaudi-values.yaml b/helm-charts/common/vllm/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/common/vllm/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/common/vllm/ci-values.yaml b/helm-charts/common/vllm/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/vllm/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/vllm/cpu-values.yaml b/helm-charts/common/vllm/cpu-values.yaml new file mode 100644 index 000000000..c2e01e4be --- /dev/null +++ b/helm-charts/common/vllm/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/vllm diff --git a/helm-charts/common/vllm/gaudi-values.yaml b/helm-charts/common/vllm/gaudi-values.yaml index 08f4db145..e9ddbed82 100644 --- a/helm-charts/common/vllm/gaudi-values.yaml +++ b/helm-charts/common/vllm/gaudi-values.yaml @@ -1,15 +1,10 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for vllm. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - accelDevice: "gaudi" image: repository: opea/vllm-gaudi - tag: "latest" # VLLM_CPU_KVCACHE_SPACE: "40" OMPI_MCA_btl_vader_single_copy_mechanism: none diff --git a/helm-charts/common/vllm/values.yaml b/helm-charts/common/vllm/values.yaml index 6e9e6c9c2..53e8ac04a 100644 --- a/helm-charts/common/vllm/values.yaml +++ b/helm-charts/common/vllm/values.yaml @@ -61,7 +61,7 @@ securityContext: {} service: type: ClusterIP -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 @@ -69,9 +69,9 @@ resources: {} # limits: # cpu: 100m # memory: 128Mi - # requests: - # cpu: 100m - # memory: 128Mi + requests: + cpu: 100m + memory: 128Mi extraCmdArgs: [] diff --git a/helm-charts/common/web-retriever/.helmignore b/helm-charts/common/web-retriever/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/web-retriever/.helmignore +++ b/helm-charts/common/web-retriever/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/web-retriever/ci-values.yaml b/helm-charts/common/web-retriever/ci-values.yaml deleted file mode 100644 index f0940ef43..000000000 --- a/helm-charts/common/web-retriever/ci-values.yaml +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -# Default values for web-retriever. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -tei: - enabled: true diff --git a/helm-charts/common/web-retriever/cpu-values.yaml b/helm-charts/common/web-retriever/cpu-values.yaml new file mode 100644 index 000000000..e2d62ff26 --- /dev/null +++ b/helm-charts/common/web-retriever/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tei: + enabled: true diff --git a/helm-charts/common/whisper/.helmignore b/helm-charts/common/whisper/.helmignore index d2c43a2ac..0e8a0eb36 100644 --- a/helm-charts/common/whisper/.helmignore +++ b/helm-charts/common/whisper/.helmignore @@ -21,5 +21,3 @@ .idea/ *.tmproj .vscode/ -# CI values -ci*-values.yaml diff --git a/helm-charts/common/whisper/ci-values.yaml b/helm-charts/common/whisper/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/common/whisper/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/whisper/cpu-values.yaml b/helm-charts/common/whisper/cpu-values.yaml new file mode 100644 index 000000000..f32f55f00 --- /dev/null +++ b/helm-charts/common/whisper/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +image: + repository: opea/whisper diff --git a/helm-charts/common/whisper/gaudi-values.yaml b/helm-charts/common/whisper/gaudi-values.yaml index fec919ad3..3ba40c4b8 100644 --- a/helm-charts/common/whisper/gaudi-values.yaml +++ b/helm-charts/common/whisper/gaudi-values.yaml @@ -1,13 +1,8 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for whisper. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - image: repository: opea/whisper-gaudi - tag: "latest" resources: limits: diff --git a/helm-charts/docsum/ci-gaudi-tgi-values.yaml b/helm-charts/docsum/ci-gaudi-tgi-values.yaml deleted file mode 120000 index 8702c8f68..000000000 --- a/helm-charts/docsum/ci-gaudi-tgi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-tgi-values.yaml \ No newline at end of file diff --git a/helm-charts/docsum/ci-gaudi-vllm-values.yaml b/helm-charts/docsum/ci-gaudi-vllm-values.yaml deleted file mode 120000 index d9ab8c698..000000000 --- a/helm-charts/docsum/ci-gaudi-vllm-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-vllm-values.yaml \ No newline at end of file diff --git a/helm-charts/docsum/ci-values.yaml b/helm-charts/docsum/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/docsum/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/docsum/cpu-values.yaml b/helm-charts/docsum/cpu-values.yaml new file mode 100644 index 000000000..6f2ab7768 --- /dev/null +++ b/helm-charts/docsum/cpu-values.yaml @@ -0,0 +1,7 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tgi: + enabled: true +vllm: + enabled: false diff --git a/helm-charts/docsum/gaudi-tgi-values.yaml b/helm-charts/docsum/gaudi-values.yaml similarity index 100% rename from helm-charts/docsum/gaudi-tgi-values.yaml rename to helm-charts/docsum/gaudi-values.yaml diff --git a/helm-charts/faqgen/ci-gaudi-values.yaml b/helm-charts/faqgen/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/faqgen/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/faqgen/ci-values.yaml b/helm-charts/faqgen/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/faqgen/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/faqgen/cpu-values.yaml b/helm-charts/faqgen/cpu-values.yaml new file mode 100644 index 000000000..4bffe5959 --- /dev/null +++ b/helm-charts/faqgen/cpu-values.yaml @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +tgi: + LLM_MODEL_ID: meta-llama/Meta-Llama-3-8B-Instruct diff --git a/helm-charts/valuefiles.yaml b/helm-charts/valuefiles.yaml new file mode 100644 index 000000000..933439adf --- /dev/null +++ b/helm-charts/valuefiles.yaml @@ -0,0 +1,247 @@ +# Copyright (C) 2025 Intel Corporation +# # SPDX-License-Identifier: Apache-2.0 + +# This file maintains the values files need to be synced to GenAIExamples and GenAIComps. +# URL is https://raw.githubusercontent.com/opea-project/GenAIExamples/refs/heads/main/ChatQnA/kubernetes/helm/cpu-values.yaml +# https://raw.githubusercontent.com/opea-project/${dest_repo}/refs/heads/main/${dest_dir}/${values} + +# Examples +chatqna: + src_repo: GenAIInfra + src_dir: helm-charts/chatqna + dest_repo: GenAIExamples + dest_dir: ChatQnA/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml + - gaudi-vllm-values.yaml + - guardrails-values.yaml + - guardrails-gaudi-values.yaml + - norerank-values.yaml + - withwrapper-values.yaml +agentqna: + src_repo: GenAIInfra + src_dir: helm-charts/agentqna + dest_repo: GenAIExamples + dest_dir: AgentQnA/kubernetes/helm + values: + - gaudi-values.yaml +audioqna: + src_repo: GenAIInfra + src_dir: helm-charts/audioqna + dest_repo: GenAIExamples + dest_dir: AudioQnA/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml +codegen: + src_repo: GenAIInfra + src_dir: helm-charts/codegen + dest_repo: GenAIExamples + dest_dir: CodeGen/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml +codetrans: + src_repo: GenAIInfra + src_dir: helm-charts/codetrans + dest_repo: GenAIExamples + dest_dir: CodeTrans/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml +docsum: + src_repo: GenAIInfra + src_dir: helm-charts/docsum + dest_repo: GenAIExamples + dest_dir: DocSum/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml +faqgen: + src_repo: GenAIInfra + src_dir: helm-charts/faqgen + dest_repo: GenAIExamples + dest_dir: FaqGen/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml +visualqna: + src_repo: GenAIInfra + src_dir: helm-charts/visualqna + dest_repo: GenAIExamples + dest_dir: VisualQnA/kubernetes/helm + values: + - cpu-values.yaml + - gaudi-values.yaml + +# Components +agent: + src_repo: GenAIInfra + src_dir: helm-charts/common/agent + dest_repo: GenAIComps + dest_dir: comps/agent/deployment/kubernetes + values: + - gaudi-values.yaml +asr: + src_repo: GenAIInfra + src_dir: helm-charts/common/asr + dest_repo: GenAIComps + dest_dir: comps/asr/deployment/kubernetes + values: + - cpu-values.yaml +chathistory-usvc: + src_repo: GenAIInfra + src_dir: helm-charts/common/chathistory-usvc + dest_repo: GenAIComps + dest_dir: comps/chathistory/deployment/kubernetes + values: + - cpu-values.yaml +data-prep: + src_repo: GenAIInfra + src_dir: helm-charts/common/data-prep + dest_repo: GenAIComps + dest_dir: comps/dataprep/deployment/kubernetes + values: + - milvus-values.yaml + - redis-values.yaml +embedding-usvc: + src_repo: GenAIInfra + src_dir: helm-charts/common/embedding-usvc + dest_repo: GenAIComps + dest_dir: comps/embeddings/deployment/kubernetes + values: + - cpu-values.yaml +gpt-sovits: + src_repo: GenAIInfra + src_dir: helm-charts/common/gpt-sovits + dest_repo: GenAIComps + dest_dir: comps/third_parties/gpt-sovits/deployment/kubernetes + values: + - cpu-values.yaml +guardrails-usvc: + src_repo: GenAIInfra + src_dir: helm-charts/common/guardrails-usvc + dest_repo: GenAIComps + dest_dir: comps/guardrails/deployment/kubernetes + values: + - cpu-values.yaml +llm-uservice: + src_repo: GenAIInfra + src_dir: helm-charts/common/llm-uservice + dest_repo: GenAIComps + dest_dir: comps/llms/deployment/kubernetes + values: + - cpu-values.yaml +lvm-uservice: + src_repo: GenAIInfra + src_dir: helm-charts/common/lvm-uservice + dest_repo: GenAIComps + dest_dir: comps/lvms/deployment/kubernetes + values: + - cpu-values.yaml +mongodb: + src_repo: GenAIInfra + src_dir: helm-charts/common/mongodb + dest_repo: GenAIComps + dest_dir: comps/third_parties/mongodb/deployment/kubernetes + values: + - cpu-values.yaml +nginx: + src_repo: GenAIInfra + src_dir: helm-charts/common/nginx + dest_repo: GenAIComps + dest_dir: comps/third_parties/nginx/deployment/kubernetes + values: + - cpu-values.yaml +prompt-usvc: + src_repo: GenAIInfra + src_dir: helm-charts/common/prompt-usvc + dest_repo: GenAIComps + dest_dir: comps/prompt_registry/deployment/kubernetes + values: + - cpu-values.yaml +redis-vector-db: + src_repo: GenAIInfra + src_dir: helm-charts/common/redis-vector-db + dest_repo: GenAIComps + dest_dir: comps/third_parties/redis/deployment/kubernetes + values: + - cpu-values.yaml +reranking-usvc: + src_repo: GenAIInfra + src_dir: helm-charts/common/reranking-usvc + dest_repo: GenAIComps + dest_dir: comps/rerankings/deployment/kubernetes + values: + - cpu-values.yaml +retriever-usvc: + src_repo: GenAIInfra + src_dir: helm-charts/common/retriever-usvc + dest_repo: GenAIComps + dest_dir: comps/retrievers/deployment/kubernetes + values: + - milvus-values.yaml + - redis-values.yaml +speecht5: + src_repo: GenAIInfra + src_dir: helm-charts/common/speecht5 + dest_repo: GenAIComps + dest_dir: comps/third_parties/speecht5/deployment/kubernetes + values: + - cpu-values.yaml + - gaudi-values.yaml +tei: + src_repo: GenAIInfra + src_dir: helm-charts/common/tei + dest_repo: GenAIComps + dest_dir: comps/third_parties/tei/deployment/kubernetes + values: + - cpu-values.yaml + - gaudi-values.yaml +teirerank: + src_repo: GenAIInfra + src_dir: helm-charts/common/teirerank + dest_repo: GenAIComps + dest_dir: comps/third_parties/teirerank/deployment/kubernetes + values: + - cpu-values.yaml + - gaudi-values.yaml +tgi: + src_repo: GenAIInfra + src_dir: helm-charts/common/tgi + dest_repo: GenAIComps + dest_dir: comps/third_parties/tgi/deployment/kubernetes + values: + - cpu-values.yaml + - gaudi-values.yaml +tts: + src_repo: GenAIInfra + src_dir: helm-charts/common/tts + dest_repo: GenAIComps + dest_dir: comps/tts/deployment/kubernetes + values: + - cpu-values.yaml +vllm: + src_repo: GenAIInfra + src_dir: helm-charts/common/vllm + dest_repo: GenAIComps + dest_dir: comps/third_parties/vllm/deployment/kubernetes + values: + - cpu-values.yaml + - gaudi-values.yaml +web-retriever: + src_repo: GenAIInfra + src_dir: helm-charts/common/web-retriever + dest_repo: GenAIComps + dest_dir: comps/web_retrievers/deployment/kubernetes + values: + - cpu-values.yaml +whisper: + src_repo: GenAIInfra + src_dir: helm-charts/common/whisper + dest_repo: GenAIComps + dest_dir: comps/third_parties/whisper/deployment/kubernetes + values: + - cpu-values.yaml + - gaudi-values.yaml diff --git a/helm-charts/visualqna/ci-gaudi-values.yaml b/helm-charts/visualqna/ci-gaudi-values.yaml deleted file mode 120000 index 7243d31b2..000000000 --- a/helm-charts/visualqna/ci-gaudi-values.yaml +++ /dev/null @@ -1 +0,0 @@ -gaudi-values.yaml \ No newline at end of file diff --git a/helm-charts/visualqna/ci-values.yaml b/helm-charts/visualqna/ci-values.yaml deleted file mode 120000 index 7d1010096..000000000 --- a/helm-charts/visualqna/ci-values.yaml +++ /dev/null @@ -1 +0,0 @@ -values.yaml \ No newline at end of file diff --git a/helm-charts/common/lvm-uservice/ci-values.yaml b/helm-charts/visualqna/cpu-values.yaml similarity index 50% rename from helm-charts/common/lvm-uservice/ci-values.yaml rename to helm-charts/visualqna/cpu-values.yaml index 1aa551117..acc9d4e28 100644 --- a/helm-charts/common/lvm-uservice/ci-values.yaml +++ b/helm-charts/visualqna/cpu-values.yaml @@ -1,15 +1,7 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -# Default values for lvm-uservice. -# This is a YAML-formatted file. -# Declare variables to be passed into your templates. - -LVM_BACKEND: "TGI" tgi: - enabled: true - LLM_MODEL_ID: llava-hf/llava-v1.6-mistral-7b-hf MAX_INPUT_LENGTH: "4096" MAX_TOTAL_TOKENS: "8192" -lvm-serve: - enabled: false + LLM_MODEL_ID: llava-hf/llava-v1.6-mistral-7b-hf