Add some tests

Signed-off-by: Aleksandr Zimin <alexandr.zimin@flant.com>
deckhouse · May 26, 2024 · 34cba03 · 34cba03
1 parent e5150e5
commit 34cba03
Show file tree

Hide file tree

Showing 3 changed files with 362 additions and 142 deletions.
diff --git a/images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher.go b/images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher.go
@@ -166,7 +166,11 @@ func RunLocalStorageClassWatcherController(
 func RunEventReconcile(ctx context.Context, cl client.Client, log logger.Logger, scList *v1.StorageClassList, lsc *v1alpha1.LocalStorageClass) (bool, error) {
 	recType, err := identifyReconcileFunc(scList, lsc)
 	if err != nil {
-		log.Error(err, fmt.Sprintf("[runEventReconcile] unable to identify reconcile func for the LocalStorageClass %s", lsc.Name))
+		upError := updateLocalStorageClassPhase(ctx, cl, lsc, FailedStatusPhase, err.Error())
+		if upError != nil {
+			upError = fmt.Errorf("[runEventReconcile] unable to update the LocalStorageClass %s status: %w", lsc.Name, upError)
+			err = errors.Join(err, upError)
+		}
 		return true, err
 	}
 

diff --git a/images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher_func.go b/images/sds-local-volume-controller/pkg/controller/local_storage_class_watcher_func.go
@@ -228,7 +228,7 @@ func shouldReconcileByUpdateFunc(scList *v1.StorageClassList, lsc *v1alpha1.Loca
 				return false, nil
 
 			} else {
-				err := fmt.Errorf("a storage class %s does not belong to %s provisioner", sc.Name, LocalStorageClassProvisioner)
+				err := fmt.Errorf("a storage class %s already exists and does not belong to %s provisioner", sc.Name, LocalStorageClassProvisioner)
 				return false, err
 			}
 		}
@@ -473,6 +473,10 @@ func updateLocalStorageClassPhase(
 	lsc.Status.Phase = phase
 	lsc.Status.Reason = reason
 
+	if !slices.Contains(lsc.Finalizers, LocalStorageClassFinalizerName) {
+		lsc.Finalizers = append(lsc.Finalizers, LocalStorageClassFinalizerName)
+	}
+
 	// TODO: add retry logic
 	err := cl.Update(ctx, lsc)
 	if err != nil {