configurable storage class (#136)

* configurable storage class * change sc name and make default... default * move change to config * changelog
giantswarm · Aug 12, 2024 · f11bc1f · f11bc1f
1 parent 4b8645b
commit f11bc1f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Make default storage class configurable.
+
 ## [1.10.0] - 2024-07-08
 
 ### Changed

diff --git a/config/vsphere-csi-driver/overwrites/templates/storage.k8s.io_v1_storage_class_default.yaml b/config/vsphere-csi-driver/overwrites/templates/storage.k8s.io_v1_storage_class_default.yaml
@@ -5,33 +5,16 @@ apiVersion: storage.k8s.io/v1
 metadata:
   labels:
     {{- include "labels.common" $ | nindent 4 }}
-  {{- if .delete.isDefault }}
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
-  {{- end }}
-  name: csi-vsphere-sc-delete
+  name: csi-vsphere-sc-default
 provisioner: csi.vsphere.vmware.com
-reclaimPolicy: Delete
+reclaimPolicy: {{ .reclaimPolicy }}
 allowVolumeExpansion: true
 parameters:
-  storagepolicyname: {{ .delete.vcdStorageProfileName | quote }}
-  csi.storage.k8s.io/fstype: {{ .delete.fileSystem }}
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  labels:
-    {{- include "labels.common" $ | nindent 4 }}
-  {{- if .retain.isDefault }}
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
+  {{- if .storageProfileName }}
+  storagepolicyname: {{ .storageProfileName | quote }}
   {{- end }}
-  name: csi-vsphere-sc-retain
-provisioner: csi.vsphere.vmware.com
-reclaimPolicy: Retain
-allowVolumeExpansion: true
-parameters:
-  storagepolicyname: {{ .retain.vcdStorageProfileName | quote }}
-  csi.storage.k8s.io/fstype: {{ .retain.fileSystem }}
+  csi.storage.k8s.io/fstype: {{ .fileSystem }}
 {{- end }}
 {{- end }}
diff --git a/config/vsphere-csi-driver/overwrites/values.yaml b/config/vsphere-csi-driver/overwrites/values.yaml
@@ -10,14 +10,9 @@ config:
 
 storageClass:
   enabled: true
-  delete:
-    isDefault: true
-    vcdStorageProfileName: "vSAN Default Storage Policy"
-    fileSystem: "ext4"
-  retain:
-    isDefault: false
-    vcdStorageProfileName: "vSAN Default Storage Policy"
-    fileSystem: "ext4"
+  reclaimPolicy: "Delete"
+  fileSystem: "ext4"
+  # storageProfileName: "vSAN Default Storage Policy"
 
 internalFeatureStates:
   topologyPreferentialDatastores:

diff --git a/...-vsphere/charts/vsphere-csi-driver/templates/storage.k8s.io_v1_storage_class_default.yaml b/...-vsphere/charts/vsphere-csi-driver/templates/storage.k8s.io_v1_storage_class_default.yaml
@@ -5,33 +5,16 @@ apiVersion: storage.k8s.io/v1
 metadata:
   labels:
     {{- include "labels.common" $ | nindent 4 }}
-  {{- if .delete.isDefault }}
   annotations:
     storageclass.kubernetes.io/is-default-class: "true"
-  {{- end }}
-  name: csi-vsphere-sc-delete
+  name: csi-vsphere-sc-default
 provisioner: csi.vsphere.vmware.com
-reclaimPolicy: Delete
+reclaimPolicy: {{ .reclaimPolicy }}
 allowVolumeExpansion: true
 parameters:
-  storagepolicyname: {{ .delete.vcdStorageProfileName | quote }}
-  csi.storage.k8s.io/fstype: {{ .delete.fileSystem }}
----
-kind: StorageClass
-apiVersion: storage.k8s.io/v1
-metadata:
-  labels:
-    {{- include "labels.common" $ | nindent 4 }}
-  {{- if .retain.isDefault }}
-  annotations:
-    storageclass.kubernetes.io/is-default-class: "true"
+  {{- if .storageProfileName }}
+  storagepolicyname: {{ .storageProfileName | quote }}
   {{- end }}
-  name: csi-vsphere-sc-retain
-provisioner: csi.vsphere.vmware.com
-reclaimPolicy: Retain
-allowVolumeExpansion: true
-parameters:
-  storagepolicyname: {{ .retain.vcdStorageProfileName | quote }}
-  csi.storage.k8s.io/fstype: {{ .retain.fileSystem }}
+  csi.storage.k8s.io/fstype: {{ .fileSystem }}
 {{- end }}
 {{- end }}
diff --git a/helm/cloud-provider-vsphere/charts/vsphere-csi-driver/values.yaml b/helm/cloud-provider-vsphere/charts/vsphere-csi-driver/values.yaml
@@ -10,14 +10,9 @@ config:
 
 storageClass:
   enabled: true
-  delete:
-    isDefault: true
-    vcdStorageProfileName: "vSAN Default Storage Policy"
-    fileSystem: "ext4"
-  retain:
-    isDefault: false
-    vcdStorageProfileName: "vSAN Default Storage Policy"
-    fileSystem: "ext4"
+  reclaimPolicy: "Delete"
+  fileSystem: "ext4"
+  # storageProfileName: "vSAN Default Storage Policy"
 
 internalFeatureStates:
   topologyPreferentialDatastores: