add define names

This commit is contained in:
duhow 2024-02-19 21:58:25 +01:00
parent 770c6f210c
commit cbaada1410
No known key found for this signature in database
7 changed files with 17 additions and 10 deletions

View File

@ -0,0 +1,7 @@
{{- define "open-webui.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- end -}}
{{- define "ollama.name" -}}
ollama
{{- end -}}

View File

@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: ollama-service
name: {{ include "ollama.name" . }}
spec:
type: {{ .Values.ollama.service.type }}
selector:

View File

@ -1,9 +1,9 @@
apiVersion: apps/v1
kind: StatefulSet
metadata:
name: ollama
name: {{ include "ollama.name" . }}
spec:
serviceName: "ollama"
serviceName: {{ include "ollama.name" . }}
replicas: {{ .Values.ollama.replicaCount }}
selector:
matchLabels:

View File

@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: open-webui-deployment
name: {{ include "open-webui.name" . }}
spec:
replicas: 1
selector:
@ -13,7 +13,7 @@ spec:
app: open-webui
spec:
containers:
- name: open-webui
- name: {{ .Chart.Name }}
image: {{ .Values.webui.image }}
ports:
- containerPort: 8080
@ -25,7 +25,7 @@ spec:
mountPath: /app/backend/data
env:
- name: OLLAMA_API_BASE_URL
value: "http://ollama-service.{{ .Values.namespace }}.svc.cluster.local:{{ .Values.ollama.servicePort }}/api"
value: {{ printf "http://%s.%s.svc.cluster.local:%s/api" (include "ollama.name" .) (.Release.Namespace) (.Values.ollama.servicePort) | quote }}
tty: true
{{- with .Values.webui.nodeSelector }}
nodeSelector:
@ -34,4 +34,4 @@ spec:
volumes:
- name: webui-volume
persistentVolumeClaim:
claimName: open-webui-pvc
claimName: {{ include "open-webui.name" . }}

View File

@ -2,7 +2,7 @@
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: open-webui-ingress
name: {{ include "open-webui.name" . }}
{{- if .Values.webui.ingress.annotations }}
annotations:
{{ toYaml .Values.webui.ingress.annotations | trimSuffix "\n" | indent 4 }}

View File

@ -1,7 +1,7 @@
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: open-webui-pvc
name: {{ include "open-webui.name" . }}
labels:
app: open-webui
spec:

View File

@ -1,7 +1,7 @@
apiVersion: v1
kind: Service
metadata:
name: open-webui-service
name: {{ include "open-webui.name" . }}
spec:
type: {{ .Values.webui.service.type }} # Default: NodePort # Use LoadBalancer if you're on a cloud that supports it
selector: