From d73db0bd66c44973d521c44bde35f82ddb944c7c Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 8 Jul 2024 10:38:49 -0500 Subject: [PATCH 1/3] Moving storageclasses to localhostpath until 1.8 so I can use Nvidia again. --- .../home-automation/home-assistant/ks.yaml | 2 +- .../home-automation/matter-server/ks.yaml | 2 +- .../openebs-system/kustomization.yaml | 9 +++++ .../kubernetes/openebs-system/namespace.yaml | 8 ++++ .../openebs/app/helmrelease.yaml | 32 +++++++++++++++ .../openebs/app/kustomization.yaml | 6 +++ .../openebs/cluster/kustomization.yaml | 0 .../openebs/cluster/storageclass.yaml | 0 .../openebs/cluster/volumesnapshotclass.yaml | 0 .../kubernetes/openebs-system/openebs/ks.yaml | 21 ++++++++++ kubernetes/apps/cdi/cdi/ks.yaml | 2 +- kubernetes/apps/default/maintainerr/ks.yaml | 2 +- kubernetes/apps/default/overseerr/ks.yaml | 2 +- kubernetes/apps/default/radarr/ks.yaml | 2 +- kubernetes/apps/default/sabnzbd/ks.yaml | 2 +- kubernetes/apps/default/sonarr/ks.yaml | 2 +- kubernetes/apps/default/tautulli/ks.yaml | 2 +- .../apps/home-automation/mosquitto/ks.yaml | 2 +- kubernetes/apps/kubevirt/app/ks.yaml | 2 +- .../kube-prometheus-stack/ks.yaml | 2 +- kubernetes/apps/observability/loki/ks.yaml | 2 +- kubernetes/apps/observability/thanos/ks.yaml | 2 +- .../openebs/app/helmrelease.yaml | 39 ++++++++++++++----- .../apps/openebs-system/openebs/ks.yaml | 23 ----------- .../apps/qbittorrent/qbittorrent/ks.yaml | 2 +- 25 files changed, 121 insertions(+), 47 deletions(-) create mode 100644 .archive/kubernetes/openebs-system/kustomization.yaml create mode 100644 .archive/kubernetes/openebs-system/namespace.yaml create mode 100644 .archive/kubernetes/openebs-system/openebs/app/helmrelease.yaml create mode 100644 .archive/kubernetes/openebs-system/openebs/app/kustomization.yaml rename {kubernetes/apps => .archive/kubernetes}/openebs-system/openebs/cluster/kustomization.yaml (100%) rename {kubernetes/apps => .archive/kubernetes}/openebs-system/openebs/cluster/storageclass.yaml (100%) rename {kubernetes/apps => .archive/kubernetes}/openebs-system/openebs/cluster/volumesnapshotclass.yaml (100%) create mode 100644 .archive/kubernetes/openebs-system/openebs/ks.yaml diff --git a/.archive/kubernetes/home-automation/home-assistant/ks.yaml b/.archive/kubernetes/home-automation/home-assistant/ks.yaml index 88f0877b..9aacacf9 100644 --- a/.archive/kubernetes/home-automation/home-assistant/ks.yaml +++ b/.archive/kubernetes/home-automation/home-assistant/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - - name: openebs-cluster + - name: openebs-system - name: volsync path: ./kubernetes/apps/home-automation/home-assistant/app prune: true diff --git a/.archive/kubernetes/home-automation/matter-server/ks.yaml b/.archive/kubernetes/home-automation/matter-server/ks.yaml index 99ac80f8..177b9056 100644 --- a/.archive/kubernetes/home-automation/matter-server/ks.yaml +++ b/.archive/kubernetes/home-automation/matter-server/ks.yaml @@ -11,7 +11,7 @@ spec: labels: app.kubernetes.io/name: *app dependsOn: - - name: openebs-cluster + - name: openebs-system - name: volsync path: ./kubernetes/apps/home-automation/matter-server/app prune: true diff --git a/.archive/kubernetes/openebs-system/kustomization.yaml b/.archive/kubernetes/openebs-system/kustomization.yaml new file mode 100644 index 00000000..011b5101 --- /dev/null +++ b/.archive/kubernetes/openebs-system/kustomization.yaml @@ -0,0 +1,9 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + # Pre Flux-Kustomizations + - ./namespace.yaml + # Flux-Kustomizations + - ./openebs/ks.yaml diff --git a/.archive/kubernetes/openebs-system/namespace.yaml b/.archive/kubernetes/openebs-system/namespace.yaml new file mode 100644 index 00000000..18921b50 --- /dev/null +++ b/.archive/kubernetes/openebs-system/namespace.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: openebs-system + annotations: + kustomize.toolkit.fluxcd.io/prune: disabled + volsync.backube/privileged-movers: "true" diff --git a/.archive/kubernetes/openebs-system/openebs/app/helmrelease.yaml b/.archive/kubernetes/openebs-system/openebs/app/helmrelease.yaml new file mode 100644 index 00000000..4ec773bf --- /dev/null +++ b/.archive/kubernetes/openebs-system/openebs/app/helmrelease.yaml @@ -0,0 +1,32 @@ +--- +# yaml-language-server: $schema=https://ks.hsn.dev/helm.toolkit.fluxcd.io/helmrelease_v2beta2.json +apiVersion: helm.toolkit.fluxcd.io/v2 +kind: HelmRelease +metadata: + name: openebs-zfs +spec: + interval: 30m + chart: + spec: + chart: zfs-localpv + version: 2.6.0 + sourceRef: + kind: HelmRepository + name: openebs-zfs + namespace: flux-system + install: + remediation: + retries: 3 + upgrade: + cleanupOnFail: true + remediation: + retries: 3 + uninstall: + keepHistory: false + values: + zfsNode: + encrKeysDir: /var/openebs/keys + crds: + csi: + volumeSnapshots: + enabled: false diff --git a/.archive/kubernetes/openebs-system/openebs/app/kustomization.yaml b/.archive/kubernetes/openebs-system/openebs/app/kustomization.yaml new file mode 100644 index 00000000..17cbc72b --- /dev/null +++ b/.archive/kubernetes/openebs-system/openebs/app/kustomization.yaml @@ -0,0 +1,6 @@ +--- +# yaml-language-server: $schema=https://json.schemastore.org/kustomization +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ./helmrelease.yaml diff --git a/kubernetes/apps/openebs-system/openebs/cluster/kustomization.yaml b/.archive/kubernetes/openebs-system/openebs/cluster/kustomization.yaml similarity index 100% rename from kubernetes/apps/openebs-system/openebs/cluster/kustomization.yaml rename to .archive/kubernetes/openebs-system/openebs/cluster/kustomization.yaml diff --git a/kubernetes/apps/openebs-system/openebs/cluster/storageclass.yaml b/.archive/kubernetes/openebs-system/openebs/cluster/storageclass.yaml similarity index 100% rename from kubernetes/apps/openebs-system/openebs/cluster/storageclass.yaml rename to .archive/kubernetes/openebs-system/openebs/cluster/storageclass.yaml diff --git a/kubernetes/apps/openebs-system/openebs/cluster/volumesnapshotclass.yaml b/.archive/kubernetes/openebs-system/openebs/cluster/volumesnapshotclass.yaml similarity index 100% rename from kubernetes/apps/openebs-system/openebs/cluster/volumesnapshotclass.yaml rename to .archive/kubernetes/openebs-system/openebs/cluster/volumesnapshotclass.yaml diff --git a/.archive/kubernetes/openebs-system/openebs/ks.yaml b/.archive/kubernetes/openebs-system/openebs/ks.yaml new file mode 100644 index 00000000..690b4cc0 --- /dev/null +++ b/.archive/kubernetes/openebs-system/openebs/ks.yaml @@ -0,0 +1,21 @@ +--- +# yaml-language-server: $schema=https://ks.hsn.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json +apiVersion: kustomize.toolkit.fluxcd.io/v1 +kind: Kustomization +metadata: + name: &app openebs + namespace: flux-system +spec: + targetNamespace: openebs-system + commonMetadata: + labels: + app.kubernetes.io/name: *app + path: ./kubernetes/apps/openebs-system/openebs/app + prune: true + sourceRef: + kind: GitRepository + name: homelab + wait: false + interval: 30m + retryInterval: 1m + timeout: 5m diff --git a/kubernetes/apps/cdi/cdi/ks.yaml b/kubernetes/apps/cdi/cdi/ks.yaml index 427fb92a..24be7278 100644 --- a/kubernetes/apps/cdi/cdi/ks.yaml +++ b/kubernetes/apps/cdi/cdi/ks.yaml @@ -9,7 +9,7 @@ spec: targetNamespace: cdi dependsOn: - name: kubevirt - - name: openebs-cluster + - name: openebs-system path: ./deploy prune: true sourceRef: diff --git a/kubernetes/apps/default/maintainerr/ks.yaml b/kubernetes/apps/default/maintainerr/ks.yaml index f881f422..5e2ecaf5 100644 --- a/kubernetes/apps/default/maintainerr/ks.yaml +++ b/kubernetes/apps/default/maintainerr/ks.yaml @@ -18,7 +18,7 @@ spec: name: homelab wait: false dependsOn: - - name: openebs-cluster + - name: openebs-system - name: volsync - name: external-secrets-stores postBuild: diff --git a/kubernetes/apps/default/overseerr/ks.yaml b/kubernetes/apps/default/overseerr/ks.yaml index c6c39e66..cac2e923 100644 --- a/kubernetes/apps/default/overseerr/ks.yaml +++ b/kubernetes/apps/default/overseerr/ks.yaml @@ -16,7 +16,7 @@ spec: kind: GitRepository name: homelab dependsOn: - - name: openebs-cluster + - name: openebs-system - name: volsync wait: false interval: 30m diff --git a/kubernetes/apps/default/radarr/ks.yaml b/kubernetes/apps/default/radarr/ks.yaml index b932f31b..96de2cc9 100644 --- a/kubernetes/apps/default/radarr/ks.yaml +++ b/kubernetes/apps/default/radarr/ks.yaml @@ -13,7 +13,7 @@ spec: dependsOn: - name: crunchy-postgres-operator - name: external-secrets-stores - - name: openebs-cluster + - name: openebs-system path: ./kubernetes/apps/default/radarr/app prune: true sourceRef: diff --git a/kubernetes/apps/default/sabnzbd/ks.yaml b/kubernetes/apps/default/sabnzbd/ks.yaml index dc13bc95..562ba359 100644 --- a/kubernetes/apps/default/sabnzbd/ks.yaml +++ b/kubernetes/apps/default/sabnzbd/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - - name: openebs-cluster + - name: openebs-system - name: volsync path: ./kubernetes/apps/default/sabnzbd/app prune: true diff --git a/kubernetes/apps/default/sonarr/ks.yaml b/kubernetes/apps/default/sonarr/ks.yaml index 10155c29..5a6612c4 100644 --- a/kubernetes/apps/default/sonarr/ks.yaml +++ b/kubernetes/apps/default/sonarr/ks.yaml @@ -14,7 +14,7 @@ spec: - name: crunchy-postgres-operator - name: external-secrets-stores - name: volsync - - name: openebs-cluster + - name: openebs-system path: ./kubernetes/apps/default/sonarr/app prune: true sourceRef: diff --git a/kubernetes/apps/default/tautulli/ks.yaml b/kubernetes/apps/default/tautulli/ks.yaml index c9183c20..7351042f 100644 --- a/kubernetes/apps/default/tautulli/ks.yaml +++ b/kubernetes/apps/default/tautulli/ks.yaml @@ -16,7 +16,7 @@ spec: kind: GitRepository name: homelab dependsOn: - - name: openebs-cluster + - name: openebs-system - name: volsync wait: false interval: 30m diff --git a/kubernetes/apps/home-automation/mosquitto/ks.yaml b/kubernetes/apps/home-automation/mosquitto/ks.yaml index 2272a571..e0c97b86 100644 --- a/kubernetes/apps/home-automation/mosquitto/ks.yaml +++ b/kubernetes/apps/home-automation/mosquitto/ks.yaml @@ -18,7 +18,7 @@ spec: name: homelab wait: true dependsOn: - - name: openebs-cluster + - name: openebs-system - name: volsync - name: external-secrets-stores postBuild: diff --git a/kubernetes/apps/kubevirt/app/ks.yaml b/kubernetes/apps/kubevirt/app/ks.yaml index cedfc098..379e6aab 100644 --- a/kubernetes/apps/kubevirt/app/ks.yaml +++ b/kubernetes/apps/kubevirt/app/ks.yaml @@ -8,7 +8,7 @@ metadata: spec: targetNamespace: kubevirt dependsOn: - - name: openebs-cluster + - name: openebs-system path: ./deploy prune: true sourceRef: diff --git a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml index 92d297d3..4e278c8a 100644 --- a/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - - name: openebs-cluster + - name: openebs-system - name: volsync path: ./kubernetes/apps/observability/kube-prometheus-stack/app prune: true diff --git a/kubernetes/apps/observability/loki/ks.yaml b/kubernetes/apps/observability/loki/ks.yaml index 0b2c425f..6eb29fd8 100644 --- a/kubernetes/apps/observability/loki/ks.yaml +++ b/kubernetes/apps/observability/loki/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - - name: openebs-cluster + - name: openebs-system - name: vector path: ./kubernetes/apps/observability/loki/app prune: true diff --git a/kubernetes/apps/observability/thanos/ks.yaml b/kubernetes/apps/observability/thanos/ks.yaml index ab7d5577..f51037a8 100644 --- a/kubernetes/apps/observability/thanos/ks.yaml +++ b/kubernetes/apps/observability/thanos/ks.yaml @@ -12,7 +12,7 @@ spec: app.kubernetes.io/name: *app dependsOn: - name: external-secrets-stores - - name: openebs-cluster + - name: openebs-system - name: dragonfly-operator path: ./kubernetes/apps/observability/thanos/app prune: true diff --git a/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml b/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml index 4ec773bf..e683833c 100644 --- a/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml +++ b/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml @@ -3,16 +3,16 @@ apiVersion: helm.toolkit.fluxcd.io/v2 kind: HelmRelease metadata: - name: openebs-zfs + name: openebs spec: interval: 30m chart: spec: - chart: zfs-localpv - version: 2.6.0 + chart: openebs + version: 4.0.1 sourceRef: kind: HelmRepository - name: openebs-zfs + name: openebs namespace: flux-system install: remediation: @@ -20,13 +20,34 @@ spec: upgrade: cleanupOnFail: true remediation: + strategy: rollback retries: 3 - uninstall: - keepHistory: false values: - zfsNode: - encrKeysDir: /var/openebs/keys - crds: + localpv-provisioner: + localpv: + image: + registry: quay.io/ + repository: openebs/provisioner-localpv + hostpathClass: + name: openebs-hostpath + isDefaultClass: true + openebs-crds: csi: volumeSnapshots: enabled: false + keep: false + zfs-localpv: + enabled: false + lvm-localpv: + enabled: false + mayastor: + enabled: false + engines: + local: + lvm: + enabled: false + zfs: + enabled: false + replicated: + mayastor: + enabled: false diff --git a/kubernetes/apps/openebs-system/openebs/ks.yaml b/kubernetes/apps/openebs-system/openebs/ks.yaml index 88bd1a59..690b4cc0 100644 --- a/kubernetes/apps/openebs-system/openebs/ks.yaml +++ b/kubernetes/apps/openebs-system/openebs/ks.yaml @@ -19,26 +19,3 @@ spec: interval: 30m retryInterval: 1m timeout: 5m ---- -# yaml-language-server: $schema=https://ks.hsn.dev/kustomize.toolkit.fluxcd.io/kustomization_v1.json -apiVersion: kustomize.toolkit.fluxcd.io/v1 -kind: Kustomization -metadata: - name: &app openebs-cluster - namespace: flux-system -spec: - targetNamespace: openebs-system - commonMetadata: - labels: - app.kubernetes.io/name: *app - path: ./kubernetes/apps/openebs-system/openebs/cluster - dependsOn: - - name: openebs - prune: true - sourceRef: - kind: GitRepository - name: homelab - wait: false - interval: 30m - retryInterval: 1m - timeout: 5m diff --git a/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml b/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml index 73c68ec9..7cd816b0 100644 --- a/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml +++ b/kubernetes/apps/qbittorrent/qbittorrent/ks.yaml @@ -18,7 +18,7 @@ spec: name: homelab wait: true dependsOn: - - name: openebs-cluster + - name: openebs-system - name: volsync - name: external-secrets-stores postBuild: From 0daa66e00b5fafc369f178a3d2b555286c03b8b3 Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 8 Jul 2024 11:02:56 -0500 Subject: [PATCH 2/3] Archiving ZFS scrub job. --- .../kubernetes}/kube-system/zfs-scrub/app/helmrelease.yaml | 0 .../kubernetes}/kube-system/zfs-scrub/app/kustomization.yaml | 0 .../kube-system/zfs-scrub/app/resources/zfs-scrub.sh | 0 .../kubernetes}/kube-system/zfs-scrub/ks.yaml | 0 kubernetes/apps/kube-system/kustomization.yaml | 4 ++-- 5 files changed, 2 insertions(+), 2 deletions(-) rename {kubernetes/apps => .archive/kubernetes}/kube-system/zfs-scrub/app/helmrelease.yaml (100%) rename {kubernetes/apps => .archive/kubernetes}/kube-system/zfs-scrub/app/kustomization.yaml (100%) rename {kubernetes/apps => .archive/kubernetes}/kube-system/zfs-scrub/app/resources/zfs-scrub.sh (100%) rename {kubernetes/apps => .archive/kubernetes}/kube-system/zfs-scrub/ks.yaml (100%) diff --git a/kubernetes/apps/kube-system/zfs-scrub/app/helmrelease.yaml b/.archive/kubernetes/kube-system/zfs-scrub/app/helmrelease.yaml similarity index 100% rename from kubernetes/apps/kube-system/zfs-scrub/app/helmrelease.yaml rename to .archive/kubernetes/kube-system/zfs-scrub/app/helmrelease.yaml diff --git a/kubernetes/apps/kube-system/zfs-scrub/app/kustomization.yaml b/.archive/kubernetes/kube-system/zfs-scrub/app/kustomization.yaml similarity index 100% rename from kubernetes/apps/kube-system/zfs-scrub/app/kustomization.yaml rename to .archive/kubernetes/kube-system/zfs-scrub/app/kustomization.yaml diff --git a/kubernetes/apps/kube-system/zfs-scrub/app/resources/zfs-scrub.sh b/.archive/kubernetes/kube-system/zfs-scrub/app/resources/zfs-scrub.sh similarity index 100% rename from kubernetes/apps/kube-system/zfs-scrub/app/resources/zfs-scrub.sh rename to .archive/kubernetes/kube-system/zfs-scrub/app/resources/zfs-scrub.sh diff --git a/kubernetes/apps/kube-system/zfs-scrub/ks.yaml b/.archive/kubernetes/kube-system/zfs-scrub/ks.yaml similarity index 100% rename from kubernetes/apps/kube-system/zfs-scrub/ks.yaml rename to .archive/kubernetes/kube-system/zfs-scrub/ks.yaml diff --git a/kubernetes/apps/kube-system/kustomization.yaml b/kubernetes/apps/kube-system/kustomization.yaml index 7f22a3af..e9d682e2 100644 --- a/kubernetes/apps/kube-system/kustomization.yaml +++ b/kubernetes/apps/kube-system/kustomization.yaml @@ -13,8 +13,8 @@ resources: - ./kubelet-csr-approver/ks.yaml - ./metrics-server/ks.yaml - ./multus/ks.yaml - # - ./nvidia-device-plugin/ks.yaml # Until nvidia-container-plugin issues are resolved with the ZFS extension. + - ./nvidia-device-plugin/ks.yaml - ./node-feature-discovery/ks.yaml - ./reloader/ks.yaml - ./spegel/ks.yaml - - ./zfs-scrub/ks.yaml + # - ./zfs-scrub/ks.yaml # Until nvidia-container-plugin issues are resolved with the ZFS extension. From a754d3cc6061a8209018606a83fd5c7d5ea13eee Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 8 Jul 2024 11:20:49 -0500 Subject: [PATCH 3/3] storageclass zfs --> hostpath until 1.8 --- kubernetes/apps/cdi/cdi/app/nixosdv.yaml | 2 +- kubernetes/apps/cdi/cdi/app/storageprofile.yaml | 6 +++--- .../cluster/postgrescluster.yaml | 2 +- kubernetes/apps/kubevirt/app/ks.yaml | 2 +- kubernetes/apps/kubevirt/vms/fj-runner-01-disk1.yaml | 2 +- kubernetes/apps/kubevirt/vms/fj-runner-02-disk1.yaml | 2 +- .../kube-prometheus-stack/app/helmrelease.yaml | 4 ++-- .../apps/observability/loki/app/helmrelease.yaml | 4 ++-- .../apps/observability/thanos/app/helmrelease.yaml | 2 +- kubernetes/flux/repositories/helm/kustomization.yaml | 1 - kubernetes/flux/repositories/helm/openebs-zfs.yaml | 10 ---------- .../templates/postgres-database/postgresCluster.yaml | 2 +- kubernetes/templates/volsync/claim.yaml | 2 +- kubernetes/templates/volsync/minio.yaml | 12 ++++++------ kubernetes/templates/volsync/r2.yaml | 6 +++--- kubernetes/tools/kbench.yaml | 2 +- 16 files changed, 25 insertions(+), 36 deletions(-) delete mode 100644 kubernetes/flux/repositories/helm/openebs-zfs.yaml diff --git a/kubernetes/apps/cdi/cdi/app/nixosdv.yaml b/kubernetes/apps/cdi/cdi/app/nixosdv.yaml index e6b8dfe1..820f20dc 100644 --- a/kubernetes/apps/cdi/cdi/app/nixosdv.yaml +++ b/kubernetes/apps/cdi/cdi/app/nixosdv.yaml @@ -9,7 +9,7 @@ spec: resources: requests: storage: 2Gi - storageClassName: "openebs-zfs" + storageClassName: "openebs-hostpath" accessModes: - "ReadWriteOnce" source: diff --git a/kubernetes/apps/cdi/cdi/app/storageprofile.yaml b/kubernetes/apps/cdi/cdi/app/storageprofile.yaml index b10a6ed8..45f91107 100644 --- a/kubernetes/apps/cdi/cdi/app/storageprofile.yaml +++ b/kubernetes/apps/cdi/cdi/app/storageprofile.yaml @@ -8,7 +8,7 @@ metadata: app.kubernetes.io/component: storage app.kubernetes.io/managed-by: cdi-controller cdi.kubevirt.io: "" - name: openebs-zfs + name: openebs-hostpath spec: claimPropertySets: - accessModes: @@ -22,5 +22,5 @@ status: cloneStrategy: copy dataImportCronSourceFormat: pvc provisioner: zfs.csi.openebs.io - snapshotClass: openebs-zfs - storageClass: openebs-zfs + snapshotClass: openebs-hostpath + storageClass: openebs-hostpath diff --git a/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml b/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml index 679b1323..dfb74eb3 100644 --- a/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml +++ b/kubernetes/apps/database/crunchy-postgres-operator/cluster/postgrescluster.yaml @@ -41,7 +41,7 @@ spec: app.kubernetes.io/name: crunchy-postgres replicas: &replica 1 dataVolumeClaimSpec: - storageClassName: openebs-zfs + storageClassName: openebs-hostpath accessModes: - ReadWriteOnce resources: diff --git a/kubernetes/apps/kubevirt/app/ks.yaml b/kubernetes/apps/kubevirt/app/ks.yaml index 379e6aab..33b785ee 100644 --- a/kubernetes/apps/kubevirt/app/ks.yaml +++ b/kubernetes/apps/kubevirt/app/ks.yaml @@ -40,7 +40,7 @@ spec: featureGates: - CPUNodeDiscovery - ExpandDisks - vmStateStorageClass: openebs-zfs + vmStateStorageClass: openebs-hostpath target: group: kubevirt.io kind: KubeVirt diff --git a/kubernetes/apps/kubevirt/vms/fj-runner-01-disk1.yaml b/kubernetes/apps/kubevirt/vms/fj-runner-01-disk1.yaml index 418a5792..1674fc9f 100644 --- a/kubernetes/apps/kubevirt/vms/fj-runner-01-disk1.yaml +++ b/kubernetes/apps/kubevirt/vms/fj-runner-01-disk1.yaml @@ -9,4 +9,4 @@ spec: resources: requests: storage: 80Gi - storageClassName: openebs-zfs + storageClassName: openebs-hostpath diff --git a/kubernetes/apps/kubevirt/vms/fj-runner-02-disk1.yaml b/kubernetes/apps/kubevirt/vms/fj-runner-02-disk1.yaml index 11af922b..2789dc33 100644 --- a/kubernetes/apps/kubevirt/vms/fj-runner-02-disk1.yaml +++ b/kubernetes/apps/kubevirt/vms/fj-runner-02-disk1.yaml @@ -9,4 +9,4 @@ spec: resources: requests: storage: 80Gi - storageClassName: openebs-zfs + storageClassName: openebs-hostpath diff --git a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml index 7c6824fd..287da189 100644 --- a/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml +++ b/kubernetes/apps/observability/kube-prometheus-stack/app/helmrelease.yaml @@ -46,7 +46,7 @@ spec: storage: volumeClaimTemplate: spec: - storageClassName: openebs-zfs + storageClassName: openebs-hostpath resources: requests: storage: 1Gi @@ -142,7 +142,7 @@ spec: storageSpec: volumeClaimTemplate: spec: - storageClassName: openebs-zfs + storageClassName: openebs-hostpath resources: requests: storage: 20Gi diff --git a/kubernetes/apps/observability/loki/app/helmrelease.yaml b/kubernetes/apps/observability/loki/app/helmrelease.yaml index b75ccf8f..fd0ba62b 100644 --- a/kubernetes/apps/observability/loki/app/helmrelease.yaml +++ b/kubernetes/apps/observability/loki/app/helmrelease.yaml @@ -104,7 +104,7 @@ spec: replicas: 1 persistence: size: 20Gi - storageClass: openebs-zfs + storageClass: openebs-hostpath gateway: replicas: 1 image: @@ -125,7 +125,7 @@ spec: replicas: 1 persistence: size: 20Gi - storageClass: openebs-zfs + storageClass: openebs-hostpath sidecar: image: repository: ghcr.io/kiwigrid/k8s-sidecar diff --git a/kubernetes/apps/observability/thanos/app/helmrelease.yaml b/kubernetes/apps/observability/thanos/app/helmrelease.yaml index fb4fa538..6ff06b08 100644 --- a/kubernetes/apps/observability/thanos/app/helmrelease.yaml +++ b/kubernetes/apps/observability/thanos/app/helmrelease.yaml @@ -65,7 +65,7 @@ spec: - --retention.resolution-1h=60d persistence: &persistence enabled: true - storageClass: openebs-zfs + storageClass: openebs-hostpath size: 10Gi query: replicas: 1 diff --git a/kubernetes/flux/repositories/helm/kustomization.yaml b/kubernetes/flux/repositories/helm/kustomization.yaml index c2f502c7..1aa8f4e1 100644 --- a/kubernetes/flux/repositories/helm/kustomization.yaml +++ b/kubernetes/flux/repositories/helm/kustomization.yaml @@ -26,7 +26,6 @@ resources: - kubernetes-sigs-external-dns.yaml - nvidia.yaml - openebs.yaml - - openebs-zfs.yaml - piraeus.yaml - postfinance.yaml - prometheus-community.yaml diff --git a/kubernetes/flux/repositories/helm/openebs-zfs.yaml b/kubernetes/flux/repositories/helm/openebs-zfs.yaml deleted file mode 100644 index dfcc8bfb..00000000 --- a/kubernetes/flux/repositories/helm/openebs-zfs.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# yaml-language-server: $schema=https://ks.hsn.dev/source.toolkit.fluxcd.io/helmrepository_v1beta2.json -apiVersion: source.toolkit.fluxcd.io/v1 -kind: HelmRepository -metadata: - name: openebs-zfs - namespace: flux-system -spec: - interval: 2h - url: https://openebs.github.io/zfs-localpv diff --git a/kubernetes/templates/postgres-database/postgresCluster.yaml b/kubernetes/templates/postgres-database/postgresCluster.yaml index dab72c1c..2957b83f 100644 --- a/kubernetes/templates/postgres-database/postgresCluster.yaml +++ b/kubernetes/templates/postgres-database/postgresCluster.yaml @@ -36,7 +36,7 @@ spec: app.kubernetes.io/name: pgo-${APP} replicas: 1 dataVolumeClaimSpec: - storageClassName: openebs-zfs + storageClassName: openebs-hostpath accessModes: - ReadWriteOnce resources: diff --git a/kubernetes/templates/volsync/claim.yaml b/kubernetes/templates/volsync/claim.yaml index 34346faf..79a7a55e 100644 --- a/kubernetes/templates/volsync/claim.yaml +++ b/kubernetes/templates/volsync/claim.yaml @@ -12,4 +12,4 @@ spec: resources: requests: storage: "${VOLSYNC_CAPACITY}" - storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" + storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-hostpath}" diff --git a/kubernetes/templates/volsync/minio.yaml b/kubernetes/templates/volsync/minio.yaml index c2c96576..4fd8ef63 100644 --- a/kubernetes/templates/volsync/minio.yaml +++ b/kubernetes/templates/volsync/minio.yaml @@ -36,11 +36,11 @@ spec: copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}" pruneIntervalDays: 7 repository: "${APP}-volsync-secret" - volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-zfs}" + volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-hostpath}" cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}" - cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-zfs}" + cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}" cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"] - storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" + storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-hostpath}" accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"] moverSecurityContext: runAsUser: ${APP_UID:-568} @@ -62,11 +62,11 @@ spec: restic: repository: "${APP}-volsync-secret" copyMethod: Snapshot # must be Snapshot - volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-zfs}" - cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-zfs}" + volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-hostpath}" + cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}" cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"] cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}" - storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" + storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-hostpath}" accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"] capacity: "${VOLSYNC_CAPACITY}" moverSecurityContext: diff --git a/kubernetes/templates/volsync/r2.yaml b/kubernetes/templates/volsync/r2.yaml index e71e3828..9c20c44e 100644 --- a/kubernetes/templates/volsync/r2.yaml +++ b/kubernetes/templates/volsync/r2.yaml @@ -36,11 +36,11 @@ spec: copyMethod: "${VOLSYNC_COPYMETHOD:-Snapshot}" pruneIntervalDays: 7 repository: "${APP}-volsync-r2-secret" - volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-zfs}" + volumeSnapshotClassName: "${VOLSYNC_SNAPSHOTCLASS:-openebs-hostpath}" cacheCapacity: "${VOLSYNC_CACHE_CAPACITY:-4Gi}" - cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-zfs}" + cacheStorageClassName: "${VOLSYNC_CACHE_SNAPSHOTCLASS:-openebs-hostpath}" cacheAccessModes: ["${VOLSYNC_CACHE_ACCESSMODES:-ReadWriteOnce}"] - storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-zfs}" + storageClassName: "${VOLSYNC_STORAGECLASS:-openebs-hostpath}" accessModes: ["${VOLSYNC_ACCESSMODES:-ReadWriteOnce}"] moverSecurityContext: runAsUser: ${APP_UID:-568} diff --git a/kubernetes/tools/kbench.yaml b/kubernetes/tools/kbench.yaml index 6d48f152..020981d0 100644 --- a/kubernetes/tools/kbench.yaml +++ b/kubernetes/tools/kbench.yaml @@ -4,7 +4,7 @@ apiVersion: v1 metadata: name: kbench-pvc spec: - storageClassName: openebs-zfs + storageClassName: openebs-hostpath accessModes: - ReadWriteOnce resources: