From 85b6b3c5d6f84f9ae619efc78be53b191a1d04e2 Mon Sep 17 00:00:00 2001
From: Aleksandr Zimin <alexandr.zimin@flant.com>
Date: Wed, 8 May 2024 14:13:13 +0300
Subject: [PATCH] some fixes

Signed-off-by: Aleksandr Zimin <alexandr.zimin@flant.com>
---
 .../controller/nfs_storage_class_watcher.go   | 46 +++++--------------
 images/webhooks/src/handlers/scValidator.go   |  2 +-
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/images/controller/pkg/controller/nfs_storage_class_watcher.go b/images/controller/pkg/controller/nfs_storage_class_watcher.go
index 1d1f80cf..2f672ea5 100644
--- a/images/controller/pkg/controller/nfs_storage_class_watcher.go
+++ b/images/controller/pkg/controller/nfs_storage_class_watcher.go
@@ -353,37 +353,8 @@ func reconcileStorageClassCreateFunc(
 	if created {
 		log.Info(fmt.Sprintf("[reconcileStorageClassCreateFunc] successfully create storage class, name: %s", newSC.Name))
 	} else {
-		log.Info(fmt.Sprintf("[reconcileStorageClassCreateFunc] a storage class %s already exists", newSC.Name))
-		diff := ""
-		for _, oldSC := range scList.Items {
-			if oldSC.Name == newSC.Name {
-				diff, err = GetSCDiff(&oldSC, newSC)
-				break
-			}
-		}
-		if err != nil {
-			log.Error(err, fmt.Sprintf("[reconcileStorageClassCreateFunc] Error occured while identifying the difference between the existed StorageClass %s and the new one", newSC.Name))
-			upError := updateNFSStorageClassPhase(ctx, cl, nsc, FailedStatusPhase, err.Error())
-			if upError != nil {
-				log.Error(upError, fmt.Sprintf("[reconcileStorageClassCreateFunc] unable to update the NFSStorageClass %s", nsc.Name))
-			}
-			return true, err
-		}
-		if diff != "" {
-			log.Info(fmt.Sprintf("[reconcileStorageClassCreateFunc] current Storage Class %s differs from the NFSStorageClass one. The Storage Class will be recreated", newSC.Name))
-			err := recreateStorageClass(ctx, cl, newSC)
-			if err != nil {
-				log.Error(err, fmt.Sprintf("[reconcileStorageClassCreateFunc] unable to recreate a Storage Class %s", newSC.Name))
-				upError := updateNFSStorageClassPhase(ctx, cl, nsc, FailedStatusPhase, err.Error())
-				if upError != nil {
-					log.Error(upError, fmt.Sprintf("[reconcileStorageClassCreateFunc] unable to update the NFSStorageClass %s", nsc.Name))
-				}
-				return true, err
-			}
-			log.Info(fmt.Sprintf("[reconcileStorageClassCreateFunc] a Storage Class %s was successfully recreated", newSC.Name))
-		} else {
-			log.Info(fmt.Sprintf("[reconcileStorageClassCreateFunc] the Storage Class %s is up-to-date", newSC.Name))
-		}
+		log.Warning(fmt.Sprintf("[reconcileLSCCreateFunc] Storage class %s already exists. Adding event to requeue.", newSC.Name))
+		return true, nil
 	}
 
 	return false, nil
@@ -434,7 +405,7 @@ func reconcileStorageClassUpdateFunc(
 	if diff != "" {
 		log.Info(fmt.Sprintf("[reconcileStorageClassUpdateFunc] current Storage Class LVMVolumeGroups do not match NFSStorageClass ones. The Storage Class %s will be recreated with new ones", nsc.Name))
 
-		err = recreateStorageClass(ctx, cl, newSC)
+		err = recreateStorageClass(ctx, cl, oldSC, newSC)
 		if err != nil {
 			log.Error(err, fmt.Sprintf("[reconcileStorageClassUpdateFunc] unable to recreate a Storage Class %s", newSC.Name))
 			upError := updateNFSStorageClassPhase(ctx, cl, nsc, FailedStatusPhase, err.Error())
@@ -622,14 +593,19 @@ func updateNFSStorageClassPhase(ctx context.Context, cl client.Client, nsc *v1al
 	return nil
 }
 
-func recreateStorageClass(ctx context.Context, cl client.Client, sc *v1.StorageClass) error {
-	err := deleteStorageClass(ctx, cl, sc)
+func recreateStorageClass(ctx context.Context, cl client.Client, oldSC, newSC *v1.StorageClass) error {
+	// It is necessary to pass the original StorageClass to the delete operation because
+	// the deletion will not succeed if the fields in the StorageClass provided to delete
+	// differ from those currently in the cluster.
+	err := deleteStorageClass(ctx, cl, oldSC)
 	if err != nil {
+		err = fmt.Errorf("[recreateStorageClass] unable to delete a storage class %s: %s", oldSC.Name, err.Error())
 		return err
 	}
 
-	err = cl.Create(ctx, sc)
+	err = cl.Create(ctx, newSC)
 	if err != nil {
+		err = fmt.Errorf("[recreateStorageClass] unable to create a storage class %s: %s", newSC.Name, err.Error())
 		return err
 	}
 
diff --git a/images/webhooks/src/handlers/scValidator.go b/images/webhooks/src/handlers/scValidator.go
index 3ad1ea05..e2363174 100644
--- a/images/webhooks/src/handlers/scValidator.go
+++ b/images/webhooks/src/handlers/scValidator.go
@@ -47,7 +47,7 @@ func SCValidate(ctx context.Context, arReview *model.AdmissionReview, obj metav1
 				nil
 		} else {
 			klog.Infof("User %s is not allowed to manage storage classes with provisioner %s", arReview.UserInfo.Username, NFSStorageClassProvisioner)
-			return &kwhvalidating.ValidatorResult{Valid: false, Message: fmt.Sprintf("Manual operations with StorageClass with provisioner %s are not allowed. Please use NFSStorageClass instead.", NFSStorageClassProvisioner)},
+			return &kwhvalidating.ValidatorResult{Valid: false, Message: fmt.Sprintf("Manual operations with the StorageClass that uses the %s provisioner are not allowed. Please use NFSStorageClass instead.", NFSStorageClassProvisioner)},
 				nil
 		}
 	} else {