Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use unified nginx helm chart #636

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use unified nginx helm chart #636

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions helm-charts/audioqna/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,8 @@ dependencies:
version: 0-latest
repository: "file://../common/ui"
alias: audioqna-ui
- name: nginx
version: 0-latest
repository: "file://../common/nginx"
version: 0-latest
appVersion: "1.1"
107 changes: 0 additions & 107 deletions helm-charts/audioqna/templates/nginx-deployment.yaml
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions helm-charts/audioqna/templates/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-nginx-config
labels:
{{- include "audioqna.labels" . | nindent 4 }}
data:
FRONTEND_SERVICE_IP: {{ include "ui.fullname" (index .Subcharts "audioqna-ui") | quote }}
FRONTEND_SERVICE_PORT: {{ index .Values "audioqna-ui" "service" "port" | quote }}
BACKEND_SERVICE_NAME: audioqna
BACKEND_SERVICE_IP: {{ include "audioqna.fullname" . | quote }}
BACKEND_SERVICE_PORT: {{ .Values.service.port | quote }}
8 changes: 4 additions & 4 deletions helm-charts/audioqna/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ service:
type: ClusterIP
port: 3008

nginx:
service:
type: NodePort

nodeSelector: {}

tolerations: []
Expand All @@ -64,6 +60,10 @@ affinity: {}
tgi:
LLM_MODEL_ID: Intel/neural-chat-7b-v3-3

nginx:
service:
type: NodePort

audioqna-ui:
image:
repository: opea/audioqna-ui
Expand Down
3 changes: 3 additions & 0 deletions helm-charts/chatqna/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,8 @@ dependencies:
alias: chatqna-ui
version: 0-latest
repository: "file://../common/ui"
- name: nginx
version: 0-latest
repository: "file://../common/nginx"
version: 0-latest
appVersion: "v1.0"
130 changes: 0 additions & 130 deletions helm-charts/chatqna/templates/nginx-deployment.yaml
View file
Open in desktop

This file was deleted.

17 changes: 17 additions & 0 deletions helm-charts/chatqna/templates/nginx.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Copyright (C) 2024 Intel Corporation
# SPDX-License-Identifier: Apache-2.0

apiVersion: v1
kind: ConfigMap
metadata:
name: {{ .Release.Name }}-nginx-config
labels:
{{- include "chatqna.labels" . | nindent 4 }}
data:
FRONTEND_SERVICE_IP: {{ include "ui.fullname" (index .Subcharts "chatqna-ui") | quote }}
FRONTEND_SERVICE_PORT: {{ index .Values "chatqna-ui" "service" "port" | quote }}
BACKEND_SERVICE_NAME: chatqna
BACKEND_SERVICE_IP: {{ include "chatqna.fullname" . | quote }}
BACKEND_SERVICE_PORT: {{ .Values.service.port | quote }}
DATAPREP_SERVICE_IP: {{ include "data-prep.fullname" (index .Subcharts "data-prep") | quote }}
DATAPREP_SERVICE_PORT: {{ index .Values "data-prep" "service" "port" | quote }}
8 changes: 4 additions & 4 deletions helm-charts/chatqna/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ service:
type: ClusterIP
port: 8888

nginx:
service:
type: NodePort

nodeSelector: {}

tolerations: []
Expand All @@ -78,6 +74,10 @@ vllm:
guardrails-usvc:
enabled: false

nginx:
service:
type: NodePort

# If you would like to switch to traditional UI image
# Uncomment the following lines
# chatqna-ui:
Expand Down
3 changes: 3 additions & 0 deletions helm-charts/codegen/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@ dependencies:
version: 0-latest
repository: "file://../common/ui"
alias: codegen-ui
- name: nginx
version: 0-latest
repository: "file://../common/nginx"
version: 0-latest
appVersion: "v1.0"
Loading
Loading