From f82347ead68b986ffbe8cca255fd7cc89b7d58f8 Mon Sep 17 00:00:00 2001 From: duhow Date: Mon, 19 Feb 2024 23:22:10 +0100 Subject: [PATCH] add annotations --- kubernetes/helm/templates/ollama-service.yaml | 4 ++++ kubernetes/helm/templates/ollama-statefulset.yaml | 8 ++++++++ kubernetes/helm/templates/webui-deployment.yaml | 8 ++++++++ kubernetes/helm/templates/webui-ingress.yaml | 4 ++-- kubernetes/helm/values.yaml | 6 ++++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/kubernetes/helm/templates/ollama-service.yaml b/kubernetes/helm/templates/ollama-service.yaml index be5a6657..75d06e69 100644 --- a/kubernetes/helm/templates/ollama-service.yaml +++ b/kubernetes/helm/templates/ollama-service.yaml @@ -4,6 +4,10 @@ metadata: name: {{ include "ollama.name" . }} labels: {{- include "ollama.labels" . | nindent 4 }} + {{- with .Values.ollama.service.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: selector: {{- include "ollama.selectorLabels" . | nindent 4 }} diff --git a/kubernetes/helm/templates/ollama-statefulset.yaml b/kubernetes/helm/templates/ollama-statefulset.yaml index 38d4e8b4..da88de82 100644 --- a/kubernetes/helm/templates/ollama-statefulset.yaml +++ b/kubernetes/helm/templates/ollama-statefulset.yaml @@ -4,6 +4,10 @@ metadata: name: {{ include "ollama.name" . }} labels: {{- include "ollama.labels" . | nindent 4 }} + {{- with .Values.ollama.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: serviceName: {{ include "ollama.name" . }} replicas: {{ .Values.ollama.replicaCount }} @@ -14,6 +18,10 @@ spec: metadata: labels: {{- include "ollama.labels" . | nindent 8 }} + {{- with .Values.ollama.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} spec: containers: - name: {{ include "ollama.name" . }} diff --git a/kubernetes/helm/templates/webui-deployment.yaml b/kubernetes/helm/templates/webui-deployment.yaml index effac745..766cd188 100644 --- a/kubernetes/helm/templates/webui-deployment.yaml +++ b/kubernetes/helm/templates/webui-deployment.yaml @@ -4,6 +4,10 @@ metadata: name: {{ include "open-webui.name" . }} labels: {{- include "open-webui.labels" . | nindent 4 }} + {{- with .Values.webui.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.webui.replicaCount }} selector: @@ -13,6 +17,10 @@ spec: metadata: labels: {{- include "open-webui.labels" . | nindent 8 }} + {{- with .Values.webui.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} spec: containers: - name: {{ .Chart.Name }} diff --git a/kubernetes/helm/templates/webui-ingress.yaml b/kubernetes/helm/templates/webui-ingress.yaml index 4cb1b139..2c6b045f 100644 --- a/kubernetes/helm/templates/webui-ingress.yaml +++ b/kubernetes/helm/templates/webui-ingress.yaml @@ -5,10 +5,10 @@ metadata: name: {{ include "open-webui.name" . }} labels: {{- include "open-webui.labels" . | nindent 4 }} -{{- with .Values.webui.ingress.annotations }} + {{- with .Values.webui.ingress.annotations }} annotations: {{- toYaml . | nindent 4 }} -{{- end }} + {{- end }} spec: rules: - host: {{ .Values.webui.ingress.host }} diff --git a/kubernetes/helm/values.yaml b/kubernetes/helm/values.yaml index 41d43059..d7db1d66 100644 --- a/kubernetes/helm/values.yaml +++ b/kubernetes/helm/values.yaml @@ -1,4 +1,6 @@ ollama: + annotations: {} + podAnnotations: {} replicaCount: 1 image: repository: ollama/ollama @@ -20,6 +22,7 @@ ollama: effect: NoSchedule service: type: ClusterIP + annotations: {} port: 80 containerPort: 11434 gpu: @@ -27,6 +30,8 @@ ollama: enabled: false webui: + annotations: {} + podAnnotations: {} replicaCount: 1 image: repository: ghcr.io/open-webui/open-webui @@ -52,6 +57,7 @@ webui: tolerations: [] service: type: ClusterIP + annotations: {} port: 80 containerPort: 8080 nodePort: ""