From 6c0a633f6b1f26acc10f1de06c940f7b834299b5 Mon Sep 17 00:00:00 2001
From: Khaja Omer <56000175+komer3@users.noreply.github.com>
Date: Mon, 14 Oct 2024 16:51:56 -0500
Subject: [PATCH] remove wait for first consumer storageclass (#288)

Co-authored-by: Khaja Omer <komer@akamai.com>
---
 deploy/kubernetes/base/csi-storageclass.yaml   | 18 ------------------
 docs/topology-aware-provisioning.md            |  2 +-
 ...de-block-storage-topology-aware-retain.yaml | 17 -----------------
 .../linode-block-storage-topology-aware.yaml   | 17 -----------------
 .../linode-blockstorage-csi-driver.yaml        | 18 ------------------
 5 files changed, 1 insertion(+), 71 deletions(-)
 delete mode 100644 helm-chart/csi-driver/templates/linode-block-storage-topology-aware-retain.yaml
 delete mode 100644 helm-chart/csi-driver/templates/linode-block-storage-topology-aware.yaml

diff --git a/deploy/kubernetes/base/csi-storageclass.yaml b/deploy/kubernetes/base/csi-storageclass.yaml
index 40338fdb..b40ca161 100644
--- a/deploy/kubernetes/base/csi-storageclass.yaml
+++ b/deploy/kubernetes/base/csi-storageclass.yaml
@@ -16,21 +16,3 @@ metadata:
 provisioner: linodebs.csi.linode.com
 reclaimPolicy: Retain
 allowVolumeExpansion: true
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: linode-block-storage-wait-for-consumer
-  namespace: kube-system
-provisioner: linodebs.csi.linode.com
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  name: linode-block-storage-wait-for-consumer-retain
-  namespace: kube-system
-provisioner: linodebs.csi.linode.com
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
diff --git a/docs/topology-aware-provisioning.md b/docs/topology-aware-provisioning.md
index 84679b74..9da5935f 100644
--- a/docs/topology-aware-provisioning.md
+++ b/docs/topology-aware-provisioning.md
@@ -36,7 +36,7 @@ spec:
   storageClassName: linode-block-storage-wait-for-consumer
 ```
 
-> **Important**: The `volumeBindingMode: WaitForFirstConsumer` setting is crucial for topology-aware provisioning. It delays volume binding and creation until a pod using the PVC is created. This allows the system to consider the pod's scheduling requirements and node assignment when selecting the most appropriate storage location, ensuring optimal data locality and performance.
+> **Important**: The `volumeBindingMode: WaitForFirstConsumer` setting is crucial for topology-aware provisioning. It delays volume binding and creation until a pod using the PVC is scheduled. This allows the system to consider the pod's scheduling requirements and node assignment when selecting the most appropriate storage location, ensuring optimal data locality and performance.
 
 #### 🖥️ Example Pod
 
diff --git a/helm-chart/csi-driver/templates/linode-block-storage-topology-aware-retain.yaml b/helm-chart/csi-driver/templates/linode-block-storage-topology-aware-retain.yaml
deleted file mode 100644
index 365a4630..00000000
--- a/helm-chart/csi-driver/templates/linode-block-storage-topology-aware-retain.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: linode-block-storage-wait-for-consumer-retain
-  namespace: {{ required ".Values.namespace required" .Values.namespace }}
-{{- if eq .Values.defaultStorageClass "linode-block-storage-wait-for-consumer-retain" }}
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-{{- end }}
-{{- if .Values.volumeTags }}
-parameters:
-  linodebs.csi.linode.com/volumeTags: {{ join "," .Values.volumeTags }}
-{{- end}}
-allowVolumeExpansion: true
-provisioner: linodebs.csi.linode.com
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
diff --git a/helm-chart/csi-driver/templates/linode-block-storage-topology-aware.yaml b/helm-chart/csi-driver/templates/linode-block-storage-topology-aware.yaml
deleted file mode 100644
index cf9cecc7..00000000
--- a/helm-chart/csi-driver/templates/linode-block-storage-topology-aware.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: linode-block-storage-wait-for-consumer
-  namespace: {{ required ".Values.namespace required" .Values.namespace }}
-{{- if eq .Values.defaultStorageClass "linode-block-storage-wait-for-consumer" }}
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
-{{- end }}
-{{- if .Values.volumeTags }}
-parameters:
-  linodebs.csi.linode.com/volumeTags: {{ join "," .Values.volumeTags }}
-{{- end}}
-allowVolumeExpansion: true
-provisioner: linodebs.csi.linode.com
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
diff --git a/internal/driver/deploy/releases/linode-blockstorage-csi-driver.yaml b/internal/driver/deploy/releases/linode-blockstorage-csi-driver.yaml
index ee871a38..a88eb631 100644
--- a/internal/driver/deploy/releases/linode-blockstorage-csi-driver.yaml
+++ b/internal/driver/deploy/releases/linode-blockstorage-csi-driver.yaml
@@ -17,24 +17,6 @@ metadata:
 provisioner: linodebs.csi.linode.com
 reclaimPolicy: Retain
 ---
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: linode-block-storage-topology-aware-retain
-  namespace: kube-system
-provisioner: linodebs.csi.linode.com
-reclaimPolicy: Retain
-volumeBindingMode: WaitForFirstConsumer
----
-apiVersion: storage.k8s.io/v1
-kind: StorageClass
-metadata:
-  name: linode-block-storage-topology-aware
-  namespace: kube-system
-provisioner: linodebs.csi.linode.com
-reclaimPolicy: Delete
-volumeBindingMode: WaitForFirstConsumer
----
 apiVersion: v1
 kind: ServiceAccount
 metadata: