controllers: Add logic to Create cephfs encrypted storageclass

Signed-off-by: Nitin Goyal <nigoyal@redhat.com>
red-hat-storage · May 13, 2024 · ccc76e7 · ccc76e7
1 parent e416fcb
commit ccc76e7
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 9 deletions.
diff --git a/controllers/storagecluster/generate.go b/controllers/storagecluster/generate.go
@@ -95,6 +95,13 @@ func generateNameForEncryptedCephBlockPoolSC(initData *ocsv1.StorageCluster) str
 	return fmt.Sprintf("%s-ceph-rbd-encrypted", initData.Name)
 }
 
+func generateNameForEncryptedCephFileSystemSC(initData *ocsv1.StorageCluster) string {
+	if initData.Spec.Encryption.CephFs.StorageClassName != "" {
+		return initData.Spec.Encryption.CephFs.StorageClassName
+	}
+	return fmt.Sprintf("%s-cephfs-encrypted", initData.Name)
+}
+
 func generateNameForCephNetworkFilesystemSC(initData *ocsv1.StorageCluster) string {
 	if initData.Spec.NFS.StorageClassName != "" {
 		return initData.Spec.NFS.StorageClassName

diff --git a/controllers/storagecluster/reconcile.go b/controllers/storagecluster/reconcile.go
@@ -853,6 +853,12 @@ func validateCustomStorageClassNames(sc *ocsv1.StorageCluster) error {
 		}
 		scMap[sc.Spec.Encryption.StorageClassName] = true
 	}
+	if sc.Spec.Encryption.CephFs.StorageClass && sc.Spec.Encryption.KeyManagementService.Enable && sc.Spec.Encryption.CephFs.StorageClassName != "" {
+		if _, ok := scMap[sc.Spec.Encryption.CephFs.StorageClassName]; ok {
+			duplicateNames = append(duplicateNames, "Encryption")
+		}
+		scMap[sc.Spec.Encryption.CephFs.StorageClassName] = true
+	}
 
 	if len(duplicateNames) > 0 {
 		return fmt.Errorf("Duplicate StorageClass name(s) provided: %v", duplicateNames)

diff --git a/controllers/storagecluster/storageclasses.go b/controllers/storagecluster/storageclasses.go
@@ -413,6 +413,20 @@ func newEncryptedCephBlockPoolStorageClassConfiguration(initData *ocsv1.StorageC
 	return encryptedStorageClassConfig
 }
 
+// newEncryptedCephFileSystemStorageClassConfiguration generates configuration options for an encrypted Ceph File System StorageClass.
+// when user has asked for PV encryption during deployment.
+func newEncryptedCephFileSystemStorageClassConfiguration(initData *ocsv1.StorageCluster, serviceName string) StorageClassConfiguration {
+	allowVolumeExpansion := true
+	encryptedStorageClassConfig := newCephFilesystemStorageClassConfiguration(initData)
+	encryptedStorageClassConfig.storageClass.ObjectMeta.Name = generateNameForEncryptedCephFileSystemSC(initData)
+	// adding a annotation to support smart cloning across namespace for encrypted volume
+	encryptedStorageClassConfig.storageClass.ObjectMeta.Annotations["cdi.kubevirt.io/clone-strategy"] = "copy"
+	encryptedStorageClassConfig.storageClass.Parameters["encrypted"] = "true"
+	encryptedStorageClassConfig.storageClass.Parameters["encryptionKMSID"] = serviceName
+	encryptedStorageClassConfig.storageClass.AllowVolumeExpansion = &allowVolumeExpansion
+	return encryptedStorageClassConfig
+}
+
 // newCephOBCStorageClassConfiguration generates configuration options for a Ceph Object Store StorageClass.
 func newCephOBCStorageClassConfiguration(initData *ocsv1.StorageCluster) StorageClassConfiguration {
 	reclaimPolicy := corev1.PersistentVolumeReclaimDelete
@@ -475,13 +489,22 @@ func (r *StorageClusterReconciler) newStorageClassConfigurations(initData *ocsv1
 	if initData.Spec.ExternalStorage.Enable || !skip {
 		ret = append(ret, newCephOBCStorageClassConfiguration(initData))
 	}
-	// encrypted Ceph Block Pool storageclass will be returned only if
-	// storage-class encryption + kms is enabled and KMS ConfigMap is available
-	if initData.Spec.Encryption.StorageClass && initData.Spec.Encryption.KeyManagementService.Enable {
+
+	if initData.Spec.Encryption.KeyManagementService.Enable {
 		kmsConfig, err := getKMSConfigMap(KMSConfigMapName, initData, r.Client)
+
 		if err == nil && kmsConfig != nil {
 			serviceName := kmsConfig.Data["KMS_SERVICE_NAME"]
-			ret = append(ret, newEncryptedCephBlockPoolStorageClassConfiguration(initData, serviceName))
+			// encrypted Ceph Block Pool storageclass will be returned only if
+			// storage-class encryption + kms is enabled and KMS ConfigMap is available
+			if initData.Spec.Encryption.StorageClass {
+				ret = append(ret, newEncryptedCephBlockPoolStorageClassConfiguration(initData, serviceName))
+			}
+			// encrypted Ceph File System storageclass will be returned only if
+			// storage-class encryption + kms is enabled and KMS ConfigMap is available
+			if initData.Spec.Encryption.CephFs.StorageClass {
+				ret = append(ret, newEncryptedCephFileSystemStorageClassConfiguration(initData, serviceName))
+			}
 		} else {
 			r.Log.Error(err, "Error while getting ConfigMap.", "ConfigMap", klog.KRef(initData.Namespace, KMSConfigMapName))
 		}

diff --git a/functests/ocs/cluster_upgrade_test.go b/functests/ocs/cluster_upgrade_test.go
@@ -78,7 +78,8 @@ func ClusterUpgradeTest() {
 					"CephFilesystems":       "custom-cephfs-sc",
 					"CephNonResilientPools": "custom-ceph-non-resilient-rbd-sc",
 					"NFS":                   "custom-ceph-nfs-sc",
-					"Encryption":            "custom-ceph-rbd-encrypted-sc",
+					"EncryptedRBD":          "custom-ceph-rbd-encrypted-sc",
+					"EncryptedCephFS":       "custom-cephfs-encrypted-sc",
 				}
 				err = deployManager.AddCustomStorageClassName(customSCName)
 				gomega.Expect(err).To(gomega.BeNil())
@@ -102,7 +103,8 @@ func ClusterUpgradeTest() {
 					"CephFilesystems":       "custom-cephfs-new-sc",
 					"CephNonResilientPools": "custom-ceph-non-resilient-rbd-new-sc",
 					"NFS":                   "custom-ceph-nfs-new-sc",
-					"Encryption":            "custom-ceph-rbd-encrypted-new-sc",
+					"EncryptionRBD":         "custom-ceph-rbd-encrypted-new-sc",
+					"EncryptionCephFS":      "custom-cephfs-encrypted-sc",
 				}
 				err = deployManager.AddCustomStorageClassName(customSCNameNew)
 				gomega.Expect(err).To(gomega.BeNil())

diff --git a/pkg/deploy-manager/storagecluster.go b/pkg/deploy-manager/storagecluster.go
@@ -473,9 +473,11 @@ func (t *DeployManager) AddCustomStorageClassName(customSCNames map[string]strin
 	}
 
 	if sc.Spec.Encryption.StorageClass && sc.Spec.Encryption.KeyManagementService.Enable {
-		sc.Spec.Encryption = ocsv1.EncryptionSpec{
-			StorageClassName: customSCNames["Encryption"],
-		}
+		sc.Spec.Encryption.StorageClassName = customSCNames["EncryptedRBD"]
+	}
+
+	if sc.Spec.Encryption.CephFs.StorageClass && sc.Spec.Encryption.KeyManagementService.Enable {
+		sc.Spec.Encryption.CephFs.StorageClassName = customSCNames["EncryptedCephFS"]
 	}
 
 	err = t.Client.Update(context.TODO(), sc)
@@ -510,6 +512,9 @@ func (t *DeployManager) VerifyStorageClassesExist(oldSC map[string]bool) (bool,
 	if sc.Spec.Encryption.StorageClassName != "" {
 		expectedSC[sc.Spec.Encryption.StorageClassName] = true
 	}
+	if sc.Spec.Encryption.CephFs.StorageClassName != "" {
+		expectedSC[sc.Spec.Encryption.CephFs.StorageClassName] = true
+	}
 
 	for name := range expectedSC {
 		if !currentSC[name] {