From aa9d17e70513a35ea20365a2d13d69754c4ff1b3 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Tue, 27 Aug 2024 17:05:40 +0800 Subject: [PATCH 01/26] Add chatQnA UI manifest Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 94 +++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 9da10c975..8906761cd 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -203,6 +203,20 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- +# Source: chatqna/charts/tgi/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: chatqna-ui-config +data: + CHAT_BASE_URL: 'http://backend_address:8888/v1/chatqna' + UPLOAD_FILE_BASE_URL: 'http://backend_address:6007/v1/dataprep' + GET_FILE: 'http://backend_address:6007/v1/dataprep/get_file' + DELETE_FILE: 'http://backend_address:6007/v1/dataprep/delete_file' +--- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -457,6 +471,25 @@ spec: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna --- +# Source: chatqna/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: chatqna-ui +spec: + type: ClusterIP + ports: + - port: 5173 + targetPort: 5173 + protocol: TCP + name: chatqna-ui + selector: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna-ui +--- # Source: chatqna/charts/data-prep/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -923,6 +956,67 @@ spec: # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-ui +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna-ui + template: + metadata: + annotations: + sidecar.istio.io/rewriteAppHTTPProbers: 'true' + labels: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna-ui + spec: + securityContext: + {} + containers: + - name: chatqna-ui + envFrom: + - configMapRef: + name: chatqna-ui-config + securityContext: + {} + image: "opea/chatqna-ui:latest" + imagePullPolicy: IfNotPresent + args: null + ports: + - name: http + containerPort: 5173 + protocol: TCP + livenessProbe: + failureThreshold: 24 + httpGet: + path: /health + port: http + initialDelaySeconds: 5 + periodSeconds: 5 + readinessProbe: + httpGet: + path: /health + port: http + initialDelaySeconds: 5 + periodSeconds: 5 + startupProbe: + failureThreshold: 120 + httpGet: + path: /health + port: http + initialDelaySeconds: 5 + periodSeconds: 5 + resources: + {} +--- +# Source: chatqna/charts/tei/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + apiVersion: apps/v1 kind: Deployment metadata: From 15ed830dbf88dec98a84a111f4e7df75a5d2c5b1 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Tue, 27 Aug 2024 17:29:59 +0800 Subject: [PATCH 02/26] update port Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 8906761cd..53c026999 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -212,10 +212,10 @@ kind: ConfigMap metadata: name: chatqna-ui-config data: - CHAT_BASE_URL: 'http://backend_address:8888/v1/chatqna' - UPLOAD_FILE_BASE_URL: 'http://backend_address:6007/v1/dataprep' - GET_FILE: 'http://backend_address:6007/v1/dataprep/get_file' - DELETE_FILE: 'http://backend_address:6007/v1/dataprep/delete_file' + CHAT_BASE_URL: 'http://backend_address:30888/v1/chatqna' + # UPLOAD_FILE_BASE_URL: 'http://backend_address:6007/v1/dataprep' + # GET_FILE: 'http://backend_address:6007/v1/dataprep/get_file' + # DELETE_FILE: 'http://backend_address:6007/v1/dataprep/delete_file' --- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation @@ -461,10 +461,11 @@ metadata: app.kubernetes.io/version: "v0.8" app.kubernetes.io/managed-by: Helm spec: - type: ClusterIP + type: NodePort ports: - port: 8888 targetPort: 8888 + nodePort: 30888 protocol: TCP name: chatqna selector: @@ -480,10 +481,11 @@ kind: Service metadata: name: chatqna-ui spec: - type: ClusterIP + type: NodePort ports: - port: 5173 targetPort: 5173 + nodePort: 30889 protocol: TCP name: chatqna-ui selector: @@ -976,6 +978,7 @@ spec: spec: securityContext: {} + hostIPC: true containers: - name: chatqna-ui envFrom: @@ -990,28 +993,6 @@ spec: - name: http containerPort: 5173 protocol: TCP - livenessProbe: - failureThreshold: 24 - httpGet: - path: /health - port: http - initialDelaySeconds: 5 - periodSeconds: 5 - readinessProbe: - httpGet: - path: /health - port: http - initialDelaySeconds: 5 - periodSeconds: 5 - startupProbe: - failureThreshold: 120 - httpGet: - path: /health - port: http - initialDelaySeconds: 5 - periodSeconds: 5 - resources: - {} --- # Source: chatqna/charts/tei/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation From f96619534f1f075bc98d2d4a5cb5944ee897cf71 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:30:25 +0000 Subject: [PATCH 03/26] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 53c026999..78b9c97ae 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -978,7 +978,7 @@ spec: spec: securityContext: {} - hostIPC: true + hostIPC: true containers: - name: chatqna-ui envFrom: From 93987d1f50dab79743671f6dd8f8f72a529e7aa9 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 15:03:00 +0800 Subject: [PATCH 04/26] add nginx config Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 128 +++++++++++++++--- 1 file changed, 110 insertions(+), 18 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 53c026999..0c2771110 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -3,6 +3,66 @@ # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 +apiVersion: v1 +kind: ConfigMap +metadata: + name: chatqna-nginx-config +data: + default.conf: | + server { + listen 80; + listen [::]:80; + + location /home { + root /usr/share/nginx/html; + index index.html index.htm; + } + + location / { + proxy_pass http://100.83.111.251:5173; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /v1/chatqna { + proxy_pass http://chatqna.default.svc.cluster.local:8888; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /v1/dataprep { + proxy_pass http://chatqna.default.svc.cluster.local:6007; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /v1/dataprep/get_file { + proxy_pass http://chatqna.default.svc.cluster.local:6007; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + + location /v1/dataprep/delete_file { + proxy_pass http://chatqna.default.svc.cluster.local:6007; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + } + } +--- +# Source: chatqna/charts/data-prep/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + apiVersion: v1 kind: ConfigMap metadata: @@ -203,20 +263,6 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- -# Source: chatqna/charts/tgi/templates/configmap.yaml -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: v1 -kind: ConfigMap -metadata: - name: chatqna-ui-config -data: - CHAT_BASE_URL: 'http://backend_address:30888/v1/chatqna' - # UPLOAD_FILE_BASE_URL: 'http://backend_address:6007/v1/dataprep' - # GET_FILE: 'http://backend_address:6007/v1/dataprep/get_file' - # DELETE_FILE: 'http://backend_address:6007/v1/dataprep/delete_file' ---- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -461,11 +507,10 @@ metadata: app.kubernetes.io/version: "v0.8" app.kubernetes.io/managed-by: Helm spec: - type: NodePort + type: ClusterIP ports: - port: 8888 targetPort: 8888 - nodePort: 30888 protocol: TCP name: chatqna selector: @@ -481,11 +526,10 @@ kind: Service metadata: name: chatqna-ui spec: - type: NodePort + type: ClusterIP ports: - port: 5173 targetPort: 5173 - nodePort: 30889 protocol: TCP name: chatqna-ui selector: @@ -1314,3 +1358,51 @@ spec: volumes: - name: tmp emptyDir: {} +--- +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-nginx-deployment +spec: + replicas: 1 + selector: + matchLabels: + app: chatqna-nginx + template: + metadata: + labels: + app: chatqna-nginx + spec: + nodeSelector: + task: "chatqna" + containers: + - name: chatqna-nginx + image: nginx:latest + ports: + - containerPort: 80 + volumeMounts: + - name: nginx-config-volume + mountPath: /etc/nginx/conf.d/default.conf + subPath: default.conf + volumes: + - name: nginx-config-volume + configMap: + name: chatqna-nginx-config +--- +kind: Service +apiVersion: v1 +metadata: + name: chatqna-nginx-svc +spec: + selector: + app: chatqna-nginx + ports: + - protocol: TCP + port: 80 + targetPort: 80 + nodePort: 30789 + type: NodePort + From 68b570a3ea19e4a79c43f2a309550255f6a77c7e Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 07:04:45 +0000 Subject: [PATCH 05/26] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 3fb111d11..9c9e98adb 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -1405,4 +1405,3 @@ spec: targetPort: 80 nodePort: 30789 type: NodePort - From 0e07bdb75df55ac9834480a693434733c5098b59 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 15:32:15 +0800 Subject: [PATCH 06/26] update code --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 3fb111d11..cdc68fa6d 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -1025,9 +1025,6 @@ spec: hostIPC: true containers: - name: chatqna-ui - envFrom: - - configMapRef: - name: chatqna-ui-config securityContext: {} image: "opea/chatqna-ui:latest" From c5133c7e7bf71154bb6866ff315bc40841b8b6ca Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 16:25:57 +0800 Subject: [PATCH 07/26] update nginx config Signed-off-by: Yue, Wenjiao --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index d9038ff1b..1baaeccc3 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -1373,8 +1373,6 @@ spec: labels: app: chatqna-nginx spec: - nodeSelector: - task: "chatqna" containers: - name: chatqna-nginx image: nginx:latest From b470cc1aab8e13f7932dfbb7f1807244256c1d0b Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 16:39:25 +0800 Subject: [PATCH 08/26] update nginx config Signed-off-by: Yue, Wenjiao --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 1baaeccc3..e3bd51465 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -19,7 +19,7 @@ data: } location / { - proxy_pass http://100.83.111.251:5173; + proxy_pass http://100.83.111.240:5173; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From 8bd7222d2a23fc07d59ed482553a386ca8740919 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 17:01:37 +0800 Subject: [PATCH 09/26] update ui IP Signed-off-by: Yue, Wenjiao --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index e3bd51465..c21dc9955 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -19,7 +19,7 @@ data: } location / { - proxy_pass http://100.83.111.240:5173; + proxy_pass http://chatqna.default.svc.cluster.local:5173; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From cc21e7ebcd09f410e7e32eb438c17e5187ae74e2 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 18:22:29 +0800 Subject: [PATCH 10/26] update yaml Signed-off-by: Yue, Wenjiao --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 +- DocSum/docker/ui/svelte/.env | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index c21dc9955..b48baa61e 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -19,7 +19,7 @@ data: } location / { - proxy_pass http://chatqna.default.svc.cluster.local:5173; + proxy_pass http://chatqna-ui.default.svc.cluster.local:5173; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/DocSum/docker/ui/svelte/.env b/DocSum/docker/ui/svelte/.env index f3953f2f7..f987cdb7f 100644 --- a/DocSum/docker/ui/svelte/.env +++ b/DocSum/docker/ui/svelte/.env @@ -1 +1,2 @@ DOC_BASE_URL = 'http://backend_address:8888/v1/docsum' +DOC_BASE_URL = 'http://backend_address:8888/v1/docsum' From 87b244f3194b3f4beff4eb0a6109b959a3eadfce Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 18:25:40 +0800 Subject: [PATCH 11/26] update api Signed-off-by: Yue, Wenjiao --- DocSum/docker/ui/svelte/.env | 1 - 1 file changed, 1 deletion(-) diff --git a/DocSum/docker/ui/svelte/.env b/DocSum/docker/ui/svelte/.env index f987cdb7f..f3953f2f7 100644 --- a/DocSum/docker/ui/svelte/.env +++ b/DocSum/docker/ui/svelte/.env @@ -1,2 +1 @@ DOC_BASE_URL = 'http://backend_address:8888/v1/docsum' -DOC_BASE_URL = 'http://backend_address:8888/v1/docsum' From 167a3f0b90946d84863e60099fd7383000071595 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 20:05:25 +0800 Subject: [PATCH 12/26] update env config Signed-off-by: Yue, Wenjiao --- ChatQnA/docker/ui/svelte/.env | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChatQnA/docker/ui/svelte/.env b/ChatQnA/docker/ui/svelte/.env index fad2468c0..d6f7643b6 100644 --- a/ChatQnA/docker/ui/svelte/.env +++ b/ChatQnA/docker/ui/svelte/.env @@ -1,7 +1,7 @@ -CHAT_BASE_URL = 'http://backend_address:8888/v1/chatqna' +CHAT_BASE_URL = '/v1/chatqna' -UPLOAD_FILE_BASE_URL = 'http://backend_address:6007/v1/dataprep' +UPLOAD_FILE_BASE_URL = '/v1/dataprep' -GET_FILE = 'http://backend_address:6007/v1/dataprep/get_file' +GET_FILE = '/v1/dataprep/get_file' -DELETE_FILE = 'http://backend_address:6007/v1/dataprep/delete_file' +DELETE_FILE = '/v1/dataprep/delete_file' From 83e60b3638fa93f2548f3010234c95a8860eb53e Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Wed, 28 Aug 2024 20:40:21 +0800 Subject: [PATCH 13/26] update env Signed-off-by: Yue, Wenjiao --- ChatQnA/docker/ui/svelte/.env | 8 ++--- .../kubernetes/manifests/xeon/chatqna.yaml | 30 +++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ChatQnA/docker/ui/svelte/.env b/ChatQnA/docker/ui/svelte/.env index d6f7643b6..fad2468c0 100644 --- a/ChatQnA/docker/ui/svelte/.env +++ b/ChatQnA/docker/ui/svelte/.env @@ -1,7 +1,7 @@ -CHAT_BASE_URL = '/v1/chatqna' +CHAT_BASE_URL = 'http://backend_address:8888/v1/chatqna' -UPLOAD_FILE_BASE_URL = '/v1/dataprep' +UPLOAD_FILE_BASE_URL = 'http://backend_address:6007/v1/dataprep' -GET_FILE = '/v1/dataprep/get_file' +GET_FILE = 'http://backend_address:6007/v1/dataprep/get_file' -DELETE_FILE = '/v1/dataprep/delete_file' +DELETE_FILE = 'http://backend_address:6007/v1/dataprep/delete_file' diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index b48baa61e..759de0d22 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -7,6 +7,12 @@ apiVersion: v1 kind: ConfigMap metadata: name: chatqna-nginx-config + labels: + helm.sh/chart: chatqna-nginx-0.8.0 + app.kubernetes.io/name: chatqna-nginx + app.kubernetes.io/instance: chatqna-nginx + app.kubernetes.io/version: "v0.8" + app.kubernetes.io/managed-by: Helm data: default.conf: | server { @@ -525,6 +531,12 @@ apiVersion: v1 kind: Service metadata: name: chatqna-ui + labels: + helm.sh/chart: chatqna-ui-0.8.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna-ui + app.kubernetes.io/version: "v0.8" + app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: @@ -1006,6 +1018,12 @@ apiVersion: apps/v1 kind: Deployment metadata: name: chatqna-ui + labels: + helm.sh/chart: chatqna-ui-0.8.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna-ui + app.kubernetes.io/version: "v0.8" + app.kubernetes.io/managed-by: Helm spec: replicas: 1 selector: @@ -1363,6 +1381,12 @@ apiVersion: apps/v1 kind: Deployment metadata: name: chatqna-nginx-deployment + labels: + helm.sh/chart: chatqna-nginx-0.8.0 + app.kubernetes.io/name: chatqna-nginx + app.kubernetes.io/instance: chatqna-nginx + app.kubernetes.io/version: "v0.8" + app.kubernetes.io/managed-by: Helm spec: replicas: 1 selector: @@ -1391,6 +1415,12 @@ kind: Service apiVersion: v1 metadata: name: chatqna-nginx-svc + labels: + helm.sh/chart: chatqna-nginx-0.8.0 + app.kubernetes.io/name: chatqna-nginx + app.kubernetes.io/instance: chatqna-nginx + app.kubernetes.io/version: "v0.8" + app.kubernetes.io/managed-by: Helm spec: selector: app: chatqna-nginx From 046b11401423e300090e5bbb44a3b35933bdd82a Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 12:40:51 +0000 Subject: [PATCH 14/26] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 759de0d22..a2ce7fe70 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -12,7 +12,7 @@ metadata: app.kubernetes.io/name: chatqna-nginx app.kubernetes.io/instance: chatqna-nginx app.kubernetes.io/version: "v0.8" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm data: default.conf: | server { @@ -536,7 +536,7 @@ metadata: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui app.kubernetes.io/version: "v0.8" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm spec: type: ClusterIP ports: @@ -1023,7 +1023,7 @@ metadata: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui app.kubernetes.io/version: "v0.8" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm spec: replicas: 1 selector: @@ -1420,7 +1420,7 @@ metadata: app.kubernetes.io/name: chatqna-nginx app.kubernetes.io/instance: chatqna-nginx app.kubernetes.io/version: "v0.8" - app.kubernetes.io/managed-by: Helm + app.kubernetes.io/managed-by: Helm spec: selector: app: chatqna-nginx From 6bde6985fdee8f7d73d7d6bdf1f29227db19714b Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 29 Aug 2024 12:01:28 +0800 Subject: [PATCH 15/26] update specify node Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 759de0d22..c56450235 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -574,6 +574,8 @@ spec: app.kubernetes.io/name: data-prep app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -652,6 +654,8 @@ spec: app.kubernetes.io/name: embedding-usvc app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -730,6 +734,8 @@ spec: app.kubernetes.io/name: llm-uservice app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -808,6 +814,8 @@ spec: app.kubernetes.io/name: redis-vector-db app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -880,6 +888,8 @@ spec: app.kubernetes.io/name: reranking-usvc app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -938,7 +948,7 @@ spec: apiVersion: apps/v1 kind: Deployment -metadata: +metadata: name: chatqna-retriever-usvc labels: helm.sh/chart: retriever-usvc-0.8.0 @@ -958,6 +968,8 @@ spec: app.kubernetes.io/name: retriever-usvc app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -1038,6 +1050,8 @@ spec: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui spec: + nodeSelector: + node-type: visualqna securityContext: {} hostIPC: true @@ -1079,6 +1093,8 @@ spec: app.kubernetes.io/name: tei app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -1163,6 +1179,8 @@ spec: app.kubernetes.io/name: teirerank app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -1247,6 +1265,8 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: {} containers: @@ -1320,6 +1340,8 @@ spec: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: visualqna securityContext: null containers: @@ -1397,6 +1419,8 @@ spec: labels: app: chatqna-nginx spec: + nodeSelector: + task: visualqna containers: - name: chatqna-nginx image: nginx:latest From 4247d4f0ac872394c233ca20b9f616bb3dbf1b2d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 04:01:51 +0000 Subject: [PATCH 16/26] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index f78f876bd..b1ef5396e 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -948,7 +948,7 @@ spec: apiVersion: apps/v1 kind: Deployment -metadata: +metadata: name: chatqna-retriever-usvc labels: helm.sh/chart: retriever-usvc-0.8.0 @@ -1180,7 +1180,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + node-type: visualqna securityContext: {} containers: @@ -1266,7 +1266,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + node-type: visualqna securityContext: {} containers: @@ -1341,7 +1341,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + node-type: visualqna securityContext: null containers: From 48d6be8a8f3bff1b1a2f3e6952baac7200f69838 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 29 Aug 2024 14:02:23 +0800 Subject: [PATCH 17/26] update node-type Signed-off-by: Yue, Wenjiao --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index f78f876bd..74341776b 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -1420,7 +1420,7 @@ spec: app: chatqna-nginx spec: nodeSelector: - task: visualqna + node-type: visualqna containers: - name: chatqna-nginx image: nginx:latest From 40b90baa17be7aa9e09b9ac1b00b167e333301c9 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 29 Aug 2024 14:07:22 +0800 Subject: [PATCH 18/26] update yaml Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 55f48c6d2..f9b8c8b8a 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -575,7 +575,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -655,7 +655,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -735,7 +735,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -815,7 +815,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -889,7 +889,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -969,7 +969,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -1051,7 +1051,7 @@ spec: app.kubernetes.io/instance: chatqna-ui spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} hostIPC: true @@ -1094,7 +1094,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -1180,7 +1180,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -1266,7 +1266,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: {} containers: @@ -1341,7 +1341,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - node-type: visualqna + task: visualqna securityContext: null containers: @@ -1420,7 +1420,7 @@ spec: app: chatqna-nginx spec: nodeSelector: - node-type: visualqna + task: visualqna containers: - name: chatqna-nginx image: nginx:latest From a8b6520881eb596c72355e62a3cc8c0463cffa4e Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 29 Aug 2024 14:26:04 +0800 Subject: [PATCH 19/26] update yaml Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index f9b8c8b8a..6acf5deea 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -575,7 +575,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -655,7 +655,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -735,7 +735,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -815,7 +815,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -889,7 +889,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -969,7 +969,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -1051,7 +1051,7 @@ spec: app.kubernetes.io/instance: chatqna-ui spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} hostIPC: true @@ -1094,7 +1094,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -1180,7 +1180,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -1266,7 +1266,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: {} containers: @@ -1341,7 +1341,7 @@ spec: app.kubernetes.io/instance: chatqna spec: nodeSelector: - task: visualqna + node-type: chatqna-ui securityContext: null containers: @@ -1420,7 +1420,7 @@ spec: app: chatqna-nginx spec: nodeSelector: - task: visualqna + node-type: chatqna-ui containers: - name: chatqna-nginx image: nginx:latest From 09375d34c605304d9e9b344eb1d4bd6e059d05e6 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 29 Aug 2024 15:17:53 +0800 Subject: [PATCH 20/26] delete nodeSelector Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 46 +++++-------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 6acf5deea..9924b5404 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -573,9 +573,7 @@ spec: labels: app.kubernetes.io/name: data-prep app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -653,9 +651,7 @@ spec: labels: app.kubernetes.io/name: embedding-usvc app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -733,9 +729,7 @@ spec: labels: app.kubernetes.io/name: llm-uservice app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -813,9 +807,7 @@ spec: labels: app.kubernetes.io/name: redis-vector-db app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -887,9 +879,7 @@ spec: labels: app.kubernetes.io/name: reranking-usvc app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -967,9 +957,7 @@ spec: labels: app.kubernetes.io/name: retriever-usvc app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -1049,9 +1037,7 @@ spec: labels: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} hostIPC: true @@ -1092,9 +1078,7 @@ spec: labels: app.kubernetes.io/name: tei app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -1178,9 +1162,7 @@ spec: labels: app.kubernetes.io/name: teirerank app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -1264,9 +1246,7 @@ spec: labels: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: {} containers: @@ -1339,9 +1319,7 @@ spec: labels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna - spec: - nodeSelector: - node-type: chatqna-ui + spec: securityContext: null containers: @@ -1419,8 +1397,6 @@ spec: labels: app: chatqna-nginx spec: - nodeSelector: - node-type: chatqna-ui containers: - name: chatqna-nginx image: nginx:latest From 458fb3cc268af13554d4065961b8dfef4b54d276 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 07:18:18 +0000 Subject: [PATCH 21/26] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .../kubernetes/manifests/xeon/chatqna.yaml | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 9924b5404..a2ce7fe70 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -573,7 +573,7 @@ spec: labels: app.kubernetes.io/name: data-prep app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -651,7 +651,7 @@ spec: labels: app.kubernetes.io/name: embedding-usvc app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -729,7 +729,7 @@ spec: labels: app.kubernetes.io/name: llm-uservice app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -807,7 +807,7 @@ spec: labels: app.kubernetes.io/name: redis-vector-db app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -879,7 +879,7 @@ spec: labels: app.kubernetes.io/name: reranking-usvc app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -957,7 +957,7 @@ spec: labels: app.kubernetes.io/name: retriever-usvc app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -1037,7 +1037,7 @@ spec: labels: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui - spec: + spec: securityContext: {} hostIPC: true @@ -1078,7 +1078,7 @@ spec: labels: app.kubernetes.io/name: tei app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -1162,7 +1162,7 @@ spec: labels: app.kubernetes.io/name: teirerank app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -1246,7 +1246,7 @@ spec: labels: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: {} containers: @@ -1319,7 +1319,7 @@ spec: labels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna - spec: + spec: securityContext: null containers: From 63bf8c1b4a1c7572e8cb1246d29f70cb8d3be117 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 29 Aug 2024 15:40:33 +0800 Subject: [PATCH 22/26] update dataprep api Signed-off-by: Yue, Wenjiao --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 9924b5404..481f6eb09 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -41,7 +41,7 @@ data: } location /v1/dataprep { - proxy_pass http://chatqna.default.svc.cluster.local:6007; + proxy_pass http://chatqna-data-prep.default.svc.cluster.local:6007; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -49,7 +49,7 @@ data: } location /v1/dataprep/get_file { - proxy_pass http://chatqna.default.svc.cluster.local:6007; + proxy_pass http://chatqna-data-prep.default.svc.cluster.local:6007; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; @@ -57,7 +57,7 @@ data: } location /v1/dataprep/delete_file { - proxy_pass http://chatqna.default.svc.cluster.local:6007; + proxy_pass http://chatqna-data-prep.default.svc.cluster.local:6007; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; From e74d5aa93783b73e393187edb909998d21804644 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Fri, 30 Aug 2024 17:19:58 +0800 Subject: [PATCH 23/26] add node-type Signed-off-by: Yue, Wenjiao --- .../kubernetes/manifests/xeon/chatqna.yaml | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index a0e9706cc..5627aee77 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -574,6 +574,8 @@ spec: app.kubernetes.io/name: data-prep app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -652,6 +654,8 @@ spec: app.kubernetes.io/name: embedding-usvc app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -730,6 +734,8 @@ spec: app.kubernetes.io/name: llm-uservice app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -808,6 +814,8 @@ spec: app.kubernetes.io/name: redis-vector-db app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -880,6 +888,8 @@ spec: app.kubernetes.io/name: reranking-usvc app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -958,6 +968,8 @@ spec: app.kubernetes.io/name: retriever-usvc app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -1038,6 +1050,8 @@ spec: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} hostIPC: true @@ -1079,6 +1093,8 @@ spec: app.kubernetes.io/name: tei app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -1163,6 +1179,8 @@ spec: app.kubernetes.io/name: teirerank app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -1247,6 +1265,8 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: {} containers: @@ -1320,6 +1340,8 @@ spec: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna spec: + nodeSelector: + node-type: chatqna-ui securityContext: null containers: @@ -1397,6 +1419,8 @@ spec: labels: app: chatqna-nginx spec: + nodeSelector: + node-type: chatqna-ui containers: - name: chatqna-nginx image: nginx:latest @@ -1429,4 +1453,4 @@ spec: port: 80 targetPort: 80 nodePort: 30789 - type: NodePort + type: NodePort \ No newline at end of file From 1ad7cfbed2db8438c4c7dbe8a5eff43565b6c9b6 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 30 Aug 2024 09:20:41 +0000 Subject: [PATCH 24/26] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ChatQnA/kubernetes/manifests/xeon/chatqna.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 5627aee77..5266fdb47 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -1453,4 +1453,4 @@ spec: port: 80 targetPort: 80 nodePort: 30789 - type: NodePort \ No newline at end of file + type: NodePort From f0809d529e414c0f37d40427a881bfdfbc5ec0b1 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 5 Sep 2024 18:00:47 +0800 Subject: [PATCH 25/26] delete specify nodeSelector Signed-off-by: Yue, Wenjiao --- .github/workflows/_manifest-e2e.yml | 1 + .../kubernetes/manifests/xeon/chatqna.yaml | 24 ------------------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/.github/workflows/_manifest-e2e.yml b/.github/workflows/_manifest-e2e.yml index 3974e4ca6..09a3ac4ca 100644 --- a/.github/workflows/_manifest-e2e.yml +++ b/.github/workflows/_manifest-e2e.yml @@ -75,6 +75,7 @@ jobs: kubectl create ns $NAMESPACE ${{ github.workspace }}/${{ inputs.example }}/tests/test_manifest_on_${{ inputs.hardware }}.sh install_${{ inputs.example }} $NAMESPACE echo "Testing ${{ inputs.example }}, waiting for pod ready..." + if kubectl rollout status deployment --namespace "$NAMESPACE" --timeout "$ROLLOUT_TIMEOUT_SECONDS"; then echo "Testing manifests ${{ inputs.example }}, waiting for pod ready done!" echo "skip_validate=false" >> $GITHUB_ENV diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 5627aee77..3ab70e8d5 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -574,8 +574,6 @@ spec: app.kubernetes.io/name: data-prep app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -654,8 +652,6 @@ spec: app.kubernetes.io/name: embedding-usvc app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -734,8 +730,6 @@ spec: app.kubernetes.io/name: llm-uservice app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -814,8 +808,6 @@ spec: app.kubernetes.io/name: redis-vector-db app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -888,8 +880,6 @@ spec: app.kubernetes.io/name: reranking-usvc app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -968,8 +958,6 @@ spec: app.kubernetes.io/name: retriever-usvc app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -1050,8 +1038,6 @@ spec: app.kubernetes.io/name: chatqna-ui app.kubernetes.io/instance: chatqna-ui spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} hostIPC: true @@ -1093,8 +1079,6 @@ spec: app.kubernetes.io/name: tei app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -1179,8 +1163,6 @@ spec: app.kubernetes.io/name: teirerank app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -1265,8 +1247,6 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: {} containers: @@ -1340,8 +1320,6 @@ spec: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna spec: - nodeSelector: - node-type: chatqna-ui securityContext: null containers: @@ -1419,8 +1397,6 @@ spec: labels: app: chatqna-nginx spec: - nodeSelector: - node-type: chatqna-ui containers: - name: chatqna-nginx image: nginx:latest From b3852d3ba8a23580912e7ba5646fc29daf823b63 Mon Sep 17 00:00:00 2001 From: "Yue, Wenjiao" Date: Thu, 5 Sep 2024 18:01:33 +0800 Subject: [PATCH 26/26] delete useless space Signed-off-by: Yue, Wenjiao --- .github/workflows/_manifest-e2e.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/_manifest-e2e.yml b/.github/workflows/_manifest-e2e.yml index 09a3ac4ca..3974e4ca6 100644 --- a/.github/workflows/_manifest-e2e.yml +++ b/.github/workflows/_manifest-e2e.yml @@ -75,7 +75,6 @@ jobs: kubectl create ns $NAMESPACE ${{ github.workspace }}/${{ inputs.example }}/tests/test_manifest_on_${{ inputs.hardware }}.sh install_${{ inputs.example }} $NAMESPACE echo "Testing ${{ inputs.example }}, waiting for pod ready..." - if kubectl rollout status deployment --namespace "$NAMESPACE" --timeout "$ROLLOUT_TIMEOUT_SECONDS"; then echo "Testing manifests ${{ inputs.example }}, waiting for pod ready done!" echo "skip_validate=false" >> $GITHUB_ENV