Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into refactor_folder
Browse files Browse the repository at this point in the history
  • Loading branch information
@XinyaoWa
XinyaoWa committed Sep 10, 2024
2 parents 353ecc7 + ba94e01 commit 7c13f2c
Show file tree
Hide file tree
Showing 15 changed files with 2,075 additions and 367 deletions.
241 changes: 225 additions & 16 deletions ChatQnA/kubernetes/intel/cpu/xeon/manifest/chatqna-guardrails.yaml
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Loading

0 comments on commit 7c13f2c

Please sign in to comment.