diff --git a/charts/stable/ollama/Chart.yaml b/charts/stable/ollama/Chart.yaml index 64c4831e7ff..d4cd6e34480 100644 --- a/charts/stable/ollama/Chart.yaml +++ b/charts/stable/ollama/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://hub.docker.com/r/ollama/ollama - https://ghcr.io/ollama-webui/ollama-webui type: application -version: 1.2.1 +version: 1.2.2 diff --git a/charts/stable/ollama/templates/_secrets.tpl b/charts/stable/ollama/templates/_secrets.tpl new file mode 100644 index 00000000000..f20660769f6 --- /dev/null +++ b/charts/stable/ollama/templates/_secrets.tpl @@ -0,0 +1,13 @@ +{{/* Define the secrets */}} +{{- define "ollama.secrets" -}} +{{- $secretName := (printf "%s-ollama-secrets" (include "tc.v1.common.lib.chart.names.fullname" $)) }} + +{{- $secretKey := randAlphaNum 64 -}} + + {{- with lookup "v1" "Secret" .Release.Namespace $secretName -}} + {{- $secretKey = index .data "WEBUI_SECRET_KEY" | b64dec -}} + {{- end }} +enabled: true +data: + WEBUI_SECRET_KEY: {{ $secretKey }} +{{- end -}} diff --git a/charts/stable/ollama/templates/common.yaml b/charts/stable/ollama/templates/common.yaml index b51394e00a4..d366871deb9 100644 --- a/charts/stable/ollama/templates/common.yaml +++ b/charts/stable/ollama/templates/common.yaml @@ -1 +1,11 @@ -{{ include "tc.v1.common.loader.all" . }} +{{/* Make sure all variables are set properly */}} +{{- include "tc.v1.common.loader.init" . -}} + +{{/* Render secrets for ollama */}} +{{- $secrets := include "ollama.secrets" . | fromYaml -}} +{{- if $secrets -}} + {{- $_ := set .Values.secret "ollama-secrets" $secrets -}} +{{- end -}} + +{{/* Render the templates */}} +{{- include "tc.v1.common.loader.apply" . -}} diff --git a/charts/stable/ollama/values.yaml b/charts/stable/ollama/values.yaml index 3569aa3dcc0..7ee130ff1bf 100644 --- a/charts/stable/ollama/values.yaml +++ b/charts/stable/ollama/values.yaml @@ -84,6 +84,10 @@ workload: port: "{{ .Values.service.main.ports.main.targetPort }}" env: OLLAMA_API_BASE_URL: '{{ printf "http://%v-api:%v/api" (include "tc.v1.common.lib.chart.names.fullname" $) .Values.service.api.ports.api.targetPort }}' + WEBUI_SECRET_KEY: + secretKeyRef: + name: ollama-secrets + key: WEBUI_SECRET_KEY persistence: config: