Use unified nginx helm chart

- Add helm chart support for OPEA nginx - Use unified nginx chart in E2E Signed-off-by: Lianhao Lu <[email protected]>
opea-project · Dec 12, 2024 · 002d680 · 002d680
1 parent e9dc58a
commit 002d680
Show file tree

Hide file tree

Showing 38 changed files with 580 additions and 795 deletions.
diff --git a/helm-charts/audioqna/Chart.yaml b/helm-charts/audioqna/Chart.yaml
@@ -28,5 +28,8 @@ dependencies:
     version: 0-latest
     repository: "file://../common/ui"
     alias: audioqna-ui
+  - name: nginx
+    version: 0-latest
+    repository: "file://../common/nginx"
 version: 0-latest
 appVersion: "1.1"
diff --git a/helm-charts/audioqna/templates/nginx-deployment.yaml b/helm-charts/audioqna/templates/nginx-deployment.yaml
diff --git a/helm-charts/audioqna/templates/nginx.yaml b/helm-charts/audioqna/templates/nginx.yaml
@@ -0,0 +1,15 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-nginx-config
+  labels:
+    {{- include "audioqna.labels" . | nindent 4 }}
+data:
+  FRONTEND_SERVICE_IP: {{ include "ui.fullname" (index .Subcharts "audioqna-ui") | quote }}
+  FRONTEND_SERVICE_PORT: {{ index .Values "audioqna-ui" "service" "port" | quote }}
+  BACKEND_SERVICE_NAME: audioqna
+  BACKEND_SERVICE_IP: {{ include "audioqna.fullname" . | quote }}
+  BACKEND_SERVICE_PORT: {{ .Values.service.port | quote }}
diff --git a/helm-charts/audioqna/values.yaml b/helm-charts/audioqna/values.yaml
@@ -50,10 +50,6 @@ service:
   type: ClusterIP
   port: 3008
 
-nginx:
-  service:
-    type: NodePort
-
 nodeSelector: {}
 
 tolerations: []
@@ -64,6 +60,11 @@ affinity: {}
 tgi:
   LLM_MODEL_ID: Intel/neural-chat-7b-v3-3
 
+nginx:
+  cmName: "{{ .Release.Name }}-nginx-config"
+  service:
+    type: NodePort
+
 audioqna-ui:
   image:
     repository: opea/audioqna-ui

diff --git a/helm-charts/chatqna/Chart.yaml b/helm-charts/chatqna/Chart.yaml
@@ -37,5 +37,8 @@ dependencies:
     alias: chatqna-ui
     version: 0-latest
     repository: "file://../common/ui"
+  - name: nginx
+    version: 0-latest
+    repository: "file://../common/nginx"
 version: 0-latest
 appVersion: "v1.0"
diff --git a/helm-charts/chatqna/templates/nginx-deployment.yaml b/helm-charts/chatqna/templates/nginx-deployment.yaml
diff --git a/helm-charts/chatqna/templates/nginx.yaml b/helm-charts/chatqna/templates/nginx.yaml
@@ -0,0 +1,17 @@
+# Copyright (C) 2024 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-nginx-config
+  labels:
+    {{- include "chatqna.labels" . | nindent 4 }}
+data:
+  FRONTEND_SERVICE_IP: {{ include "ui.fullname" (index .Subcharts "chatqna-ui") | quote }}
+  FRONTEND_SERVICE_PORT: {{ index .Values "chatqna-ui" "service" "port" | quote }}
+  BACKEND_SERVICE_NAME: chatqna
+  BACKEND_SERVICE_IP: {{ include "chatqna.fullname" . | quote }}
+  BACKEND_SERVICE_PORT: {{ .Values.service.port | quote }}
+  DATAPREP_SERVICE_IP: {{ include "data-prep.fullname" (index .Subcharts "data-prep") | quote }}
+  DATAPREP_SERVICE_PORT: {{ index .Values "data-prep" "service" "port" | quote }}
diff --git a/helm-charts/chatqna/values.yaml b/helm-charts/chatqna/values.yaml
@@ -50,10 +50,6 @@ service:
   type: ClusterIP
   port: 8888
 
-nginx:
-  service:
-    type: NodePort
-
 nodeSelector: {}
 
 tolerations: []
@@ -74,6 +70,11 @@ tgi:
 guardrails-usvc:
   enabled: false
 
+nginx:
+  cmName: "{{ .Release.Name }}-nginx-config"
+  service:
+    type: NodePort
+
 # If you would like to switch to traditional UI image
 # Uncomment the following lines
 # chatqna-ui:

diff --git a/helm-charts/codegen/Chart.yaml b/helm-charts/codegen/Chart.yaml
@@ -16,5 +16,8 @@ dependencies:
     version: 0-latest
     repository: "file://../common/ui"
     alias: codegen-ui
+  - name: nginx
+    version: 0-latest
+    repository: "file://../common/nginx"
 version: 0-latest
 appVersion: "v1.0"