From a754d3cc6061a8209018606a83fd5c7d5ea13eee Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Mon, 8 Jul 2024 11:20:49 -0500 Subject: [PATCH] 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: