cleanup: remove thick provisioning code

This commit removes the thick provisioning code as thick provisioning is deprecated in cephcsi 3.5.0. fixes: ceph#2795 Signed-off-by: Madhu Rajanna <[email protected]>
Madhu-1 · Jan 27, 2022 · 8683f54 · 8683f54
1 parent a553157
commit 8683f54
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 908 deletions.
diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md
@@ -149,7 +149,6 @@ charts and their default values.
 | `storageClass.clusterID`                       | String representing a Ceph cluster to provision storage from                                                                                         | `<cluster-ID>`                                     |
 | `storageClass.dataPool`                        | Specifies the erasure coded pool                                                                                                                     | `""`                                               |
 | `storageClass.pool`                            | Ceph pool into which the RBD image shall be created                                                                                                  | `replicapool`                                      |
-| `storageClass.thickProvision`                  | Specifies whether thick provision should be enabled                                                                                                  | `false`                                            |
 | `storageclass.imageFeatures`                   | Specifies RBD image features                                                                                                                         | `layering`                                         |
 | `storageclass.tryOtherMounters`                | Specifies whether to try other mounters in case if the current mounter fails to mount the rbd image for any reason                                   | `false`                                            |
 | `storageClass.mounter`                         | Specifies RBD mounter                                                                                                                                | `""`                                               |

diff --git a/charts/ceph-csi-rbd/templates/storageclass.yaml b/charts/ceph-csi-rbd/templates/storageclass.yaml
@@ -18,7 +18,6 @@ parameters:
   clusterID: {{ .Values.storageClass.clusterID }}
   pool: {{ .Values.storageClass.pool }}
   imageFeatures: {{ .Values.storageClass.imageFeatures }}
-  thickProvision: {{ .Values.storageClass.thickProvision | quote}}
 {{- if .Values.storageClass.tryOtherMounters }}
   tryOtherMounters: {{ .Values.storageClass.tryOtherMounters | quote}}
 {{- end }}

diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml
@@ -279,10 +279,6 @@ storageClass:
   # eg: pool: replicapool
   pool: replicapool
 
-  # Set thickProvision to true if you want RBD images to be fully allocated on
-  # creation (thin provisioning is the default).
-  thickProvision: false
-
   # (required) RBD image features, CSI creates image with image-format 2
   # CSI RBD currently supports `layering`, `journaling`, `exclusive-lock`,
   # `object-map`, `fast-diff` features. If `journaling` is enabled, must

diff --git a/docs/deploy-rbd.md b/docs/deploy-rbd.md
diff --git a/e2e/rbd.go b/e2e/rbd.go
@@ -1747,38 +1747,6 @@ var _ = Describe("RBD", func() {
 					f)
 			})
 
-			By("create a thick-provisioned PVC-PVC clone and bind it to an app", func() {
-				err := deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass: %v", err)
-				}
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, map[string]string{
-					"thickProvision": "true",
-				}, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-
-				validatePVCClone(1,
-					pvcPath,
-					appPath,
-					pvcSmartClonePath,
-					appSmartClonePath,
-					noDataPool,
-					noKMS,
-					isThickPVC,
-					f)
-
-				err = deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass: %v", err)
-				}
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-			})
-
 			By("create an encrypted PVC snapshot and restore it for an app with VaultKMS", func() {
 				err := deleteResource(rbdExamplePath + "storageclass.yaml")
 				if err != nil {
@@ -1863,75 +1831,6 @@ var _ = Describe("RBD", func() {
 				}
 			})
 
-			By("Validate thick PVC restore from vaultKMS to userSecretsMetadataKMS", func() {
-				restoreSCName := "restore-sc"
-				err := deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass: %v", err)
-				}
-				scOpts := map[string]string{
-					"encrypted":       "true",
-					"encryptionKMSID": "vault-test",
-					"thickProvision":  "true",
-				}
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, scOpts, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-
-				scOpts = map[string]string{
-					"encrypted":       "true",
-					"encryptionKMSID": "user-secrets-metadata-test",
-					"thickProvision":  "true",
-				}
-				err = createRBDStorageClass(f.ClientSet, f, restoreSCName, nil, scOpts, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-
-				// PVC creation namespace where secret will be created
-				namespace := f.UniqueName
-
-				// create user Secret
-				err = retryKubectlFile(namespace, kubectlCreate, vaultExamplePath+vaultUserSecret, deployTimeout)
-				if err != nil {
-					e2elog.Failf("failed to create user Secret: %v", err)
-				}
-
-				validatePVCSnapshot(1,
-					pvcPath, appPath, snapshotPath, pvcClonePath, appClonePath,
-					vaultKMS, secretsMetadataKMS,
-					restoreSCName, noDataPool, f)
-
-				// delete user secret
-				err = retryKubectlFile(namespace,
-					kubectlDelete,
-					vaultExamplePath+vaultUserSecret,
-					deployTimeout,
-					"--ignore-not-found=true")
-				if err != nil {
-					e2elog.Failf("failed to delete user Secret: %v", err)
-				}
-
-				err = retryKubectlArgs(cephCSINamespace, kubectlDelete, deployTimeout, "storageclass", restoreSCName)
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass %q: %v", restoreSCName, err)
-				}
-
-				err = deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass: %v", err)
-				}
-
-				// validate created backend rbd images
-				validateRBDImageCount(f, 0, defaultRBDPool)
-
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-			})
-
 			By("create an encrypted PVC-PVC clone and bind it to an app", func() {
 				err := deleteResource(rbdExamplePath + "storageclass.yaml")
 				if err != nil {
@@ -3180,47 +3079,6 @@ var _ = Describe("RBD", func() {
 				validateRBDImageCount(f, 0, defaultRBDPool)
 			})
 
-			By("create a thick-provisioned PVC", func() {
-				err := deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass: %v", err)
-				}
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, map[string]string{
-					"thickProvision": "true",
-				}, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-
-				pvc, err := loadPVC(rawPvcPath)
-				if err != nil {
-					e2elog.Failf("failed to load PVC:: %v", err)
-				}
-
-				pvcSizes := []string{
-					// original value from the yaml file (100MB)
-					"100Mi",
-					// half the size (50MB), is not stripe-size roundable
-					"50Mi",
-				}
-
-				for _, pvcSize := range pvcSizes {
-					err = validateThickPVC(f, pvc, pvcSize)
-					if err != nil {
-						e2elog.Failf("validating thick-provisioning failed: %v", err)
-					}
-				}
-
-				err = deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass: %v", err)
-				}
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass: %v", err)
-				}
-			})
-
 			By("create a PVC and Bind it to an app for mapped rbd image with options", func() {
 				err := deleteResource(rbdExamplePath + "storageclass.yaml")
 				if err != nil {
@@ -3270,53 +3128,6 @@ var _ = Describe("RBD", func() {
 				}
 			})
 
-			By("validate the functionality of controller with encryption and thick-provisioning", func() {
-				err := deleteResource(rbdExamplePath + "storageclass.yaml")
-				if err != nil {
-					e2elog.Failf("failed to delete storageclass : %v", err)
-				}
-				scParams := map[string]string{
-					"encrypted":       "true",
-					"encryptionKMSID": "user-secrets-metadata-test",
-					"thickProvision":  "true",
-				}
-
-				// PVC creation namespace where secret will be created
-				namespace := f.UniqueName
-
-				// create user Secret
-				err = retryKubectlFile(namespace, kubectlCreate, vaultExamplePath+vaultUserSecret, deployTimeout)
-				if err != nil {
-					e2elog.Failf("failed to create user Secret: %v", err)
-				}
-
-				err = validateController(f,
-					pvcPath, appPath, rbdExamplePath+"storageclass.yaml",
-					nil,
-					scParams)
-				if err != nil {
-					e2elog.Failf("failed to validate controller : %v", err)
-				}
-
-				// validate created backend rbd images
-				validateRBDImageCount(f, 0, defaultRBDPool)
-
-				// delete user secret
-				err = retryKubectlFile(namespace,
-					kubectlDelete,
-					vaultExamplePath+vaultUserSecret,
-					deployTimeout,
-					"--ignore-not-found=true")
-				if err != nil {
-					e2elog.Failf("failed to delete user Secret: %v", err)
-				}
-
-				err = createRBDStorageClass(f.ClientSet, f, defaultSCName, nil, nil, deletePolicy)
-				if err != nil {
-					e2elog.Failf("failed to create storageclass : %v", err)
-				}
-			})
-
 			By("validate image deletion when it is moved to trash", func() {
 				// make sure pool is empty
 				validateRBDImageCount(f, 0, defaultRBDPool)