1
0
Fork 0

Compare commits

..

No commits in common. "864c871c87c622e9e0ee99501a970cdfa2a44c9c" and "c17588398518a2700696761805c2660edff19b38" have entirely different histories.

13 changed files with 23 additions and 118 deletions

View File

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

View File

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

View File

@ -1,26 +1,7 @@
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

View File

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

View File

@ -1,19 +0,0 @@
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

View File

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

View File

@ -17,7 +17,6 @@ spec:
containers:
- name: server
image: ghcr.io/open-webui/open-webui:main
tty: true
env:
- name: NAMESPACE
valueFrom:
@ -25,40 +24,10 @@ 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: 500Mi
memory: 1Gi
limits:
cpu: 500m
memory: 1Gi

View File

@ -1,28 +0,0 @@
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

View File

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

View File

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

View File

@ -1,5 +1,13 @@
model_list:
- model_name: "*"
- model_name: llama3-8b
litellm_params:
model: "ollama_chat/*"
model: ollama_chat/llama3
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

View File

@ -54,18 +54,15 @@ images:
newTag: "1.29"
- name: ollama/ollama
newTag: 0.3.3
- 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
# newTag: 0.3.3-rocm
configMapGenerator:
# - name: litellm-proxy-config
# namespace: llm
# behavior: replace
# files:
# - config.yaml=./configurations/litellm/config.yaml
- name: litellm-proxy-config
namespace: llm
behavior: replace
files:
- config.yaml=./configurations/litellm/config.yaml
# - name: home-assistant-server-config
# namespace: home-assistant
# behavior: replace

View File

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