From 0b22c27971b9e0b4efba051e53b0e343e65f851b Mon Sep 17 00:00:00 2001 From: "krzysztof.sandowicz" Date: Tue, 18 Feb 2025 19:30:39 +0100 Subject: [PATCH 1/4] Added TDX support to docsum helm charts, startup command added to main docsum README.md Signed-off-by: Krzysztof Sandowicz --- helm-charts/common/whisper/Chart.yaml | 4 ++++ helm-charts/common/whisper/templates/deployment.yaml | 6 ++---- helm-charts/common/whisper/values.yaml | 2 ++ helm-charts/docsum/README.md | 2 ++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/helm-charts/common/whisper/Chart.yaml b/helm-charts/common/whisper/Chart.yaml index c03ad7a0c..294c7f610 100644 --- a/helm-charts/common/whisper/Chart.yaml +++ b/helm-charts/common/whisper/Chart.yaml @@ -8,3 +8,7 @@ type: application version: 0-latest # The whisper microservice server version appVersion: "v1.0" +dependencies: + - name: commonlib + version: 0-latest + repository: "file://../commonlib" \ No newline at end of file diff --git a/helm-charts/common/whisper/templates/deployment.yaml b/helm-charts/common/whisper/templates/deployment.yaml index f8dafbb27..bc78ccf2d 100644 --- a/helm-charts/common/whisper/templates/deployment.yaml +++ b/helm-charts/common/whisper/templates/deployment.yaml @@ -14,13 +14,11 @@ spec: {{- include "whisper.selectorLabels" . | nindent 6 }} template: metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "common.annotations" . | nindent 6 }} labels: {{- include "whisper.selectorLabels" . | nindent 8 }} spec: + {{- include "common.runtimeClassName" . | indent 6 }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} diff --git a/helm-charts/common/whisper/values.yaml b/helm-charts/common/whisper/values.yaml index b1f3e247b..9f45f3089 100644 --- a/helm-charts/common/whisper/values.yaml +++ b/helm-charts/common/whisper/values.yaml @@ -83,6 +83,8 @@ tolerations: [] affinity: {} +tdxEnabled: false + global: http_proxy: "" https_proxy: "" diff --git a/helm-charts/docsum/README.md b/helm-charts/docsum/README.md index 2864714ce..99b2689f1 100644 --- a/helm-charts/docsum/README.md +++ b/helm-charts/docsum/README.md @@ -20,6 +20,8 @@ helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --se # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-tgi-values.yaml ... # To use Gaudi device with vLLM # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-vllm-values.yaml .. +# To run chatqna with Intel TDX feature +# helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --set tgi.LLM_MODEL_ID=${MODELNAME} --set docsum.tdxEnabled=true --set docsum.resources.limits.memory=1Gi --set docsum-ui.tdxEnabled=true --set docsum-ui.resources.limits.memory=2Gi --set llm-uservice.tdxEnabled=true --set llm-uservice.resources.limits.memory=4Gi --set tgi.tdxEnabled=true --set tgi.resources.limits.memory=80Gi --set whisper.tdxEnabled=true --set whisper.resources.limits.memory=13Gi ``` ## Verify From 10803cc69c913d36ae8056e453750fb177ce95bd Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 18 Feb 2025 18:43:47 +0000 Subject: [PATCH 2/4] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Signed-off-by: Krzysztof Sandowicz --- helm-charts/common/whisper/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/common/whisper/Chart.yaml b/helm-charts/common/whisper/Chart.yaml index 294c7f610..86087cb6e 100644 --- a/helm-charts/common/whisper/Chart.yaml +++ b/helm-charts/common/whisper/Chart.yaml @@ -11,4 +11,4 @@ appVersion: "v1.0" dependencies: - name: commonlib version: 0-latest - repository: "file://../commonlib" \ No newline at end of file + repository: "file://../commonlib" From 232981f8a97c4165102b2c14d902742500ee7dc7 Mon Sep 17 00:00:00 2001 From: Krzysztof Sandowicz Date: Wed, 19 Feb 2025 09:08:26 +0100 Subject: [PATCH 3/4] Comment fixed in README.md Signed-off-by: Krzysztof Sandowicz --- helm-charts/docsum/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-charts/docsum/README.md b/helm-charts/docsum/README.md index 99b2689f1..84d14256c 100644 --- a/helm-charts/docsum/README.md +++ b/helm-charts/docsum/README.md @@ -20,7 +20,7 @@ helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --se # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-tgi-values.yaml ... # To use Gaudi device with vLLM # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-vllm-values.yaml .. -# To run chatqna with Intel TDX feature +# To run docsum with Intel TDX feature # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --set tgi.LLM_MODEL_ID=${MODELNAME} --set docsum.tdxEnabled=true --set docsum.resources.limits.memory=1Gi --set docsum-ui.tdxEnabled=true --set docsum-ui.resources.limits.memory=2Gi --set llm-uservice.tdxEnabled=true --set llm-uservice.resources.limits.memory=4Gi --set tgi.tdxEnabled=true --set tgi.resources.limits.memory=80Gi --set whisper.tdxEnabled=true --set whisper.resources.limits.memory=13Gi ``` From eaf193f935f6979174e9905167796d5b66141fdd Mon Sep 17 00:00:00 2001 From: Krzysztof Sandowicz Date: Thu, 20 Feb 2025 19:01:10 +0100 Subject: [PATCH 4/4] Main service enabled with TDX. Description updated in docsum README.md Signed-off-by: Krzysztof Sandowicz --- helm-charts/docsum/Chart.yaml | 3 +++ helm-charts/docsum/README.md | 2 +- helm-charts/docsum/templates/deployment.yaml | 6 ++---- helm-charts/docsum/values.yaml | 2 ++ 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/helm-charts/docsum/Chart.yaml b/helm-charts/docsum/Chart.yaml index 4d02035f8..288d7fba2 100644 --- a/helm-charts/docsum/Chart.yaml +++ b/helm-charts/docsum/Chart.yaml @@ -32,5 +32,8 @@ dependencies: version: 0-latest repository: "file://../common/nginx" condition: nginx.enabled + - name: commonlib + version: 0-latest + repository: "file://../common/commonlib" version: 0-latest appVersion: "v1.0" diff --git a/helm-charts/docsum/README.md b/helm-charts/docsum/README.md index 84d14256c..1c84fd9f6 100644 --- a/helm-charts/docsum/README.md +++ b/helm-charts/docsum/README.md @@ -21,7 +21,7 @@ helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --se # To use Gaudi device with vLLM # helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --values docsum/gaudi-vllm-values.yaml .. # To run docsum with Intel TDX feature -# helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --set tgi.LLM_MODEL_ID=${MODELNAME} --set docsum.tdxEnabled=true --set docsum.resources.limits.memory=1Gi --set docsum-ui.tdxEnabled=true --set docsum-ui.resources.limits.memory=2Gi --set llm-uservice.tdxEnabled=true --set llm-uservice.resources.limits.memory=4Gi --set tgi.tdxEnabled=true --set tgi.resources.limits.memory=80Gi --set whisper.tdxEnabled=true --set whisper.resources.limits.memory=13Gi +# helm install docsum docsum --set global.HUGGINGFACEHUB_API_TOKEN=${HFTOKEN} --set tgi.LLM_MODEL_ID=${MODELNAME} --set tdxEnabled=true --set resources.limits.memory=1Gi --set docsum-ui.tdxEnabled=true --set docsum-ui.resources.limits.memory=2Gi --set llm-uservice.tdxEnabled=true --set llm-uservice.resources.limits.memory=4Gi --set tgi.tdxEnabled=true --set tgi.resources.limits.memory=80Gi --set whisper.tdxEnabled=true --set whisper.resources.limits.memory=13Gi ``` ## Verify diff --git a/helm-charts/docsum/templates/deployment.yaml b/helm-charts/docsum/templates/deployment.yaml index 486820715..0e96f5f25 100644 --- a/helm-charts/docsum/templates/deployment.yaml +++ b/helm-charts/docsum/templates/deployment.yaml @@ -16,14 +16,12 @@ spec: app: {{ include "docsum.fullname" . }} template: metadata: - {{- with .Values.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} + {{- include "common.annotations" . | nindent 6 }} labels: {{- include "docsum.selectorLabels" . | nindent 8 }} app: {{ include "docsum.fullname" . }} spec: + {{- include "common.runtimeClassName" . | indent 6 }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} diff --git a/helm-charts/docsum/values.yaml b/helm-charts/docsum/values.yaml index a122df98b..61f54921a 100644 --- a/helm-charts/docsum/values.yaml +++ b/helm-charts/docsum/values.yaml @@ -103,6 +103,8 @@ docsum-ui: dashboard: prefix: "OPEA DocSum" +tdxEnabled: false + global: http_proxy: "" https_proxy: ""