mirror of
https://github.com/danswer-ai/danswer.git
synced 2025-10-04 12:58:42 +02:00
welcome to onyx
This commit is contained in:
@@ -1,16 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Values.config.envConfigMapName }}
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
data:
|
||||
INTERNAL_URL: "http://{{ include "danswer-stack.fullname" . }}-api-service:{{ .Values.api.service.port | default 8080 }}"
|
||||
POSTGRES_HOST: {{ .Release.Name }}-postgresql
|
||||
VESPA_HOST: da-vespa-0.vespa-service
|
||||
REDIS_HOST: {{ .Release.Name }}-redis-master
|
||||
MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-inference-model-service"
|
||||
INDEXING_MODEL_SERVER_HOST: "{{ include "danswer-stack.fullname" . }}-indexing-model-service"
|
||||
{{- range $key, $value := .Values.configMap }}
|
||||
{{ $key }}: "{{ $value }}"
|
||||
{{- end }}
|
@@ -1,15 +0,0 @@
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: "{{ include "danswer-stack.fullname" . }}-test-connection"
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
annotations:
|
||||
"helm.sh/hook": test
|
||||
spec:
|
||||
containers:
|
||||
- name: wget
|
||||
image: busybox
|
||||
command: ['wget']
|
||||
args: ['{{ include "danswer-stack.fullname" . }}-webserver:{{ .Values.webserver.service.port }}']
|
||||
restartPolicy: Never
|
@@ -1,9 +1,9 @@
|
||||
apiVersion: v2
|
||||
name: danswer-stack
|
||||
name: onyx-stack
|
||||
description: A Helm chart for Kubernetes
|
||||
home: https://www.danswer.ai/
|
||||
home: https://www.onyx.app/
|
||||
sources:
|
||||
- "https://github.com/danswer-ai/danswer"
|
||||
- "https://github.com/onyx-dot-app/onyx"
|
||||
type: application
|
||||
version: 0.2.1
|
||||
appVersion: "latest"
|
||||
@@ -12,9 +12,9 @@ annotations:
|
||||
licenses: MIT
|
||||
images: |
|
||||
- name: webserver
|
||||
image: docker.io/danswer/danswer-web-server:latest
|
||||
image: docker.io/onyxdotapp/onyx-web-server:latest
|
||||
- name: background
|
||||
image: docker.io/danswer/danswer-backend:latest
|
||||
image: docker.io/onyxdotapp/onyx-backend:latest
|
||||
- name: vespa
|
||||
image: vespaengine/vespa:8.277.17
|
||||
dependencies:
|
@@ -1,7 +1,7 @@
|
||||
{{/*
|
||||
Expand the name of the chart.
|
||||
*/}}
|
||||
{{- define "danswer-stack.name" -}}
|
||||
{{- define "onyx-stack.name" -}}
|
||||
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
|
||||
@@ -10,7 +10,7 @@ Create a default fully qualified app name.
|
||||
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
|
||||
If release name contains chart name it will be used as a full name.
|
||||
*/}}
|
||||
{{- define "danswer-stack.fullname" -}}
|
||||
{{- define "onyx-stack.fullname" -}}
|
||||
{{- if .Values.fullnameOverride }}
|
||||
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
|
||||
{{- else }}
|
||||
@@ -26,16 +26,16 @@ If release name contains chart name it will be used as a full name.
|
||||
{{/*
|
||||
Create chart name and version as used by the chart label.
|
||||
*/}}
|
||||
{{- define "danswer-stack.chart" -}}
|
||||
{{- define "onyx-stack.chart" -}}
|
||||
{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Common labels
|
||||
*/}}
|
||||
{{- define "danswer-stack.labels" -}}
|
||||
helm.sh/chart: {{ include "danswer-stack.chart" . }}
|
||||
{{ include "danswer-stack.selectorLabels" . }}
|
||||
{{- define "onyx-stack.labels" -}}
|
||||
helm.sh/chart: {{ include "onyx-stack.chart" . }}
|
||||
{{ include "onyx-stack.selectorLabels" . }}
|
||||
{{- if .Chart.AppVersion }}
|
||||
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
|
||||
{{- end }}
|
||||
@@ -45,17 +45,17 @@ app.kubernetes.io/managed-by: {{ .Release.Service }}
|
||||
{{/*
|
||||
Selector labels
|
||||
*/}}
|
||||
{{- define "danswer-stack.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "danswer-stack.name" . }}
|
||||
{{- define "onyx-stack.selectorLabels" -}}
|
||||
app.kubernetes.io/name: {{ include "onyx-stack.name" . }}
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create the name of the service account to use
|
||||
*/}}
|
||||
{{- define "danswer-stack.serviceAccountName" -}}
|
||||
{{- define "onyx-stack.serviceAccountName" -}}
|
||||
{{- if .Values.serviceAccount.create }}
|
||||
{{- default (include "danswer-stack.fullname" .) .Values.serviceAccount.name }}
|
||||
{{- default (include "onyx-stack.fullname" .) .Values.serviceAccount.name }}
|
||||
{{- else }}
|
||||
{{- default "default" .Values.serviceAccount.name }}
|
||||
{{- end }}
|
||||
@@ -64,19 +64,19 @@ Create the name of the service account to use
|
||||
{{/*
|
||||
Set secret name
|
||||
*/}}
|
||||
{{- define "danswer-stack.secretName" -}}
|
||||
{{- default (default "danswer-secrets" .Values.auth.secretName) .Values.auth.existingSecret }}
|
||||
{{- define "onyx-stack.secretName" -}}
|
||||
{{- default (default "onyx-secrets" .Values.auth.secretName) .Values.auth.existingSecret }}
|
||||
{{- end }}
|
||||
|
||||
{{/*
|
||||
Create env vars from secrets
|
||||
*/}}
|
||||
{{- define "danswer-stack.envSecrets" -}}
|
||||
{{- define "onyx-stack.envSecrets" -}}
|
||||
{{- range $name, $key := .Values.auth.secretKeys }}
|
||||
- name: {{ $name | upper | replace "-" "_" | quote }}
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: {{ include "danswer-stack.secretName" $ }}
|
||||
name: {{ include "onyx-stack.secretName" $ }}
|
||||
key: {{ default $name $key }}
|
||||
{{- end }}
|
||||
{{- end }}
|
@@ -1,16 +1,16 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-api-deployment
|
||||
name: {{ include "onyx-stack.fullname" . }}-api-deployment
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
{{- if not .Values.api.autoscaling.enabled }}
|
||||
replicas: {{ .Values.api.replicaCount }}
|
||||
{{- end }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- if .Values.api.deploymentLabels }}
|
||||
{{- toYaml .Values.api.deploymentLabels | nindent 6 }}
|
||||
{{- end }}
|
||||
@@ -21,7 +21,7 @@ spec:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 8 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 8 }}
|
||||
{{- with .Values.api.podLabels }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
@@ -30,7 +30,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ include "danswer-stack.serviceAccountName" . }}
|
||||
serviceAccountName: {{ include "onyx-stack.serviceAccountName" . }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.api.podSecurityContext | nindent 8 }}
|
||||
containers:
|
||||
@@ -44,8 +44,8 @@ spec:
|
||||
- "-c"
|
||||
- |
|
||||
alembic upgrade head &&
|
||||
echo "Starting Danswer Api Server" &&
|
||||
uvicorn danswer.main:app --host 0.0.0.0 --port 8080
|
||||
echo "Starting Onyx Api Server" &&
|
||||
uvicorn onyx.main:app --host 0.0.0.0 --port 8080
|
||||
ports:
|
||||
- name: api-server-port
|
||||
containerPort: {{ .Values.api.service.port }}
|
||||
@@ -56,4 +56,4 @@ spec:
|
||||
- configMapRef:
|
||||
name: {{ .Values.config.envConfigMapName }}
|
||||
env:
|
||||
{{- include "danswer-stack.envSecrets" . | nindent 12}}
|
||||
{{- include "onyx-stack.envSecrets" . | nindent 12}}
|
@@ -2,14 +2,14 @@
|
||||
apiVersion: autoscaling/v2
|
||||
kind: HorizontalPodAutoscaler
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-api
|
||||
name: {{ include "onyx-stack.fullname" . }}-api
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
scaleTargetRef:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
name: {{ include "danswer-stack.fullname" . }}
|
||||
name: {{ include "onyx-stack.fullname" . }}
|
||||
minReplicas: {{ .Values.api.autoscaling.minReplicas }}
|
||||
maxReplicas: {{ .Values.api.autoscaling.maxReplicas }}
|
||||
metrics:
|
@@ -2,9 +2,9 @@ apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
# INTERNAL_URL env variable depends on this, don't change without changing INTERNAL_URL
|
||||
name: {{ include "danswer-stack.fullname" . }}-api-service
|
||||
name: {{ include "onyx-stack.fullname" . }}-api-service
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
{{- if .Values.api.deploymentLabels }}
|
||||
{{- toYaml .Values.api.deploymentLabels | nindent 4 }}
|
||||
{{- end }}
|
||||
@@ -16,7 +16,7 @@ spec:
|
||||
protocol: TCP
|
||||
name: api-server-port
|
||||
selector:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 4 }}
|
||||
{{- if .Values.api.deploymentLabels }}
|
||||
{{- toYaml .Values.api.deploymentLabels | nindent 4 }}
|
||||
{{- end }}
|
@@ -1,16 +1,16 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-background
|
||||
name: {{ include "onyx-stack.fullname" . }}-background
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
{{- if not .Values.background.autoscaling.enabled }}
|
||||
replicas: {{ .Values.background.replicaCount }}
|
||||
{{- end }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- if .Values.background.deploymentLabels }}
|
||||
{{- toYaml .Values.background.deploymentLabels | nindent 6 }}
|
||||
{{- end }}
|
||||
@@ -21,7 +21,7 @@ spec:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 8 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 8 }}
|
||||
{{- with .Values.background.podLabels }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
@@ -30,7 +30,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ include "danswer-stack.serviceAccountName" . }}
|
||||
serviceAccountName: {{ include "onyx-stack.serviceAccountName" . }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.background.podSecurityContext | nindent 8 }}
|
||||
containers:
|
||||
@@ -48,4 +48,4 @@ spec:
|
||||
env:
|
||||
- name: ENABLE_MULTIPASS_INDEXING
|
||||
value: "{{ .Values.background.enableMiniChunk }}"
|
||||
{{- include "danswer-stack.envSecrets" . | nindent 12}}
|
||||
{{- include "onyx-stack.envSecrets" . | nindent 12}}
|
@@ -2,14 +2,14 @@
|
||||
apiVersion: autoscaling/v2
|
||||
kind: HorizontalPodAutoscaler
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-background
|
||||
name: {{ include "onyx-stack.fullname" . }}-background
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
scaleTargetRef:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
name: {{ include "danswer-stack.fullname" . }}
|
||||
name: {{ include "onyx-stack.fullname" . }}
|
||||
minReplicas: {{ .Values.background.autoscaling.minReplicas }}
|
||||
maxReplicas: {{ .Values.background.autoscaling.maxReplicas }}
|
||||
metrics:
|
16
deployment/helm/charts/onyx/templates/configmap.yaml
Executable file
16
deployment/helm/charts/onyx/templates/configmap.yaml
Executable file
@@ -0,0 +1,16 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: {{ .Values.config.envConfigMapName }}
|
||||
labels:
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
data:
|
||||
INTERNAL_URL: "http://{{ include "onyx-stack.fullname" . }}-api-service:{{ .Values.api.service.port | default 8080 }}"
|
||||
POSTGRES_HOST: {{ .Release.Name }}-postgresql
|
||||
VESPA_HOST: da-vespa-0.vespa-service
|
||||
REDIS_HOST: {{ .Release.Name }}-redis-master
|
||||
MODEL_SERVER_HOST: "{{ include "onyx-stack.fullname" . }}-inference-model-service"
|
||||
INDEXING_MODEL_SERVER_HOST: "{{ include "onyx-stack.fullname" . }}-indexing-model-service"
|
||||
{{- range $key, $value := .Values.configMap }}
|
||||
{{ $key }}: "{{ $value }}"
|
||||
{{- end }}
|
@@ -2,7 +2,7 @@
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.secretName" . }}
|
||||
name: {{ include "onyx-stack.secretName" . }}
|
||||
type: Opaque
|
||||
stringData:
|
||||
{{- range $name, $value := .Values.auth.secrets }}
|
@@ -1,14 +1,14 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-indexing-model
|
||||
name: {{ include "onyx-stack.fullname" . }}-indexing-model
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- if .Values.indexCapability.deploymentLabels }}
|
||||
{{- toYaml .Values.indexCapability.deploymentLabels | nindent 6 }}
|
||||
{{- end }}
|
||||
@@ -19,14 +19,14 @@ spec:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 8 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 8 }}
|
||||
{{- with .Values.indexCapability.podLabels }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec:
|
||||
containers:
|
||||
- name: indexing-model-server
|
||||
image: danswer/danswer-model-server:latest
|
||||
image: onyxdotapp/onyx-model-server:latest
|
||||
imagePullPolicy: IfNotPresent
|
||||
command: [ "uvicorn", "model_server.main:app", "--host", "0.0.0.0", "--port", "9000", "--limit-concurrency", "10" ]
|
||||
ports:
|
||||
@@ -37,7 +37,7 @@ spec:
|
||||
env:
|
||||
- name: INDEXING_ONLY
|
||||
value: "{{ default "True" .Values.indexCapability.indexingOnly }}"
|
||||
{{- include "danswer-stack.envSecrets" . | nindent 10}}
|
||||
{{- include "onyx-stack.envSecrets" . | nindent 10}}
|
||||
volumeMounts:
|
||||
{{- range .Values.indexCapability.volumeMounts }}
|
||||
- name: {{ .name }}
|
@@ -1,12 +1,12 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-indexing-model-service
|
||||
name: {{ include "onyx-stack.fullname" . }}-indexing-model-service
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
selector:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 4 }}
|
||||
{{- if .Values.indexCapability.deploymentLabels }}
|
||||
{{- toYaml .Values.indexCapability.deploymentLabels | nindent 4 }}
|
||||
{{- end }}
|
@@ -1,7 +1,7 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-inference-model
|
||||
name: {{ include "onyx-stack.fullname" . }}-inference-model
|
||||
labels:
|
||||
{{- range .Values.inferenceCapability.deployment.labels }}
|
||||
{{ .key }}: {{ .value }}
|
||||
@@ -31,7 +31,7 @@ spec:
|
||||
- configMapRef:
|
||||
name: {{ .Values.config.envConfigMapName }}
|
||||
env:
|
||||
{{- include "danswer-stack.envSecrets" . | nindent 12}}
|
||||
{{- include "onyx-stack.envSecrets" . | nindent 12}}
|
||||
volumeMounts:
|
||||
{{- range .Values.inferenceCapability.deployment.volumeMounts }}
|
||||
- name: {{ .name }}
|
@@ -1,7 +1,7 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-inference-model-service
|
||||
name: {{ include "onyx-stack.fullname" . }}-inference-model-service
|
||||
spec:
|
||||
type: {{ .Values.inferenceCapability.service.type }}
|
||||
ports:
|
@@ -1,15 +1,15 @@
|
||||
apiVersion: v1
|
||||
kind: ConfigMap
|
||||
metadata:
|
||||
name: danswer-nginx-conf
|
||||
name: onyx-nginx-conf
|
||||
data:
|
||||
nginx.conf: |
|
||||
upstream api_server {
|
||||
server {{ include "danswer-stack.fullname" . }}-api-service:{{ .Values.api.service.port }} fail_timeout=0;
|
||||
server {{ include "onyx-stack.fullname" . }}-api-service:{{ .Values.api.service.port }} fail_timeout=0;
|
||||
}
|
||||
|
||||
upstream web_server {
|
||||
server {{ include "danswer-stack.fullname" . }}-webserver:{{ .Values.webserver.service.port }} fail_timeout=0;
|
||||
server {{ include "onyx-stack.fullname" . }}-webserver:{{ .Values.webserver.service.port }} fail_timeout=0;
|
||||
}
|
||||
|
||||
server {
|
@@ -2,9 +2,9 @@
|
||||
apiVersion: v1
|
||||
kind: ServiceAccount
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.serviceAccountName" . }}
|
||||
name: {{ include "onyx-stack.serviceAccountName" . }}
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
{{- with .Values.serviceAccount.annotations }}
|
||||
annotations:
|
||||
{{- toYaml . | nindent 4 }}
|
@@ -0,0 +1,15 @@
|
||||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: "{{ include "onyx-stack.fullname" . }}-test-connection"
|
||||
labels:
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
annotations:
|
||||
"helm.sh/hook": test
|
||||
spec:
|
||||
containers:
|
||||
- name: wget
|
||||
image: busybox
|
||||
command: ['wget']
|
||||
args: ['{{ include "onyx-stack.fullname" . }}-webserver:{{ .Values.webserver.service.port }}']
|
||||
restartPolicy: Never
|
@@ -1,16 +1,16 @@
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-webserver
|
||||
name: {{ include "onyx-stack.fullname" . }}-webserver
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
{{- if not .Values.webserver.autoscaling.enabled }}
|
||||
replicas: {{ .Values.webserver.replicaCount }}
|
||||
{{- end }}
|
||||
selector:
|
||||
matchLabels:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 6 }}
|
||||
{{- if .Values.webserver.deploymentLabels }}
|
||||
{{- toYaml .Values.webserver.deploymentLabels | nindent 6 }}
|
||||
{{- end }}
|
||||
@@ -21,7 +21,7 @@ spec:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 8 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 8 }}
|
||||
{{- with .Values.webserver.podLabels }}
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
@@ -30,7 +30,7 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
serviceAccountName: {{ include "danswer-stack.serviceAccountName" . }}
|
||||
serviceAccountName: {{ include "onyx-stack.serviceAccountName" . }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.webserver.podSecurityContext | nindent 8 }}
|
||||
containers:
|
||||
@@ -49,7 +49,7 @@ spec:
|
||||
- configMapRef:
|
||||
name: {{ .Values.config.envConfigMapName }}
|
||||
env:
|
||||
{{- include "danswer-stack.envSecrets" . | nindent 12}}
|
||||
{{- include "onyx-stack.envSecrets" . | nindent 12}}
|
||||
{{- with .Values.webserver.volumeMounts }}
|
||||
volumeMounts:
|
||||
{{- toYaml . | nindent 12 }}
|
@@ -2,14 +2,14 @@
|
||||
apiVersion: autoscaling/v2
|
||||
kind: HorizontalPodAutoscaler
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-webserver
|
||||
name: {{ include "onyx-stack.fullname" . }}-webserver
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
spec:
|
||||
scaleTargetRef:
|
||||
apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
name: {{ include "danswer-stack.fullname" . }}
|
||||
name: {{ include "onyx-stack.fullname" . }}
|
||||
minReplicas: {{ .Values.webserver.autoscaling.minReplicas }}
|
||||
maxReplicas: {{ .Values.webserver.autoscaling.maxReplicas }}
|
||||
metrics:
|
@@ -1,9 +1,9 @@
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: {{ include "danswer-stack.fullname" . }}-webserver
|
||||
name: {{ include "onyx-stack.fullname" . }}-webserver
|
||||
labels:
|
||||
{{- include "danswer-stack.labels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.labels" . | nindent 4 }}
|
||||
{{- if .Values.webserver.deploymentLabels }}
|
||||
{{- toYaml .Values.webserver.deploymentLabels | nindent 4 }}
|
||||
{{- end }}
|
||||
@@ -15,7 +15,7 @@ spec:
|
||||
protocol: TCP
|
||||
name: http
|
||||
selector:
|
||||
{{- include "danswer-stack.selectorLabels" . | nindent 4 }}
|
||||
{{- include "onyx-stack.selectorLabels" . | nindent 4 }}
|
||||
{{- if .Values.webserver.deploymentLabels }}
|
||||
{{- toYaml .Values.webserver.deploymentLabels | nindent 4 }}
|
||||
{{- end }}
|
@@ -1,4 +1,4 @@
|
||||
# Default values for danswer-stack.
|
||||
# Default values for onyx-stack.
|
||||
# This is a YAML-formatted file.
|
||||
# Declare variables to be passed into your templates.
|
||||
|
||||
@@ -23,10 +23,18 @@ inferenceCapability:
|
||||
- key: app
|
||||
value: inference-model-server
|
||||
image:
|
||||
repository: danswer/danswer-model-server
|
||||
repository: onyxdotapp/onyx-model-server
|
||||
tag: latest
|
||||
pullPolicy: IfNotPresent
|
||||
command: ["uvicorn", "model_server.main:app", "--host", "0.0.0.0", "--port", "9000"]
|
||||
command:
|
||||
[
|
||||
"uvicorn",
|
||||
"model_server.main:app",
|
||||
"--host",
|
||||
"0.0.0.0",
|
||||
"--port",
|
||||
"9000",
|
||||
]
|
||||
port: 9000
|
||||
volumeMounts:
|
||||
- name: inference-model-storage
|
||||
@@ -82,9 +90,9 @@ postgresql:
|
||||
size: 5Gi
|
||||
enabled: true
|
||||
auth:
|
||||
existingSecret: danswer-secrets
|
||||
existingSecret: onyx-secrets
|
||||
secretKeys:
|
||||
adminPasswordKey: postgres_password # overwriting as postgres typically expects 'postgres-password'
|
||||
adminPasswordKey: postgres_password # overwriting as postgres typically expects 'postgres-password'
|
||||
|
||||
nginx:
|
||||
containerPorts:
|
||||
@@ -95,17 +103,17 @@ nginx:
|
||||
service:
|
||||
ports:
|
||||
http: 80
|
||||
danswer: 3000
|
||||
onyx: 3000
|
||||
targetPort:
|
||||
http: http
|
||||
danswer: http
|
||||
onyx: http
|
||||
|
||||
existingServerBlockConfigmap: danswer-nginx-conf
|
||||
existingServerBlockConfigmap: onyx-nginx-conf
|
||||
|
||||
webserver:
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: danswer/danswer-web-server
|
||||
repository: onyxdotapp/onyx-web-server
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
tag: ""
|
||||
@@ -114,10 +122,12 @@ webserver:
|
||||
podAnnotations: {}
|
||||
podLabels:
|
||||
app: web-server
|
||||
podSecurityContext: {}
|
||||
podSecurityContext:
|
||||
{}
|
||||
# fsGroup: 2000
|
||||
|
||||
securityContext: {}
|
||||
securityContext:
|
||||
{}
|
||||
# capabilities:
|
||||
# drop:
|
||||
# - ALL
|
||||
@@ -168,7 +178,7 @@ webserver:
|
||||
api:
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: danswer/danswer-backend
|
||||
repository: onyxdotapp/onyx-backend
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
tag: ""
|
||||
@@ -176,13 +186,15 @@ api:
|
||||
app: api-server
|
||||
podAnnotations: {}
|
||||
podLabels:
|
||||
scope: danswer-backend
|
||||
scope: onyx-backend
|
||||
app: api-server
|
||||
|
||||
podSecurityContext: {}
|
||||
podSecurityContext:
|
||||
{}
|
||||
# fsGroup: 2000
|
||||
|
||||
securityContext: {}
|
||||
securityContext:
|
||||
{}
|
||||
# capabilities:
|
||||
# drop:
|
||||
# - ALL
|
||||
@@ -229,24 +241,25 @@ api:
|
||||
nodeSelector: {}
|
||||
tolerations: []
|
||||
|
||||
|
||||
background:
|
||||
replicaCount: 1
|
||||
image:
|
||||
repository: danswer/danswer-backend
|
||||
repository: onyxdotapp/onyx-backend
|
||||
pullPolicy: IfNotPresent
|
||||
# Overrides the image tag whose default is the chart appVersion.
|
||||
tag: latest
|
||||
podAnnotations: {}
|
||||
podLabels:
|
||||
scope: danswer-backend
|
||||
scope: onyx-backend
|
||||
app: background
|
||||
deploymentLabels:
|
||||
app: background
|
||||
podSecurityContext: {}
|
||||
podSecurityContext:
|
||||
{}
|
||||
# fsGroup: 2000
|
||||
|
||||
securityContext: {}
|
||||
securityContext:
|
||||
{}
|
||||
# capabilities:
|
||||
# drop:
|
||||
# - ALL
|
||||
@@ -299,10 +312,11 @@ vespa:
|
||||
podAnnotations: {}
|
||||
podLabels:
|
||||
app: vespa
|
||||
app.kubernetes.io/instance: danswer
|
||||
app.kubernetes.io/instance: onyx
|
||||
app.kubernetes.io/name: vespa
|
||||
|
||||
podSecurityContext: {}
|
||||
podSecurityContext:
|
||||
{}
|
||||
# fsGroup: 2000
|
||||
|
||||
securityContext:
|
||||
@@ -310,8 +324,8 @@ vespa:
|
||||
runAsUser: 0
|
||||
|
||||
resources:
|
||||
# The Vespa Helm chart specifies default resources, which are quite modest. We override
|
||||
# them here to increase chances of the chart running successfully.
|
||||
# The Vespa Helm chart specifies default resources, which are quite modest. We override
|
||||
# them here to increase chances of the chart running successfully.
|
||||
requests:
|
||||
cpu: 1500m
|
||||
memory: 4000Mi
|
||||
@@ -323,7 +337,6 @@ vespa:
|
||||
tolerations: []
|
||||
affinity: {}
|
||||
|
||||
|
||||
redis:
|
||||
enabled: true
|
||||
architecture: standalone
|
||||
@@ -345,10 +358,9 @@ redis:
|
||||
type: ClusterIP
|
||||
port: 6379
|
||||
auth:
|
||||
existingSecret: danswer-secrets
|
||||
existingSecret: onyx-secrets
|
||||
existingSecretPasswordKey: redis_password
|
||||
|
||||
|
||||
# ingress:
|
||||
# enabled: false
|
||||
# className: ""
|
||||
@@ -377,7 +389,7 @@ persistence:
|
||||
auth:
|
||||
# for storing smtp, oauth, slack, and other secrets
|
||||
# keys are lowercased version of env vars (e.g. SMTP_USER -> smtp_user)
|
||||
existingSecret: "" # danswer-secrets
|
||||
existingSecret: "" # onyx-secrets
|
||||
# optionally override the secret keys to reference in the secret
|
||||
# this is used to populate the env vars in individual deployments
|
||||
# the values here reference the keys in secrets below
|
||||
@@ -389,7 +401,7 @@ auth:
|
||||
oauth_cookie_secret: ""
|
||||
redis_password: "redis_password"
|
||||
# will be overridden by the existingSecret if set
|
||||
secretName: "danswer-secrets"
|
||||
secretName: "onyx-secrets"
|
||||
# set values as strings, they will be base64 encoded
|
||||
# this is used to populate the secrets yaml
|
||||
secrets:
|
||||
@@ -401,14 +413,14 @@ auth:
|
||||
redis_password: "password"
|
||||
|
||||
configMap:
|
||||
AUTH_TYPE: "disabled" # Change this for production uses unless Danswer is only accessible behind VPN
|
||||
SESSION_EXPIRE_TIME_SECONDS: "86400" # 1 Day Default
|
||||
VALID_EMAIL_DOMAINS: "" # Can be something like danswer.ai, as an extra double-check
|
||||
SMTP_SERVER: "" # For sending verification emails, if unspecified then defaults to 'smtp.gmail.com'
|
||||
SMTP_PORT: "" # For sending verification emails, if unspecified then defaults to '587'
|
||||
SMTP_USER: "" # 'your-email@company.com'
|
||||
AUTH_TYPE: "disabled" # Change this for production uses unless Onyx is only accessible behind VPN
|
||||
SESSION_EXPIRE_TIME_SECONDS: "86400" # 1 Day Default
|
||||
VALID_EMAIL_DOMAINS: "" # Can be something like onyx.app, as an extra double-check
|
||||
SMTP_SERVER: "" # For sending verification emails, if unspecified then defaults to 'smtp.gmail.com'
|
||||
SMTP_PORT: "" # For sending verification emails, if unspecified then defaults to '587'
|
||||
SMTP_USER: "" # 'your-email@company.com'
|
||||
# SMTP_PASS: "" # 'your-gmail-password'
|
||||
EMAIL_FROM: "" # 'your-email@company.com' SMTP_USER missing used instead
|
||||
EMAIL_FROM: "" # 'your-email@company.com' SMTP_USER missing used instead
|
||||
# Gen AI Settings
|
||||
GEN_AI_MAX_TOKENS: ""
|
||||
QA_TIMEOUT: "60"
|
||||
@@ -446,22 +458,22 @@ configMap:
|
||||
JIRA_API_VERSION: ""
|
||||
GONG_CONNECTOR_START_TIME: ""
|
||||
NOTION_CONNECTOR_ENABLE_RECURSIVE_PAGE_LOOKUP: ""
|
||||
# DanswerBot SlackBot Configs
|
||||
# OnyxBot SlackBot Configs
|
||||
DANSWER_BOT_DISABLE_DOCS_ONLY_ANSWER: ""
|
||||
DANSWER_BOT_DISPLAY_ERROR_MSGS: ""
|
||||
DANSWER_BOT_RESPOND_EVERY_CHANNEL: ""
|
||||
DANSWER_BOT_DISABLE_COT: "" # Currently unused
|
||||
DANSWER_BOT_DISABLE_COT: "" # Currently unused
|
||||
NOTIFY_SLACKBOT_NO_ANSWER: ""
|
||||
# Logging
|
||||
# Optional Telemetry, please keep it on (nothing sensitive is collected)? <3
|
||||
# https://docs.danswer.dev/more/telemetry
|
||||
# https://docs.onyx.app/more/telemetry
|
||||
DISABLE_TELEMETRY: ""
|
||||
LOG_LEVEL: ""
|
||||
LOG_ALL_MODEL_INTERACTIONS: ""
|
||||
LOG_DANSWER_MODEL_INTERACTIONS: ""
|
||||
LOG_VESPA_TIMING_INFORMATION: ""
|
||||
# Shared or Non-backend Related
|
||||
WEB_DOMAIN: "http://localhost:3000" # for web server and api server
|
||||
DOMAIN: "localhost" # for nginx
|
||||
WEB_DOMAIN: "http://localhost:3000" # for web server and api server
|
||||
DOMAIN: "localhost" # for nginx
|
||||
# Chat Configs
|
||||
HARD_DELETE_CHATS: ""
|
Reference in New Issue
Block a user