From 82fbfd69a5a3e4a78975136286676831c44387d7 Mon Sep 17 00:00:00 2001 From: Andreas Fritzler Date: Sun, 8 Sep 2024 20:18:49 +0200 Subject: [PATCH] Improve `kustomization` usage Ensure that the `manifest/base` folder can be used as a standalone kustomization resource. Add a new subfolder `manifest/gpu` which uses `manifest/base` with additional GPU related patches. --- kubernetes/manifest/base/kustomization.yaml | 8 ++++++++ kubernetes/manifest/gpu/kustomization.yaml | 8 ++++++++ .../{patches => gpu}/ollama-statefulset-gpu.yaml | 0 kubernetes/manifest/kustomization.yaml | 13 ------------- 4 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 kubernetes/manifest/base/kustomization.yaml create mode 100644 kubernetes/manifest/gpu/kustomization.yaml rename kubernetes/manifest/{patches => gpu}/ollama-statefulset-gpu.yaml (100%) delete mode 100644 kubernetes/manifest/kustomization.yaml diff --git a/kubernetes/manifest/base/kustomization.yaml b/kubernetes/manifest/base/kustomization.yaml new file mode 100644 index 000000000..61500f87c --- /dev/null +++ b/kubernetes/manifest/base/kustomization.yaml @@ -0,0 +1,8 @@ +resources: + - open-webui.yaml + - ollama-service.yaml + - ollama-statefulset.yaml + - webui-deployment.yaml + - webui-service.yaml + - webui-ingress.yaml + - webui-pvc.yaml diff --git a/kubernetes/manifest/gpu/kustomization.yaml b/kubernetes/manifest/gpu/kustomization.yaml new file mode 100644 index 000000000..c0d39fbfa --- /dev/null +++ b/kubernetes/manifest/gpu/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../base + +patches: +- path: ollama-statefulset-gpu.yaml diff --git a/kubernetes/manifest/patches/ollama-statefulset-gpu.yaml b/kubernetes/manifest/gpu/ollama-statefulset-gpu.yaml similarity index 100% rename from kubernetes/manifest/patches/ollama-statefulset-gpu.yaml rename to kubernetes/manifest/gpu/ollama-statefulset-gpu.yaml diff --git a/kubernetes/manifest/kustomization.yaml b/kubernetes/manifest/kustomization.yaml deleted file mode 100644 index 907bff3e1..000000000 --- a/kubernetes/manifest/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -resources: -- base/open-webui.yaml -- base/ollama-service.yaml -- base/ollama-statefulset.yaml -- base/webui-deployment.yaml -- base/webui-service.yaml -- base/webui-ingress.yaml -- base/webui-pvc.yaml - -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -patches: -- path: patches/ollama-statefulset-gpu.yaml