Merge pull request #114 from nbalacha/sc-name

fix: renamed storageclass to remove topolvm
openshift · Feb 21, 2022 · 747268e · 747268e
2 parents 3b3bac0 + 1ed0e13
commit 747268e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/controllers/lvmcluster_controller_test.go b/controllers/lvmcluster_controller_test.go
@@ -75,7 +75,7 @@ var _ = Describe("LVMCluster controller", func() {
 	scNames := []types.NamespacedName{}
 	for _, deviceClass := range lvmClusterIn.Spec.Storage.DeviceClasses {
 		scNames = append(scNames, types.NamespacedName{
-			Name: fmt.Sprintf("topolvm-%s", deviceClass.Name),
+			Name: fmt.Sprintf("odf-lvm-%s", deviceClass.Name),
 		},
 		)
 	}

diff --git a/controllers/topolvm_storageclass.go b/controllers/topolvm_storageclass.go
@@ -51,7 +51,7 @@ func (s topolvmStorageClass) ensureDeleted(r *LVMClusterReconciler, ctx context.
 	// delete the corresponding storage class
 	for _, deviceClass := range lvmCluster.Spec.Storage.DeviceClasses {
 		sc := &storagev1.StorageClass{}
-		scName := fmt.Sprintf("topolvm-%s", deviceClass.Name)
+		scName := fmt.Sprintf("odf-lvm-%s", deviceClass.Name)
 		err := r.Client.Get(ctx, types.NamespacedName{Name: scName}, sc)
 
 		if err != nil {
@@ -93,7 +93,7 @@ func getTopolvmStorageClasses(lvmCluster *lvmv1alpha1.LVMCluster) []*storagev1.S
 	for _, deviceClass := range lvmCluster.Spec.Storage.DeviceClasses {
 		storageClass := &storagev1.StorageClass{
 			ObjectMeta: metav1.ObjectMeta{
-				Name: fmt.Sprintf("topolvm-%s", deviceClass.Name),
+				Name: fmt.Sprintf("odf-lvm-%s", deviceClass.Name),
 				Annotations: map[string]string{
 					"description": "Provides RWO and RWOP Filesystem & Block volumes",
 				},