helm-chart: Make nginx service type configurable (#506)

* helm-chart: Make nginx service type configurable Fixed issue #501. * Adapt docsum and ui test-pod for latest changes Signed-off-by: Lianhao Lu <[email protected]>
opea-project · Oct 29, 2024 · a5c96ab · a5c96ab
1 parent c6a9c90
commit a5c96ab
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 11 deletions.
diff --git a/helm-charts/chatqna/templates/nginx-deployment.yaml b/helm-charts/chatqna/templates/nginx-deployment.yaml
@@ -114,4 +114,4 @@ spec:
   selector:
     {{- include "chatqna.selectorLabels" . | nindent 4 }}
     app: {{ include "chatqna.fullname" . }}-nginx
-  type: NodePort
+  type: {{ .Values.nginx.service.type }}
diff --git a/helm-charts/chatqna/values.yaml b/helm-charts/chatqna/values.yaml
@@ -18,6 +18,10 @@ service:
   type: ClusterIP
   port: 8888
 
+nginx:
+  service:
+    type: NodePort
+
 securityContext:
   readOnlyRootFilesystem: true
   allowPrivilegeEscalation: false

diff --git a/helm-charts/codegen/templates/nginx-deployment.yaml b/helm-charts/codegen/templates/nginx-deployment.yaml
@@ -90,4 +90,4 @@ spec:
   selector:
     {{- include "codegen.selectorLabels" . | nindent 4 }}
     app: {{ include "codegen.fullname" . }}-nginx
-  type: NodePort
+  type: {{ .Values.nginx.service.type }}
diff --git a/helm-charts/codegen/values.yaml b/helm-charts/codegen/values.yaml
@@ -18,6 +18,10 @@ service:
   type: ClusterIP
   port: 7778
 
+nginx:
+  service:
+    type: NodePort
+
 securityContext:
   readOnlyRootFilesystem: true
   allowPrivilegeEscalation: false

diff --git a/helm-charts/codetrans/templates/nginx-deployment.yaml b/helm-charts/codetrans/templates/nginx-deployment.yaml
@@ -90,4 +90,4 @@ spec:
   selector:
     {{- include "codetrans.selectorLabels" . | nindent 4 }}
     app: {{ include "codetrans.fullname" . }}-nginx
-  type: NodePort
+  type: {{ .Values.nginx.service.type }}
diff --git a/helm-charts/codetrans/values.yaml b/helm-charts/codetrans/values.yaml
@@ -19,6 +19,10 @@ service:
   type: ClusterIP
   port: 7777
 
+nginx:
+  service:
+    type: NodePort
+
 securityContext:
   readOnlyRootFilesystem: true
   allowPrivilegeEscalation: false

diff --git a/helm-charts/common/ui/templates/tests/test-pod.yaml b/helm-charts/common/ui/templates/tests/test-pod.yaml
@@ -13,11 +13,15 @@ metadata:
 spec:
   containers:
     - name: curl
-      image: alpine/curl
-      #image: python:3.10.14
-      command: ['sh', '-c']
+      image: python:3.10.14
+      command: ['bash', '-c']
       args:
         - |
-          curl http://{{ include "ui.fullname" . }}:{{ .Values.service.port }} -sS --fail-with-body \
-          -X GET
+          max_retry=20;
+          for ((i=1; i<=max_retry; i++)); do
+            curl http://{{ include "ui.fullname" . }}:{{ .Values.service.port }} -sS --fail-with-body -X GET && break;
+            curlcode=$?
+            if [[ $curlcode -eq 7 ]]; then sleep 10; else echo "curl failed with code $curlcode"; exit 1; fi;
+          done;
+          if [ $i -gt $max_retry ]; then echo "test failed with maximum retry"; exit 1; fi
   restartPolicy: Never
diff --git a/helm-charts/docsum/templates/nginx-deployment.yaml b/helm-charts/docsum/templates/nginx-deployment.yaml
@@ -90,4 +90,4 @@ spec:
   selector:
     {{- include "docsum.selectorLabels" . | nindent 4 }}
     app: {{ include "docsum.fullname" . }}-nginx
-  type: NodePort
+  type: {{ .Values.nginx.service.type }}
diff --git a/helm-charts/docsum/templates/tests/test-pod.yaml b/helm-charts/docsum/templates/tests/test-pod.yaml
@@ -20,8 +20,9 @@ spec:
           max_retry=20;
           for ((i=1; i<=max_retry; i++)); do
             curl http://{{ include "docsum.fullname" . }}:{{ .Values.service.port }}/v1/docsum -sS --fail-with-body \
-            -H 'Content-Type: application/json' \
-            -d '{"messages": "Text Embeddings Inference (TEI) is a toolkit for deploying and serving open source text embeddings and sequence classification models. TEI enables high-performance extraction for the most popular models, including FlagEmbedding, Ember, GTE and E5."}' && break;
+            -H 'Content-Type: multipart/form-data' \
+            -F "messages=Text Embeddings Inference (TEI) is a toolkit for deploying and serving open source text embeddings and sequence classification models. TEI enables high-performance extraction for the most popular models, including FlagEmbedding, Ember, GTE and E5." \
+            -F "max_tokens=32" && break;
             curlcode=$?
             if [[ $curlcode -eq 7 ]]; then sleep 10; else echo "curl failed with code $curlcode"; exit 1; fi;
           done;

diff --git a/helm-charts/docsum/values.yaml b/helm-charts/docsum/values.yaml
@@ -19,6 +19,10 @@ service:
   type: ClusterIP
   port: 8888
 
+nginx:
+  service:
+    type: NodePort
+
 securityContext:
   readOnlyRootFilesystem: true
   allowPrivilegeEscalation: false