Helm: Revert chatqna and retrieve-usvc

Revert temporarily chatqna and retriever-usvc to unblock CI on xeon Signed-off-by: Lianhao Lu <[email protected]>
opea-project · Jul 31, 2024 · d3fc939 · d3fc939
1 parent f977969
commit d3fc939
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 73 deletions.
diff --git a/helm-charts/chatqna/gaudi-values.yaml b/helm-charts/chatqna/gaudi-values.yaml
@@ -1,7 +1,34 @@
 # Copyright (C) 2024 Intel Corporation
 # SPDX-License-Identifier: Apache-2.0
 
-# To override values in subchart tei
+# Default values for chatqna.
+# This is a YAML-formatted file.
+# Declare variables to be passed into your templates.
+
+replicaCount: 1
+
+image:
+  repository: opea/chatqna:latest
+  pullPolicy: IfNotPresent
+  # Overrides the image tag whose default is the chart appVersion.
+  # tag: "1.0"
+
+port: 8888
+service:
+  type: ClusterIP
+  port: 8888
+
+securityContext:
+  readOnlyRootFilesystem: true
+  allowPrivilegeEscalation: false
+  runAsNonRoot: true
+  runAsUser: 1000
+  capabilities:
+    drop:
+    - ALL
+  seccompProfile:
+    type: RuntimeDefault
+
 tei:
   image:
     repository: ghcr.io/huggingface/tei-gaudi
@@ -12,14 +39,22 @@ tei:
 
 # To override values in subchart tgi
 tgi:
+  LLM_MODEL_ID: Intel/neural-chat-7b-v3-3
+  # LLM_MODEL_ID: /data/OpenCodeInterpreter-DS-6.7B
   image:
     repository: ghcr.io/huggingface/tgi-gaudi
     tag: "2.0.1"
   resources:
     limits:
       habana.ai/gaudi: 1
-  extraArgs:
-    - "--max-input-length"
-    - "1024"
-    - "--max-total-tokens"
-    - "2048"
+
+global:
+  http_proxy:
+  https_proxy:
+  no_proxy:
+  HUGGINGFACEHUB_API_TOKEN: "insert-your-huggingface-token-here"
+  LANGCHAIN_TRACING_V2: false
+  LANGCHAIN_API_KEY: "insert-your-langchain-key-here"
+  # set modelUseHostPath to host directory if you want to use hostPath volume for model storage
+  # comment out modeluseHostPath if you want to download the model from huggingface
+  modelUseHostPath: /mnt/opea-models
diff --git a/helm-charts/common/retriever-usvc/templates/deployment.yaml b/helm-charts/common/retriever-usvc/templates/deployment.yaml
@@ -48,32 +48,20 @@ spec:
           volumeMounts:
             - mountPath: /tmp
               name: tmp
-          {{- if .Values.livenessProbe }}
-          livenessProbe:
-            {{- toYaml .Values.livenessProbe | nindent 12 }}
-          {{- end }}
-          {{- if .Values.readinessProbe }}
-          readinessProbe:
-            {{- toYaml .Values.readinessProbe | nindent 12 }}
-          {{- end }}
-          {{- if .Values.startupProbe }}
+          {{- if not .Values.noProbe }}
           startupProbe:
-            {{- toYaml .Values.startupProbe | nindent 12 }}
+            exec:
+              command:
+              - curl
+              {{- if .Values.TEI_EMBEDDING_ENDPOINT }}
+              - {{ .Values.TEI_EMBEDDING_ENDPOINT }}
+              {{- else }}
+              - http://{{ .Release.Name }}-tei
+              {{- end }}
+            initialDelaySeconds: 5
+            periodSeconds: 5
+            failureThreshold: 120
           {{- end }}
-          #{{- if not .Values.noProbe }}
-          #startupProbe:
-          #  exec:
-          #    command:
-          #    - curl
-          #    {{- if .Values.TEI_EMBEDDING_ENDPOINT }}
-          #    - {{ .Values.TEI_EMBEDDING_ENDPOINT }}
-          #    {{- else }}
-          #    - http://{{ .Release.Name }}-tei
-          #    {{- end }}
-          #  initialDelaySeconds: 5
-          #  periodSeconds: 5
-          #  failureThreshold: 120
-          #{{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       volumes:

diff --git a/helm-charts/common/retriever-usvc/templates/tests/test-pod.yaml b/helm-charts/common/retriever-usvc/templates/tests/test-pod.yaml
@@ -20,7 +20,7 @@ spec:
         - |
           your_embedding=$(python3 -c "import random; embedding = [random.uniform(-1, 1) for _ in range(768)]; print(embedding)");
           curl http://{{ include "retriever-usvc.fullname" . }}:{{ .Values.service.port }}/v1/retrieval  -sS --fail-with-body \
-            -X POST --connect-timeout 20 \
+            -X POST \
             -d "{\"text\":\"What is the revenue of Nike in 2023?\",\"embedding\":${your_embedding}}" \
             -H 'Content-Type: application/json'
   restartPolicy: Never
diff --git a/helm-charts/common/retriever-usvc/values.yaml b/helm-charts/common/retriever-usvc/values.yaml
@@ -55,27 +55,6 @@ resources: {}
   #   cpu: 100m
   #   memory: 128Mi
 
-livenessProbe:
-  httpGet:
-    path: v1/health_check
-    port: retriever-usvc
-  initialDelaySeconds: 5
-  periodSeconds: 5
-  failureThreshold: 24
-readinessProbe:
-  httpGet:
-    path: v1/health_check
-    port: retriever-usvc
-  initialDelaySeconds: 5
-  periodSeconds: 5
-startupProbe:
-  httpGet:
-    path: v1/health_check
-    port: retriever-usvc
-  initialDelaySeconds: 5
-  periodSeconds: 5
-  failureThreshold: 120
-
 nodeSelector: {}
 
 tolerations: []

diff --git a/manifests/common/retriever-usvc.yaml b/manifests/common/retriever-usvc.yaml
@@ -106,27 +106,6 @@ spec:
           volumeMounts:
             - mountPath: /tmp
               name: tmp
-          livenessProbe:
-            failureThreshold: 24
-            httpGet:
-              path: v1/health_check
-              port: retriever-usvc
-            initialDelaySeconds: 5
-            periodSeconds: 5
-          readinessProbe:
-            httpGet:
-              path: v1/health_check
-              port: retriever-usvc
-            initialDelaySeconds: 5
-            periodSeconds: 5
-          startupProbe:
-            failureThreshold: 120
-            httpGet:
-              path: v1/health_check
-              port: retriever-usvc
-            initialDelaySeconds: 5
-            periodSeconds: 5
-          #
           resources:
             {}
       volumes: