enable openwebui oauth

kustomize/bases/home-assistant/home-assistant-deployment.yaml

@@ -26,7 +26,7 @@ spec:
             nodeSelectorTerms:
               - matchExpressions:
                   # need a zigbee receiver
-                  - key: badjnet.home/zigbee-receiver
+                  - key: badjware.dev/zigbee-receiver
                     operator: Exists
       initContainers:
         - image: busybox:1.36.1

kustomize/bases/longhorn/kustomization.yaml

@@ -12,7 +12,7 @@ commonLabels:
 configMapGenerator:
   - name: kustomize-generated-config
     literals:
-      - LONGHORN_EXTERNAL_HOST=longhorn.badjnet.home
+      - LONGHORN_EXTERNAL_HOST=longhorn.badjware.dev
 
 replacements:
   - source:

kustomize/bases/ollama/kustomization.yaml

@@ -1,7 +1,26 @@
 resources:
   - ollama-deployment.yaml
+  - ollama-ingress.yaml
 
 namePrefix: ollama-
 
 commonLabels:
   app.kubernetes.io/name: ollama
+
+configMapGenerator:
+  - name: kustomize-generated-config
+    literals:
+      - OLLAMA_EXTERNAL_HOST=ollama.badjware.dev
+      - OLLAMA_EXTERNAL_URL=http://ollama.badjware.dev
+
+replacements:
+  - source:
+      kind: ConfigMap
+      name: kustomize-generated-config
+      fieldPath: data.OLLAMA_EXTERNAL_HOST
+    targets:
+      - select:
+          kind: Ingress
+          name: server
+        fieldPaths:
+          - spec.rules.0.host

kustomize/bases/ollama/ollama-deployment.yaml

@@ -30,7 +30,9 @@ spec:
         - name: server
           image: ollama/ollama
           # image: badjware/ollama-tweak
-          # env:
+          env:
+            - name: OLLAMA_KEEP_ALIVE
+              value: 36h
             # - name: HSA_OVERRIDE_GFX_VERSION
             #   value: 10.1.0
             # - name: HSA_ENABLE_SDMA

kustomize/bases/ollama/ollama-ingress.yaml

@@ -0,0 +1,19 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: server
+  labels:
+    app.kubernetes.io/name: ollama
+    probe: blackbox-http
+spec:
+  rules:
+  - host: ${OLLAMA_EXTERNAL_HOST}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: server
+            port:
+              name: http

kustomize/bases/openwebui/kustomization.yaml

@@ -1,5 +1,6 @@
 resources:
   - openwebui-deployment.yaml
+  - openwebui-externalsecret.yaml
   - openwebui-ingress.yaml
 
 namePrefix: openwebui-

kustomize/bases/openwebui/openwebui-deployment.yaml

@@ -17,6 +17,7 @@ spec:
       containers:
         - name: server
           image: ghcr.io/open-webui/open-webui:main
+          tty: true
           env: 
             - name: NAMESPACE
               valueFrom:
@@ -24,10 +25,40 @@ spec:
                   fieldPath: metadata.namespace
             - name: OLLAMA_BASE_URL
               value: http://ollama-server.$(NAMESPACE).svc:11434
+            - name: RAG_EMBEDDING_ENGINE
+              value: ollama
+            - name: AUDIO_STT_ENGINE
+              value: openai
+            - name: ENABLE_SIGNUP
+              value: "false" 
+            - name: ENABLE_OAUTH_SIGNUP
+              value: "true" 
+            - name: OAUTH_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: server-openid-config
+                  key: oauth_client_id
+            - name: OAUTH_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: server-openid-config
+                  key: oauth_client_secret
+            - name: OPENID_PROVIDER_URL
+              valueFrom:
+                secretKeyRef:
+                  name: server-openid-config
+                  key: openid_provider_url
+            - name: OAUTH_PROVIDER_NAME
+              valueFrom:
+                secretKeyRef:
+                  name: server-openid-config
+                  key: oauth_provider_name
+            # - name: GLOBAL_LOG_LEVEL
+            #   value: DEBUG
           resources:
             requests:
               cpu: 250m
-              memory: 1Gi
+              memory: 500Mi
             limits:
               cpu: 500m
               memory: 1Gi

kustomize/bases/openwebui/openwebui-externalsecret.yaml

@@ -0,0 +1,28 @@
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: server-openid-config
+spec:
+  secretStoreRef:
+    name: aws-parameters-store
+    kind: ClusterSecretStore
+  target:
+    name: server-openid-config
+    template:
+      metadata:
+        labels:
+          app.kubernetes.io/managed-by: external-secret
+        annotations: {}
+  data:
+    - secretKey: oauth_client_id
+      remoteRef:
+        key: /k3s/prod/llm/openwebui/oauth_client_id
+    - secretKey: oauth_client_secret
+      remoteRef:
+        key: /k3s/prod/llm/openwebui/oauth_client_secret
+    - secretKey: openid_provider_url
+      remoteRef:
+        key: /k3s/prod/llm/openwebui/openid_provider_url
+    - secretKey: oauth_provider_name
+      remoteRef:
+        key: /k3s/prod/llm/openwebui/oauth_provider_name

kustomize/bases/prometheus/kustomization.yaml

@@ -24,7 +24,7 @@ secretGenerator:
 configMapGenerator:
   - name: kustomize-generated-config
     literals:
-      - PROMETHEUS_EXTERNAL_HOST=prometheus.badjnet.home
+      - PROMETHEUS_EXTERNAL_HOST=prometheus.badjware.dev
 
 replacements:
   - source:

kustomize/bases/traefik/kustomization.yaml

@@ -12,7 +12,7 @@ commonLabels:
 configMapGenerator:
   - name: kustomize-generated-config
     literals:
-      - TRAEFIK_EXTERNAL_HOST=traefik.badjnet.home
+      - TRAEFIK_EXTERNAL_HOST=traefik.badjware.dev
 
 replacements:
   - source:

kustomize/env/prod/configurations/litellm/config.yaml

@@ -1,13 +1,5 @@
 model_list:
-  - model_name: llama3-8b
+  - model_name: "*"
     litellm_params:
-      model: ollama_chat/llama3
+      model: "ollama_chat/*"
-      api_base: http://ollama-server:11434
-  - model_name: gemma2-9b
-    litellm_params:
-      model: ollama_chat/gemma2
-      api_base: http://ollama-server:11434
-  - model_name: phi3-3b
-    litellm_params:
-      model: ollama_chat/phi3:mini
       api_base: http://ollama-server:11434

kustomize/env/prod/kustomization.yaml

@@ -54,15 +54,18 @@ images:
     newTag: "1.29"
   - name: ollama/ollama
     newTag: 0.3.3
-    # newTag: 0.3.3-rocm
+  - name: ghcr.io/berriai/litellm
+    newTag: main-v1.43.1
+  - name: ghcr.io/open-webui/open-webui
+    newTag: v0.3.10 # https://github.com/open-webui/open-webui/discussions/4331
 
 
 configMapGenerator:
-  - name: litellm-proxy-config
+  # - name: litellm-proxy-config
-    namespace: llm
+  #   namespace: llm
-    behavior: replace
+  #   behavior: replace
-    files:
+  #   files:
-      - config.yaml=./configurations/litellm/config.yaml
+  #     - config.yaml=./configurations/litellm/config.yaml
 #   - name: home-assistant-server-config
 #     namespace: home-assistant
 #     behavior: replace

kustomize/overlays/llm/kustomization.yaml

@@ -1,7 +1,7 @@
 resources:
   - namespace.yaml
   - ../../bases/ollama
-  - ../../bases/litellm
+  # - ../../bases/litellm
   - ../../bases/openwebui
   - ../../bases/sillytavern