From 85c21e29c87f3ddf4524d20d7363b7f0bec506ff Mon Sep 17 00:00:00 2001 From: Elamaran Shanmugam Date: Wed, 20 Sep 2023 17:03:56 -0400 Subject: [PATCH] Removing CSTOR --- .../Core/storage-driver/classes/cspc.yaml | 37 ------------------- .../storage-driver/classes/kustomization.yaml | 5 --- .../storage-driver/classes/storage-class.yaml | 12 ------ .../storage-driver/openebs/helm-release.yaml | 3 -- .../Core/storage-driver/storage-driver.yaml | 16 -------- .../Core/storage-driver/classes/cspc.yaml | 35 ------------------ .../storage-driver/classes/kustomization.yaml | 5 --- .../storage-driver/classes/storage-class.yaml | 12 ------ .../storage-driver/openebs/helm-release.yaml | 3 -- .../Core/storage-driver/storage-driver.yaml | 16 -------- 10 files changed, 144 deletions(-) delete mode 100644 eks-anywhere-baremetal/Addons/Core/storage-driver/classes/cspc.yaml delete mode 100644 eks-anywhere-baremetal/Addons/Core/storage-driver/classes/kustomization.yaml delete mode 100644 eks-anywhere-baremetal/Addons/Core/storage-driver/classes/storage-class.yaml delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/classes/cspc.yaml delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/classes/kustomization.yaml delete mode 100644 eks-anywhere-vsphere/Addons/Core/storage-driver/classes/storage-class.yaml diff --git a/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/cspc.yaml b/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/cspc.yaml deleted file mode 100644 index a9846997..00000000 --- a/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/cspc.yaml +++ /dev/null @@ -1,37 +0,0 @@ -# This file should be populated manually for each installation by obtaining -# the block device and node name using the below command (Expect this to fail for the first time): -# kubectl get bd -A ─╯ -# NAMESPACE NAME NODENAME SIZE CLAIMSTATE STATUS AGE -# openebs blockdevice-9e896ca287cb024292e959467c58f3f9 eksa-sa02 240057409536 Claimed Active 49m -# openebs blockdevice-f74ab1a7c662d258435fdb8e0395f91c eksa-sa04 240057409536 Claimed Active 49m -# openebs blockdevice-f97121796c7e94f578751b0e4798de2f eksa-sa03 240057409536 Claimed Active 49m -apiVersion: cstor.openebs.io/v1 -kind: CStorPoolCluster -metadata: - name: cstor-disk-pool - namespace: openebs -spec: - pools: - - nodeSelector: - kubernetes.io/hostname: "eksa-sa02" - dataRaidGroups: - - blockDevices: - - blockDeviceName: "blockdevice-9e896ca287cb024292e959467c58f3f9" - poolConfig: - dataRaidGroupType: "stripe" - - - nodeSelector: - kubernetes.io/hostname: "eksa-sa04" - dataRaidGroups: - - blockDevices: - - blockDeviceName: "blockdevice-f74ab1a7c662d258435fdb8e0395f91c" - poolConfig: - dataRaidGroupType: "stripe" - - - nodeSelector: - kubernetes.io/hostname: "eksa-sa03" - dataRaidGroups: - - blockDevices: - - blockDeviceName: "blockdevice-f97121796c7e94f578751b0e4798de2f" - poolConfig: - dataRaidGroupType: "stripe" \ No newline at end of file diff --git a/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/kustomization.yaml b/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/kustomization.yaml deleted file mode 100644 index ce46c2ec..00000000 --- a/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - cspc.yaml - - storage-class.yaml \ No newline at end of file diff --git a/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/storage-class.yaml b/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/storage-class.yaml deleted file mode 100644 index a711653d..00000000 --- a/eks-anywhere-baremetal/Addons/Core/storage-driver/classes/storage-class.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: openebs-csi-cstor-sparse - annotations: - storageclass.kubernetes.io/is-default-class: "true" -provisioner: cstor.csi.openebs.io -allowVolumeExpansion: true -parameters: - cas-type: cstor - replicaCount: "1" - cstorPoolCluster: cstor-disk-pool \ No newline at end of file diff --git a/eks-anywhere-baremetal/Addons/Core/storage-driver/openebs/helm-release.yaml b/eks-anywhere-baremetal/Addons/Core/storage-driver/openebs/helm-release.yaml index 4264e5d9..58dee1e2 100644 --- a/eks-anywhere-baremetal/Addons/Core/storage-driver/openebs/helm-release.yaml +++ b/eks-anywhere-baremetal/Addons/Core/storage-driver/openebs/helm-release.yaml @@ -16,7 +16,4 @@ spec: version: "3.3.0" interval: 60s targetNamespace: openebs - values: - cstor: - enabled: true diff --git a/eks-anywhere-baremetal/Addons/Core/storage-driver/storage-driver.yaml b/eks-anywhere-baremetal/Addons/Core/storage-driver/storage-driver.yaml index d9aca081..2d3fabb0 100644 --- a/eks-anywhere-baremetal/Addons/Core/storage-driver/storage-driver.yaml +++ b/eks-anywhere-baremetal/Addons/Core/storage-driver/storage-driver.yaml @@ -12,19 +12,3 @@ spec: interval: 5m0s prune: true --- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 -kind: Kustomization -metadata: - name: classes - namespace: flux-system -spec: - dependsOn: - - name: openebs - path: "./eks-anywhere-baremetal/Addons/Core/storage-driver/classes" - sourceRef: - kind: GitRepository - name: addons - namespace: flux-system - interval: 5m0s - prune: true ---- \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/cspc.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/cspc.yaml deleted file mode 100644 index a25ea5f3..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/cspc.yaml +++ /dev/null @@ -1,35 +0,0 @@ -# This file should be populated manually for each installation by obtaining -# the block device and node name using the below command (Expect this to fail for the first time): -# kubectl get bd -A ─╯ -# NAMESPACE NAME NODENAME SIZE CLAIMSTATE STATUS AGE -# openebs blockdevice-9e896ca287cb024292e959467c58f3f9 eksa-sa02 240057409536 Claimed Active 49m -# openebs blockdevice-f74ab1a7c662d258435fdb8e0395f91c eksa-sa04 240057409536 Claimed Active 49m -# openebs blockdevice-f97121796c7e94f578751b0e4798de2f eksa-sa03 240057409536 Claimed Active 49m -apiVersion: cstor.openebs.io/v1 -kind: CStorPoolCluster -metadata: - name: cstor-disk-pool - namespace: openebs -spec: - pools: - - nodeSelector: - kubernetes.io/hostname: "10.2.32.20" - dataRaidGroups: - - blockDevices: - - blockDeviceName: "blockdevice-1a33a8c1c0dba5b15b4db49a74fdc0e3" - poolConfig: - dataRaidGroupType: "stripe" - - nodeSelector: - kubernetes.io/hostname: "10.2.32.20" - dataRaidGroups: - - blockDevices: - - blockDeviceName: "blockdevice-1a40758fa9aaece3263f973ab103c279" - poolConfig: - dataRaidGroupType: "stripe" - - nodeSelector: - kubernetes.io/hostname: "10.2.32.20" - dataRaidGroups: - - blockDevices: - - blockDeviceName: "blockdevice-7a89d1d51cdc7ce0e34f2d91d2c09090" - poolConfig: - dataRaidGroupType: "stripe" \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/kustomization.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/kustomization.yaml deleted file mode 100644 index ce46c2ec..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - cspc.yaml - - storage-class.yaml \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/storage-class.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/storage-class.yaml deleted file mode 100644 index a711653d..00000000 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/classes/storage-class.yaml +++ /dev/null @@ -1,12 +0,0 @@ -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: openebs-csi-cstor-sparse - annotations: - storageclass.kubernetes.io/is-default-class: "true" -provisioner: cstor.csi.openebs.io -allowVolumeExpansion: true -parameters: - cas-type: cstor - replicaCount: "1" - cstorPoolCluster: cstor-disk-pool \ No newline at end of file diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/openebs/helm-release.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/openebs/helm-release.yaml index 4264e5d9..58dee1e2 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/openebs/helm-release.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/openebs/helm-release.yaml @@ -16,7 +16,4 @@ spec: version: "3.3.0" interval: 60s targetNamespace: openebs - values: - cstor: - enabled: true diff --git a/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml b/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml index b09e7323..f6aa02b5 100644 --- a/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml +++ b/eks-anywhere-vsphere/Addons/Core/storage-driver/storage-driver.yaml @@ -11,20 +11,4 @@ spec: namespace: flux-system interval: 5m0s prune: true ---- -apiVersion: kustomize.toolkit.fluxcd.io/v1beta2 -kind: Kustomization -metadata: - name: classes - namespace: flux-system -spec: - dependsOn: - - name: openebs - path: "./eks-anywhere-vsphere/Addons/Core/storage-driver/classes" - sourceRef: - kind: GitRepository - name: addons - namespace: flux-system - interval: 5m0s - prune: true --- \ No newline at end of file