From 528749a1b7833be97f96bc7a81708c0ea0456eb8 Mon Sep 17 00:00:00 2001 From: Alex Lebens Date: Sun, 26 Jan 2025 01:43:45 -0600 Subject: [PATCH] remove stable diffusion --- .../ollama/templates/external-secret.yaml | 32 --------- .../templates/persistent-volume-claim.yaml | 19 ----- .../platform/ollama/templates/service.yaml | 18 +++++ clusters/cl01tl/platform/ollama/values.yaml | 72 ------------------- 4 files changed, 18 insertions(+), 123 deletions(-) delete mode 100644 clusters/cl01tl/platform/ollama/templates/persistent-volume-claim.yaml diff --git a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml index 7d28d28d0..11aa2a5cc 100644 --- a/clusters/cl01tl/platform/ollama/templates/external-secret.yaml +++ b/clusters/cl01tl/platform/ollama/templates/external-secret.yaml @@ -22,38 +22,6 @@ spec: key: /cl01tl/ollama/key metadataPolicy: None property: key - - secretKey: civitai-key - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/ollama/config - metadataPolicy: None - property: civitai-key - ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: stable-diffusion-script - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: stable-diffusion-script - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: web - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - secretStoreRef: - kind: ClusterSecretStore - name: vault - data: - - secretKey: provisioning-script.sh - remoteRef: - conversionStrategy: Default - decodingStrategy: None - key: /cl01tl/ollama/config - metadataPolicy: None - property: provisioning-script.sh --- apiVersion: external-secrets.io/v1beta1 diff --git a/clusters/cl01tl/platform/ollama/templates/persistent-volume-claim.yaml b/clusters/cl01tl/platform/ollama/templates/persistent-volume-claim.yaml deleted file mode 100644 index 68394e94e..000000000 --- a/clusters/cl01tl/platform/ollama/templates/persistent-volume-claim.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: stable-diffusion-nfs-storage-models - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: stable-diffusion-nfs-storage-models - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/version: {{ .Chart.AppVersion }} - app.kubernetes.io/component: storage - app.kubernetes.io/part-of: {{ .Release.Name }} -spec: - volumeMode: Filesystem - storageClassName: nfs-client - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi diff --git a/clusters/cl01tl/platform/ollama/templates/service.yaml b/clusters/cl01tl/platform/ollama/templates/service.yaml index 0d023cb02..9ae241b10 100644 --- a/clusters/cl01tl/platform/ollama/templates/service.yaml +++ b/clusters/cl01tl/platform/ollama/templates/service.yaml @@ -14,3 +14,21 @@ metadata: spec: externalName: placeholder type: ExternalName + +--- +apiVersion: v1 +kind: Service +metadata: + name: stable-diffusion-pd05wd + namespace: {{ .Release.Namespace }} + labels: + app.kubernetes.io/name: stable-diffusion-pd05wd + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.AppVersion }} + app.kubernetes.io/component: network + app.kubernetes.io/part-of: {{ .Release.Name }} + annotations: + tailscale.com/tailnet-fqdn: stable-diffusion-pd05wd.boreal-beaufort.ts.net +spec: + externalName: placeholder + type: ExternalName diff --git a/clusters/cl01tl/platform/ollama/values.yaml b/clusters/cl01tl/platform/ollama/values.yaml index a2bdbeeaf..0c1e4bb0f 100644 --- a/clusters/cl01tl/platform/ollama/values.yaml +++ b/clusters/cl01tl/platform/ollama/values.yaml @@ -24,41 +24,6 @@ ollama: limits: cpu: 4 gpu.intel.com/i915: 1 - stable-diffusion: - type: deployment - replicas: 1 - strategy: Recreate - revisionHistoryLimit: 3 - containers: - main: - image: - repository: ghcr.io/ai-dock/stable-diffusion-webui - tag: v2-cpu-22.04 - pullPolicy: IfNotPresent - env: - - name: CIVITAI_TOKEN - valueFrom: - secretKeyRef: - name: ollama-key-secret - key: civitai-key - - name: WEBUI_ARGS - value: --api --listen --always-batch-cond-uncond --opt-split-attention --device-id=0 - - name: CF_QUICK_TUNNELS - value: false - - name: WEB_ENABLE_AUTH - value: false - - name: PORT - value: "7860" - - name: SUPERVISOR_NO_AUTOSTART - value: jupyter,syncthing - resources: - requests: - cpu: 100m - memory: 1Gi - gpu.intel.com/i915: 1 - limits: - cpu: 4 - gpu.intel.com/i915: 1 web: type: deployment replicas: 1 @@ -127,13 +92,6 @@ ollama: port: 11434 targetPort: 11434 protocol: HTTP - stable-diffusion: - controller: stable-diffusion - ports: - http: - port: 7860 - targetPort: 7860 - protocol: HTTP web: controller: web ports: @@ -167,36 +125,6 @@ ollama: main: - path: /root/.ollama readOnly: false - # provisioning-script: - # enabled: true - # type: secret - # name: stable-diffusion-script - # defaultMode: 0755 - # advancedMounts: - # stable-diffusion: - # main: - # - path: /opt/ai-dock/bin/provisioning.sh - # readOnly: true - # mountPropagation: None - # subPath: provisioning-script.sh - workspace: - storageClass: ceph-block - accessMode: ReadWriteOnce - size: 50Gi - retain: true - advancedMounts: - stable-diffusion: - main: - - path: /workspace - readOnly: false - models: - type: persistentVolumeClaim - existingClaim: stable-diffusion-nfs-storage-models - advancedMounts: - stable-diffusion: - main: - - path: /opt/stable-diffusion-webui/models/Stable-diffusion - readOnly: false web-data: storageClass: ceph-block accessMode: ReadWriteOnce