From ba94e0130d58ccae49cd107d8d894d9b399ec9fb Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Tue, 10 Sep 2024 16:30:14 +0800 Subject: [PATCH] Add ui/nginx support in K8S manifest for ChatQnA/CodeGen/CodeTrans/Docsum (#773) Signed-off-by: Lianhao Lu --- .../manifests/gaudi/chatqna-guardrails.yaml | 241 +++++++++++- .../kubernetes/manifests/gaudi/chatqna.yaml | 274 +++++++++++++- .../manifests/xeon/chatqna-guardrails.yaml | 241 +++++++++++- .../kubernetes/manifests/xeon/chatqna.yaml | 354 +++++++++--------- .../kubernetes/manifests/gaudi/codegen.yaml | 217 ++++++++++- .../kubernetes/manifests/xeon/codegen.yaml | 217 ++++++++++- CodeGen/tests/test_manifest_on_gaudi.sh | 2 +- CodeGen/tests/test_manifest_on_xeon.sh | 2 +- .../kubernetes/manifests/gaudi/codetrans.yaml | 243 +++++++++--- .../kubernetes/manifests/xeon/codetrans.yaml | 243 +++++++++--- CodeTrans/tests/test_manifest_on_gaudi.sh | 2 +- CodeTrans/tests/test_manifest_on_xeon.sh | 2 +- DocSum/kubernetes/manifests/gaudi/docsum.yaml | 201 ++++++++++ DocSum/kubernetes/manifests/xeon/docsum.yaml | 201 ++++++++++ DocSum/tests/test_manifest_on_gaudi.sh | 2 +- DocSum/tests/test_manifest_on_xeon.sh | 2 +- 16 files changed, 2076 insertions(+), 368 deletions(-) diff --git a/ChatQnA/kubernetes/manifests/gaudi/chatqna-guardrails.yaml b/ChatQnA/kubernetes/manifests/gaudi/chatqna-guardrails.yaml index b79877660..ed9bc5068 100644 --- a/ChatQnA/kubernetes/manifests/gaudi/chatqna-guardrails.yaml +++ b/ChatQnA/kubernetes/manifests/gaudi/chatqna-guardrails.yaml @@ -1,4 +1,31 @@ --- +# Source: chatqna/charts/chatqna-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: chatqna-chatqna-ui-config + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/chatqna" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/chatqna" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/chatqna" + DOC_BASE_URL: "/v1/chatqna" + BASIC_URL: "/v1/chatqna" + VITE_CODE_GEN_URL: "/v1/chatqna" + VITE_DOC_SUM_URL: "/v1/chatqna" +--- # Source: chatqna/charts/data-prep/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -246,6 +273,92 @@ data: MAX_INPUT_LENGTH: "1024" MAX_TOTAL_TOKENS: "2048" --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://chatqna-chatqna-ui:5174; + 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: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-data-prep: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-data-prep: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-data-prep: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; + } + } + +kind: ConfigMap +metadata: + name: chatqna-nginx-config +--- +# Source: chatqna/charts/chatqna-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna +--- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -525,6 +638,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: chatqna-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + type: NodePort +--- # Source: chatqna/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -549,6 +678,60 @@ spec: selector: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna +--- +# Source: chatqna/charts/chatqna-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + template: + metadata: + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: chatqna-ui + envFrom: + - configMapRef: + name: chatqna-chatqna-ui-config + securityContext: + {} + image: "opea/chatqna-conversation-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 80 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: chatqna/charts/data-prep/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -1449,17 +1632,20 @@ metadata: app.kubernetes.io/instance: chatqna app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: chatqna spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna template: metadata: labels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna spec: securityContext: null @@ -1495,24 +1681,47 @@ spec: - name: chatqna containerPort: 8888 protocol: TCP - # startupProbe: - # httpGet: - # host: chatqna-llm-uservice - # port: 9000 - # path: / - # initialDelaySeconds: 5 - # periodSeconds: 5 - # failureThreshold: 120 - # livenessProbe: - # httpGet: - # path: / - # port: 8888 - # readinessProbe: - # httpGet: - # path: / - # port: 8888 resources: null volumes: - name: tmp emptyDir: {} +--- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-nginx + labels: + helm.sh/chart: chatqna-1.0.0 + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: chatqna-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + template: + metadata: + labels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: chatqna-nginx-config + name: nginx-config-volume diff --git a/ChatQnA/kubernetes/manifests/gaudi/chatqna.yaml b/ChatQnA/kubernetes/manifests/gaudi/chatqna.yaml index b45118c0b..882e81435 100644 --- a/ChatQnA/kubernetes/manifests/gaudi/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/gaudi/chatqna.yaml @@ -1,4 +1,31 @@ --- +# Source: chatqna/charts/chatqna-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: chatqna-chatqna-ui-config + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/chatqna" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/chatqna" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/chatqna" + DOC_BASE_URL: "/v1/chatqna" + BASIC_URL: "/v1/chatqna" + VITE_CODE_GEN_URL: "/v1/chatqna" + VITE_DOC_SUM_URL: "/v1/chatqna" +--- # Source: chatqna/charts/data-prep/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -195,6 +222,92 @@ data: MAX_INPUT_LENGTH: "1024" MAX_TOTAL_TOKENS: "2048" --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://chatqna-chatqna-ui:5174; + 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: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-data-prep: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-data-prep: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-data-prep: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; + } + } + +kind: ConfigMap +metadata: + name: chatqna-nginx-config +--- +# Source: chatqna/charts/chatqna-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna +--- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -424,6 +537,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: chatqna-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + type: NodePort +--- # Source: chatqna/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -448,6 +577,60 @@ spec: selector: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna +--- +# Source: chatqna/charts/chatqna-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + template: + metadata: + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: chatqna-ui + envFrom: + - configMapRef: + name: chatqna-chatqna-ui-config + securityContext: + {} + image: "opea/chatqna-conversation-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 80 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: chatqna/charts/data-prep/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -1189,17 +1372,20 @@ metadata: app.kubernetes.io/instance: chatqna app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: chatqna spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna template: metadata: labels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna spec: securityContext: null @@ -1235,24 +1421,80 @@ spec: - name: chatqna containerPort: 8888 protocol: TCP - # startupProbe: - # httpGet: - # host: chatqna-llm-uservice - # port: 9000 - # path: / - # initialDelaySeconds: 5 - # periodSeconds: 5 - # failureThreshold: 120 - # livenessProbe: - # httpGet: - # path: / - # port: 8888 - # readinessProbe: - # httpGet: - # path: / - # port: 8888 resources: null volumes: - name: tmp emptyDir: {} +--- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-nginx + labels: + helm.sh/chart: chatqna-1.0.0 + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: chatqna-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + template: + metadata: + labels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: chatqna-nginx-config + name: nginx-config-volume +--- +# Source: chatqna/charts/tei/templates/horizontalPodAutoscaler.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +--- +# Source: chatqna/charts/tei/templates/servicemonitor.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +--- +# Source: chatqna/charts/teirerank/templates/horizontalPodAutoscaler.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +--- +# Source: chatqna/charts/teirerank/templates/servicemonitor.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +--- +# Source: chatqna/charts/tgi/templates/horizontalPorAutoscaler.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +--- +# Source: chatqna/charts/tgi/templates/servicemonitor.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 +# +# Dashboard for the exposed TGI metrics: +# - https://grafana.com/grafana/dashboards/19831-text-generation-inference-dashboard/ +# Metric descriptions: +# - https://github.com/huggingface/text-generation-inference/discussions/1127#discussioncomment-7240527 +--- +# Source: chatqna/templates/customMetrics.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna-guardrails.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna-guardrails.yaml index 87353f4cd..e6713b360 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna-guardrails.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna-guardrails.yaml @@ -1,4 +1,31 @@ --- +# Source: chatqna/charts/chatqna-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: chatqna-chatqna-ui-config + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/chatqna" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/chatqna" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/chatqna" + DOC_BASE_URL: "/v1/chatqna" + BASIC_URL: "/v1/chatqna" + VITE_CODE_GEN_URL: "/v1/chatqna" + VITE_DOC_SUM_URL: "/v1/chatqna" +--- # Source: chatqna/charts/data-prep/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -244,6 +271,92 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://chatqna-chatqna-ui:5174; + 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: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-data-prep: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-data-prep: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-data-prep: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; + } + } + +kind: ConfigMap +metadata: + name: chatqna-nginx-config +--- +# Source: chatqna/charts/chatqna-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna +--- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -523,6 +636,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: chatqna-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + type: NodePort +--- # Source: chatqna/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -547,6 +676,60 @@ spec: selector: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna +--- +# Source: chatqna/charts/chatqna-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + template: + metadata: + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: chatqna-ui + envFrom: + - configMapRef: + name: chatqna-chatqna-ui-config + securityContext: + {} + image: "opea/chatqna-conversation-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 80 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: chatqna/charts/data-prep/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -1444,17 +1627,20 @@ metadata: app.kubernetes.io/instance: chatqna app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: chatqna spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna template: metadata: labels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna spec: securityContext: null @@ -1490,24 +1676,47 @@ spec: - name: chatqna containerPort: 8888 protocol: TCP - # startupProbe: - # httpGet: - # host: chatqna-llm-uservice - # port: 9000 - # path: / - # initialDelaySeconds: 5 - # periodSeconds: 5 - # failureThreshold: 120 - # livenessProbe: - # httpGet: - # path: / - # port: 8888 - # readinessProbe: - # httpGet: - # path: / - # port: 8888 resources: null volumes: - name: tmp emptyDir: {} +--- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: chatqna-nginx + labels: + helm.sh/chart: chatqna-1.0.0 + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: chatqna-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + template: + metadata: + labels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: chatqna-nginx-config + name: nginx-config-volume diff --git a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml index 95fb52a97..271da2bb9 100644 --- a/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml +++ b/ChatQnA/kubernetes/manifests/xeon/chatqna.yaml @@ -1,69 +1,30 @@ --- -# Source: chatqna/charts/data-prep/templates/configmap.yaml +# Source: chatqna/charts/chatqna-ui/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 apiVersion: v1 kind: ConfigMap metadata: - name: chatqna-nginx-config + name: chatqna-chatqna-ui-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" + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm data: - default.conf: | - server { - listen 80; - listen [::]:80; - - location /home { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location / { - proxy_pass http://chatqna-ui: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: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-data-prep: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-data-prep: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-data-prep: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; - } - } + APP_BACKEND_SERVICE_ENDPOINT: "/v1/chatqna" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/chatqna" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/chatqna" + DOC_BASE_URL: "/v1/chatqna" + BASIC_URL: "/v1/chatqna" + VITE_CODE_GEN_URL: "/v1/chatqna" + VITE_DOC_SUM_URL: "/v1/chatqna" --- # Source: chatqna/charts/data-prep/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation @@ -260,6 +221,92 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://chatqna-chatqna-ui:5174; + 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: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-data-prep: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-data-prep: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-data-prep: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; + } + } + +kind: ConfigMap +metadata: + name: chatqna-nginx-config +--- +# Source: chatqna/charts/chatqna-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: chatqna-chatqna-ui + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna +--- # Source: chatqna/charts/data-prep/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -489,6 +536,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: chatqna --- +# Source: chatqna/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: chatqna-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app: chatqna-nginx + type: NodePort +--- # Source: chatqna/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -513,31 +576,60 @@ spec: selector: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna --- -# Source: chatqna/templates/service.yaml +# Source: chatqna/charts/chatqna-ui/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -apiVersion: v1 -kind: Service +apiVersion: apps/v1 +kind: Deployment metadata: - name: chatqna-ui + name: chatqna-chatqna-ui labels: - helm.sh/chart: chatqna-ui-0.8.0 + helm.sh/chart: chatqna-ui-1.0.0 app.kubernetes.io/name: chatqna-ui - app.kubernetes.io/instance: chatqna-ui - app.kubernetes.io/version: "v0.8" + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm spec: - type: ClusterIP - ports: - - port: 5173 - targetPort: 5173 - protocol: TCP - name: chatqna-ui + replicas: 1 selector: - app.kubernetes.io/name: chatqna-ui - app.kubernetes.io/instance: chatqna-ui + matchLabels: + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + template: + metadata: + labels: + helm.sh/chart: chatqna-ui-1.0.0 + app.kubernetes.io/name: chatqna-ui + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: chatqna-ui + envFrom: + - configMapRef: + name: chatqna-chatqna-ui-config + securityContext: + {} + image: "opea/chatqna-conversation-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 80 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: chatqna/charts/data-prep/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -1005,49 +1097,6 @@ spec: # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 -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: - 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: - {} - hostIPC: true - containers: - - name: chatqna-ui - securityContext: - {} - image: "opea/chatqna-ui:latest" - imagePullPolicy: IfNotPresent - args: null - ports: - - name: http - containerPort: 5173 - protocol: TCP ---- -# Source: chatqna/charts/tei/templates/deployment.yaml -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - apiVersion: apps/v1 kind: Deployment metadata: @@ -1320,17 +1369,20 @@ metadata: app.kubernetes.io/instance: chatqna app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: chatqna spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna template: metadata: labels: app.kubernetes.io/name: chatqna app.kubernetes.io/instance: chatqna + app: chatqna spec: securityContext: null @@ -1366,81 +1418,47 @@ spec: - name: chatqna containerPort: 8888 protocol: TCP - # startupProbe: - # httpGet: - # host: chatqna-llm-uservice - # port: 9000 - # path: / - # initialDelaySeconds: 5 - # periodSeconds: 5 - # failureThreshold: 120 - # livenessProbe: - # httpGet: - # path: / - # port: 8888 - # readinessProbe: - # httpGet: - # path: / - # port: 8888 resources: null volumes: - name: tmp emptyDir: {} --- -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - +# Source: chatqna/templates/nginx-deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: - name: chatqna-nginx-deployment + name: chatqna-nginx 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" + helm.sh/chart: chatqna-1.0.0 + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna + app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: chatqna-nginx spec: - replicas: 1 selector: matchLabels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna app: chatqna-nginx template: metadata: labels: + app.kubernetes.io/name: chatqna + app.kubernetes.io/instance: chatqna app: chatqna-nginx spec: containers: - - name: chatqna-nginx - image: nginx:latest - ports: - - containerPort: 80 + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx volumeMounts: - - name: nginx-config-volume - mountPath: /etc/nginx/conf.d/default.conf - subPath: default.conf + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} volumes: - - name: nginx-config-volume - configMap: + - configMap: + defaultMode: 420 name: chatqna-nginx-config ---- -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 - ports: - - protocol: TCP - port: 80 - targetPort: 80 - nodePort: 30789 - type: NodePort + name: nginx-config-volume diff --git a/CodeGen/kubernetes/manifests/gaudi/codegen.yaml b/CodeGen/kubernetes/manifests/gaudi/codegen.yaml index c1270f418..359ce24e6 100644 --- a/CodeGen/kubernetes/manifests/gaudi/codegen.yaml +++ b/CodeGen/kubernetes/manifests/gaudi/codegen.yaml @@ -1,4 +1,31 @@ --- +# Source: codegen/charts/codegen-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: codegen-codegen-ui-config + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/codegen" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/codegen" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/codegen" + DOC_BASE_URL: "/v1/codegen" + BASIC_URL: "/v1/codegen" + VITE_CODE_GEN_URL: "/v1/codegen" + VITE_DOC_SUM_URL: "/v1/codegen" +--- # Source: codegen/charts/llm-uservice/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -49,6 +76,68 @@ data: MAX_INPUT_LENGTH: "1024" MAX_TOTAL_TOKENS: "2048" --- +# Source: codegen/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://codegen-codegen-ui:5174; + 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/codegen { + proxy_pass http://codegen:7778; + 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; + } + } + +kind: ConfigMap +metadata: + name: codegen-nginx-config +--- +# Source: codegen/charts/codegen-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: codegen-codegen-ui + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen +--- # Source: codegen/charts/llm-uservice/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -99,6 +188,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: codegen --- +# Source: codegen/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: codegen-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app: codegen-nginx + type: NodePort +--- # Source: codegen/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -123,6 +228,60 @@ spec: selector: app.kubernetes.io/name: codegen app.kubernetes.io/instance: codegen + app: codegen +--- +# Source: codegen/charts/codegen-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: codegen-codegen-ui + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + template: + metadata: + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: codegen-ui + envFrom: + - configMapRef: + name: codegen-codegen-ui-config + securityContext: + {} + image: "opea/codegen-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 5173 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: codegen/charts/llm-uservice/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -299,17 +458,20 @@ metadata: app.kubernetes.io/instance: codegen app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: codegen spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: codegen app.kubernetes.io/instance: codegen + app: codegen template: metadata: labels: app.kubernetes.io/name: codegen app.kubernetes.io/instance: codegen + app: codegen spec: securityContext: null @@ -339,24 +501,47 @@ spec: - name: codegen containerPort: 7778 protocol: TCP - # startupProbe: - # httpGet: - # host: codegen-llm-uservice - # port: 9000 - # path: / - # initialDelaySeconds: 5 - # periodSeconds: 5 - # failureThreshold: 120 - # livenessProbe: - # httpGet: - # path: / - # port: 7778 - # readinessProbe: - # httpGet: - # path: / - # port: 7778 resources: null volumes: - name: tmp emptyDir: {} +--- +# Source: codegen/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: codegen-nginx + labels: + helm.sh/chart: codegen-1.0.0 + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: codegen-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app: codegen-nginx + template: + metadata: + labels: + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app: codegen-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: codegen-nginx-config + name: nginx-config-volume diff --git a/CodeGen/kubernetes/manifests/xeon/codegen.yaml b/CodeGen/kubernetes/manifests/xeon/codegen.yaml index 9bfd0ed41..96cc68266 100644 --- a/CodeGen/kubernetes/manifests/xeon/codegen.yaml +++ b/CodeGen/kubernetes/manifests/xeon/codegen.yaml @@ -1,4 +1,31 @@ --- +# Source: codegen/charts/codegen-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: codegen-codegen-ui-config + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/codegen" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/codegen" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/codegen" + DOC_BASE_URL: "/v1/codegen" + BASIC_URL: "/v1/codegen" + VITE_CODE_GEN_URL: "/v1/codegen" + VITE_DOC_SUM_URL: "/v1/codegen" +--- # Source: codegen/charts/llm-uservice/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -48,6 +75,68 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- +# Source: codegen/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://codegen-codegen-ui:5174; + 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/codegen { + proxy_pass http://codegen:7778; + 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; + } + } + +kind: ConfigMap +metadata: + name: codegen-nginx-config +--- +# Source: codegen/charts/codegen-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: codegen-codegen-ui + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen +--- # Source: codegen/charts/llm-uservice/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -98,6 +187,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: codegen --- +# Source: codegen/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: codegen-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app: codegen-nginx + type: NodePort +--- # Source: codegen/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -122,6 +227,60 @@ spec: selector: app.kubernetes.io/name: codegen app.kubernetes.io/instance: codegen + app: codegen +--- +# Source: codegen/charts/codegen-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: codegen-codegen-ui + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + template: + metadata: + labels: + helm.sh/chart: codegen-ui-1.0.0 + app.kubernetes.io/name: codegen-ui + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: codegen-ui + envFrom: + - configMapRef: + name: codegen-codegen-ui-config + securityContext: + {} + image: "opea/codegen-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 5173 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: codegen/charts/llm-uservice/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -295,17 +454,20 @@ metadata: app.kubernetes.io/instance: codegen app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: codegen spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: codegen app.kubernetes.io/instance: codegen + app: codegen template: metadata: labels: app.kubernetes.io/name: codegen app.kubernetes.io/instance: codegen + app: codegen spec: securityContext: null @@ -335,24 +497,47 @@ spec: - name: codegen containerPort: 7778 protocol: TCP - # startupProbe: - # httpGet: - # host: codegen-llm-uservice - # port: 9000 - # path: / - # initialDelaySeconds: 5 - # periodSeconds: 5 - # failureThreshold: 120 - # livenessProbe: - # httpGet: - # path: / - # port: 7778 - # readinessProbe: - # httpGet: - # path: / - # port: 7778 resources: null volumes: - name: tmp emptyDir: {} +--- +# Source: codegen/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: codegen-nginx + labels: + helm.sh/chart: codegen-1.0.0 + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: codegen-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app: codegen-nginx + template: + metadata: + labels: + app.kubernetes.io/name: codegen + app.kubernetes.io/instance: codegen + app: codegen-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: codegen-nginx-config + name: nginx-config-volume diff --git a/CodeGen/tests/test_manifest_on_gaudi.sh b/CodeGen/tests/test_manifest_on_gaudi.sh index c251768b7..80464069e 100755 --- a/CodeGen/tests/test_manifest_on_gaudi.sh +++ b/CodeGen/tests/test_manifest_on_gaudi.sh @@ -28,7 +28,7 @@ function init_codegen() { function install_codegen { echo "namespace is $NAMESPACE" - kubectl apply -f . -n $NAMESPACE + kubectl apply -f codegen.yaml -n $NAMESPACE } function validate_codegen() { diff --git a/CodeGen/tests/test_manifest_on_xeon.sh b/CodeGen/tests/test_manifest_on_xeon.sh index 0292305f1..c18c108fd 100755 --- a/CodeGen/tests/test_manifest_on_xeon.sh +++ b/CodeGen/tests/test_manifest_on_xeon.sh @@ -28,7 +28,7 @@ function init_codegen() { function install_codegen { echo "namespace is $NAMESPACE" - kubectl apply -f . -n $NAMESPACE + kubectl apply -f codegen.yaml -n $NAMESPACE } function validate_codegen() { diff --git a/CodeTrans/kubernetes/manifests/gaudi/codetrans.yaml b/CodeTrans/kubernetes/manifests/gaudi/codetrans.yaml index 5f03c40a5..9f07b22a7 100644 --- a/CodeTrans/kubernetes/manifests/gaudi/codetrans.yaml +++ b/CodeTrans/kubernetes/manifests/gaudi/codetrans.yaml @@ -1,4 +1,31 @@ --- +# Source: codetrans/charts/codetrans-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: codetrans-codetrans-ui-config + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/codetrans" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/codetrans" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/codetrans" + DOC_BASE_URL: "/v1/codetrans" + BASIC_URL: "/v1/codetrans" + VITE_CODE_GEN_URL: "/v1/codetrans" + VITE_DOC_SUM_URL: "/v1/codetrans" +--- # Source: codetrans/charts/llm-uservice/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -49,6 +76,68 @@ data: MAX_INPUT_LENGTH: "1024" MAX_TOTAL_TOKENS: "2048" --- +# Source: codetrans/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://codetrans-codetrans-ui:5174; + 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/codetrans { + proxy_pass http://codetrans:7777; + 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; + } + } + +kind: ConfigMap +metadata: + name: codetrans-nginx-config +--- +# Source: codetrans/charts/codetrans-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: codetrans-codetrans-ui + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans +--- # Source: codetrans/charts/llm-uservice/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -99,6 +188,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: codetrans --- +# Source: codetrans/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: codetrans-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app: codetrans-nginx + type: NodePort +--- # Source: codetrans/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -123,6 +228,60 @@ spec: selector: app.kubernetes.io/name: codetrans app.kubernetes.io/instance: codetrans + app: codetrans +--- +# Source: codetrans/charts/codetrans-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: codetrans-codetrans-ui + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + template: + metadata: + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: codetrans-ui + envFrom: + - configMapRef: + name: codetrans-codetrans-ui-config + securityContext: + {} + image: "opea/codetrans-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 5173 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: codetrans/charts/llm-uservice/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -297,17 +456,20 @@ metadata: app.kubernetes.io/instance: codetrans app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: codetrans spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: codetrans app.kubernetes.io/instance: codetrans + app: codetrans template: metadata: labels: app.kubernetes.io/name: codetrans app.kubernetes.io/instance: codetrans + app: codetrans spec: securityContext: null @@ -343,74 +505,41 @@ spec: - name: tmp emptyDir: {} --- -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: v1 -kind: ConfigMap -metadata: - name: codetrans-nginx-config -data: - default.conf: | - server { - listen 80; - listen [::]:80; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location /v1/codetrans { - proxy_pass http://codetrans:7777; - 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; - } - } ---- -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - +# Source: codetrans/templates/nginx-deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: - name: codetrans-nginx-deployment + name: codetrans-nginx + labels: + helm.sh/chart: codetrans-1.0.0 + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: codetrans-nginx spec: - replicas: 1 selector: matchLabels: - app: nginx + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app: codetrans-nginx template: metadata: labels: - app: nginx + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app: codetrans-nginx spec: containers: - - name: nginx - image: nginx:latest - ports: - - containerPort: 80 + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx volumeMounts: - - name: nginx-config-volume - mountPath: /etc/nginx/conf.d/default.conf - subPath: default.conf + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} volumes: - - name: nginx-config-volume - configMap: + - configMap: + defaultMode: 420 name: codetrans-nginx-config ---- -kind: Service -apiVersion: v1 -metadata: - name: nginx-svc -spec: - selector: - app: nginx - ports: - - protocol: TCP - port: 80 - targetPort: 80 - nodePort: 30789 - type: NodePort + name: nginx-config-volume diff --git a/CodeTrans/kubernetes/manifests/xeon/codetrans.yaml b/CodeTrans/kubernetes/manifests/xeon/codetrans.yaml index 7cc99aaa8..a68768e2f 100644 --- a/CodeTrans/kubernetes/manifests/xeon/codetrans.yaml +++ b/CodeTrans/kubernetes/manifests/xeon/codetrans.yaml @@ -1,4 +1,31 @@ --- +# Source: codetrans/charts/codetrans-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: codetrans-codetrans-ui-config + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/codetrans" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/codetrans" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/codetrans" + DOC_BASE_URL: "/v1/codetrans" + BASIC_URL: "/v1/codetrans" + VITE_CODE_GEN_URL: "/v1/codetrans" + VITE_DOC_SUM_URL: "/v1/codetrans" +--- # Source: codetrans/charts/llm-uservice/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -48,6 +75,68 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- +# Source: codetrans/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://codetrans-codetrans-ui:5174; + 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/codetrans { + proxy_pass http://codetrans:7777; + 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; + } + } + +kind: ConfigMap +metadata: + name: codetrans-nginx-config +--- +# Source: codetrans/charts/codetrans-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: codetrans-codetrans-ui + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans +--- # Source: codetrans/charts/llm-uservice/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -98,6 +187,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: codetrans --- +# Source: codetrans/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: codetrans-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app: codetrans-nginx + type: NodePort +--- # Source: codetrans/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -122,6 +227,60 @@ spec: selector: app.kubernetes.io/name: codetrans app.kubernetes.io/instance: codetrans + app: codetrans +--- +# Source: codetrans/charts/codetrans-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: codetrans-codetrans-ui + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + template: + metadata: + labels: + helm.sh/chart: codetrans-ui-1.0.0 + app.kubernetes.io/name: codetrans-ui + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: codetrans-ui + envFrom: + - configMapRef: + name: codetrans-codetrans-ui-config + securityContext: + {} + image: "opea/codetrans-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 5173 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: codetrans/charts/llm-uservice/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -295,17 +454,20 @@ metadata: app.kubernetes.io/instance: codetrans app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: codetrans spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: codetrans app.kubernetes.io/instance: codetrans + app: codetrans template: metadata: labels: app.kubernetes.io/name: codetrans app.kubernetes.io/instance: codetrans + app: codetrans spec: securityContext: null @@ -341,74 +503,41 @@ spec: - name: tmp emptyDir: {} --- -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - -apiVersion: v1 -kind: ConfigMap -metadata: - name: codetrans-nginx-config -data: - default.conf: | - server { - listen 80; - listen [::]:80; - - location / { - root /usr/share/nginx/html; - index index.html index.htm; - } - - location /v1/codetrans { - proxy_pass http://codetrans:7777; - 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; - } - } ---- -# Copyright (C) 2024 Intel Corporation -# SPDX-License-Identifier: Apache-2.0 - +# Source: codetrans/templates/nginx-deployment.yaml apiVersion: apps/v1 kind: Deployment metadata: - name: codetrans-nginx-deployment + name: codetrans-nginx + labels: + helm.sh/chart: codetrans-1.0.0 + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: codetrans-nginx spec: - replicas: 1 selector: matchLabels: - app: nginx + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app: codetrans-nginx template: metadata: labels: - app: nginx + app.kubernetes.io/name: codetrans + app.kubernetes.io/instance: codetrans + app: codetrans-nginx spec: containers: - - name: nginx - image: nginx:latest - ports: - - containerPort: 80 + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx volumeMounts: - - name: nginx-config-volume - mountPath: /etc/nginx/conf.d/default.conf - subPath: default.conf + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} volumes: - - name: nginx-config-volume - configMap: + - configMap: + defaultMode: 420 name: codetrans-nginx-config ---- -kind: Service -apiVersion: v1 -metadata: - name: nginx-svc -spec: - selector: - app: nginx - ports: - - protocol: TCP - port: 80 - targetPort: 80 - nodePort: 30789 - type: NodePort + name: nginx-config-volume diff --git a/CodeTrans/tests/test_manifest_on_gaudi.sh b/CodeTrans/tests/test_manifest_on_gaudi.sh index e4bbafe77..418e2bf94 100755 --- a/CodeTrans/tests/test_manifest_on_gaudi.sh +++ b/CodeTrans/tests/test_manifest_on_gaudi.sh @@ -28,7 +28,7 @@ function init_codetrans() { function install_codetrans { echo "namespace is $NAMESPACE" - kubectl apply -f . -n $NAMESPACE + kubectl apply -f codetrans.yaml -n $NAMESPACE } function validate_codetrans() { diff --git a/CodeTrans/tests/test_manifest_on_xeon.sh b/CodeTrans/tests/test_manifest_on_xeon.sh index 290686d95..7e5b0a891 100755 --- a/CodeTrans/tests/test_manifest_on_xeon.sh +++ b/CodeTrans/tests/test_manifest_on_xeon.sh @@ -28,7 +28,7 @@ function init_codetrans() { function install_codetrans { echo "namespace is $NAMESPACE" - kubectl apply -f . -n $NAMESPACE + kubectl apply -f codetrans.yaml -n $NAMESPACE } function validate_codetrans() { diff --git a/DocSum/kubernetes/manifests/gaudi/docsum.yaml b/DocSum/kubernetes/manifests/gaudi/docsum.yaml index c4d3d01da..15bf181e1 100644 --- a/DocSum/kubernetes/manifests/gaudi/docsum.yaml +++ b/DocSum/kubernetes/manifests/gaudi/docsum.yaml @@ -1,4 +1,31 @@ --- +# Source: docsum/charts/docsum-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: docsum-docsum-ui-config + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/docsum" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/docsum" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/docsum" + DOC_BASE_URL: "/v1/docsum" + BASIC_URL: "/v1/docsum" + VITE_CODE_GEN_URL: "/v1/docsum" + VITE_DOC_SUM_URL: "/v1/docsum" +--- # Source: docsum/charts/llm-uservice/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -49,6 +76,68 @@ data: MAX_INPUT_LENGTH: "1024" MAX_TOTAL_TOKENS: "2048" --- +# Source: docsum/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://docsum-docsum-ui:5174; + 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/docsum { + proxy_pass http://docsum: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; + } + } + +kind: ConfigMap +metadata: + name: docsum-nginx-config +--- +# Source: docsum/charts/docsum-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: docsum-docsum-ui + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum +--- # Source: docsum/charts/llm-uservice/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -99,6 +188,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: docsum --- +# Source: docsum/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: docsum-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app: docsum-nginx + type: NodePort +--- # Source: docsum/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -123,6 +228,60 @@ spec: selector: app.kubernetes.io/name: docsum app.kubernetes.io/instance: docsum + app: docsum +--- +# Source: docsum/charts/docsum-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: docsum-docsum-ui + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + template: + metadata: + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: docsum-ui + envFrom: + - configMapRef: + name: docsum-docsum-ui-config + securityContext: + {} + image: "opea/docsum-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 5173 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: docsum/charts/llm-uservice/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -297,17 +456,20 @@ metadata: app.kubernetes.io/instance: docsum app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: docsum spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: docsum app.kubernetes.io/instance: docsum + app: docsum template: metadata: labels: app.kubernetes.io/name: docsum app.kubernetes.io/instance: docsum + app: docsum spec: securityContext: null @@ -342,3 +504,42 @@ spec: volumes: - name: tmp emptyDir: {} +--- +# Source: docsum/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: docsum-nginx + labels: + helm.sh/chart: docsum-1.0.0 + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: docsum-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app: docsum-nginx + template: + metadata: + labels: + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app: docsum-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: docsum-nginx-config + name: nginx-config-volume diff --git a/DocSum/kubernetes/manifests/xeon/docsum.yaml b/DocSum/kubernetes/manifests/xeon/docsum.yaml index f1a40250e..1416bdbcb 100644 --- a/DocSum/kubernetes/manifests/xeon/docsum.yaml +++ b/DocSum/kubernetes/manifests/xeon/docsum.yaml @@ -1,4 +1,31 @@ --- +# Source: docsum/charts/docsum-ui/templates/configmap.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: ConfigMap +metadata: + name: docsum-docsum-ui-config + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +data: + APP_BACKEND_SERVICE_ENDPOINT: "/v1/docsum" + APP_DATA_PREP_SERVICE_URL: "/v1/dataprep" + CHAT_BASE_URL: "/v1/docsum" + UPLOAD_FILE_BASE_URL: "/v1/dataprep" + GET_FILE: "/v1/dataprep/get_file" + DELETE_FILE: "/v1/dataprep/delete_file" + BASE_URL: "/v1/docsum" + DOC_BASE_URL: "/v1/docsum" + BASIC_URL: "/v1/docsum" + VITE_CODE_GEN_URL: "/v1/docsum" + VITE_DOC_SUM_URL: "/v1/docsum" +--- # Source: docsum/charts/llm-uservice/templates/configmap.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -48,6 +75,68 @@ data: HF_HOME: "/tmp/.cache/huggingface" CUDA_GRAPHS: "0" --- +# Source: docsum/templates/nginx-deployment.yaml +apiVersion: v1 +data: + default.conf: |+ + # Copyright (C) 2024 Intel Corporation + # SPDX-License-Identifier: Apache-2.0 + + + server { + listen 80; + listen [::]:80; + + location /home { + alias /usr/share/nginx/html/index.html; + } + + location / { + proxy_pass http://docsum-docsum-ui:5174; + 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/docsum { + proxy_pass http://docsum: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; + } + } + +kind: ConfigMap +metadata: + name: docsum-nginx-config +--- +# Source: docsum/charts/docsum-ui/templates/service.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: v1 +kind: Service +metadata: + name: docsum-docsum-ui + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + type: ClusterIP + ports: + - port: 5174 + targetPort: ui + protocol: TCP + name: ui + selector: + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum +--- # Source: docsum/charts/llm-uservice/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -98,6 +187,22 @@ spec: app.kubernetes.io/name: tgi app.kubernetes.io/instance: docsum --- +# Source: docsum/templates/nginx-deployment.yaml +apiVersion: v1 +kind: Service +metadata: + name: docsum-nginx +spec: + ports: + - port: 80 + protocol: TCP + targetPort: 80 + selector: + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app: docsum-nginx + type: NodePort +--- # Source: docsum/templates/service.yaml # Copyright (C) 2024 Intel Corporation # SPDX-License-Identifier: Apache-2.0 @@ -122,6 +227,60 @@ spec: selector: app.kubernetes.io/name: docsum app.kubernetes.io/instance: docsum + app: docsum +--- +# Source: docsum/charts/docsum-ui/templates/deployment.yaml +# Copyright (C) 2024 Intel Corporation +# SPDX-License-Identifier: Apache-2.0 + +apiVersion: apps/v1 +kind: Deployment +metadata: + name: docsum-docsum-ui + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm +spec: + replicas: 1 + selector: + matchLabels: + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + template: + metadata: + labels: + helm.sh/chart: docsum-ui-1.0.0 + app.kubernetes.io/name: docsum-ui + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + spec: + securityContext: + {} + containers: + - name: docsum-ui + envFrom: + - configMapRef: + name: docsum-docsum-ui-config + securityContext: + {} + image: "opea/docsum-ui:latest" + imagePullPolicy: IfNotPresent + ports: + - name: ui + containerPort: 5173 + protocol: TCP + resources: + {} + volumeMounts: + - mountPath: /tmp + name: tmp + volumes: + - name: tmp + emptyDir: {} --- # Source: docsum/charts/llm-uservice/templates/deployment.yaml # Copyright (C) 2024 Intel Corporation @@ -295,17 +454,20 @@ metadata: app.kubernetes.io/instance: docsum app.kubernetes.io/version: "v1.0" app.kubernetes.io/managed-by: Helm + app: docsum spec: replicas: 1 selector: matchLabels: app.kubernetes.io/name: docsum app.kubernetes.io/instance: docsum + app: docsum template: metadata: labels: app.kubernetes.io/name: docsum app.kubernetes.io/instance: docsum + app: docsum spec: securityContext: null @@ -340,3 +502,42 @@ spec: volumes: - name: tmp emptyDir: {} +--- +# Source: docsum/templates/nginx-deployment.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: docsum-nginx + labels: + helm.sh/chart: docsum-1.0.0 + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app.kubernetes.io/version: "v1.0" + app.kubernetes.io/managed-by: Helm + app: docsum-nginx +spec: + selector: + matchLabels: + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app: docsum-nginx + template: + metadata: + labels: + app.kubernetes.io/name: docsum + app.kubernetes.io/instance: docsum + app: docsum-nginx + spec: + containers: + - image: nginx:1.27.1 + imagePullPolicy: IfNotPresent + name: nginx + volumeMounts: + - mountPath: /etc/nginx/conf.d + name: nginx-config-volume + securityContext: {} + volumes: + - configMap: + defaultMode: 420 + name: docsum-nginx-config + name: nginx-config-volume diff --git a/DocSum/tests/test_manifest_on_gaudi.sh b/DocSum/tests/test_manifest_on_gaudi.sh index f58aa2c0d..95e158bbf 100755 --- a/DocSum/tests/test_manifest_on_gaudi.sh +++ b/DocSum/tests/test_manifest_on_gaudi.sh @@ -28,7 +28,7 @@ function init_docsum() { function install_docsum { echo "namespace is $NAMESPACE" - kubectl apply -f . -n $NAMESPACE + kubectl apply -f docsum.yaml -n $NAMESPACE } function validate_docsum() { diff --git a/DocSum/tests/test_manifest_on_xeon.sh b/DocSum/tests/test_manifest_on_xeon.sh index 0c7584b38..4aa720aef 100755 --- a/DocSum/tests/test_manifest_on_xeon.sh +++ b/DocSum/tests/test_manifest_on_xeon.sh @@ -28,7 +28,7 @@ function init_docsum() { function install_docsum { echo "namespace is $NAMESPACE" - kubectl apply -f . -n $NAMESPACE + kubectl apply -f docsum.yaml -n $NAMESPACE } function validate_docsum() {