fix for Requeue after adding finalizer

kyma-project · Jun 25, 2024 · a97b3d7 · a97b3d7
1 parent 7d40059
commit a97b3d7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/controller/runtime/fsm/runtime_fsm_initialise.go b/internal/controller/runtime/fsm/runtime_fsm_initialise.go
@@ -39,7 +39,7 @@ func sFnInitialize(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.
 
 	if instanceIsNotBeingDeleted && s.shoot != nil {
 		m.log.Info("Gardener shoot exists, processing")
-		return switchState(sFnPrepareCluster) // wait for operation to complete
+		return switchState(sFnPrepareCluster) // wait for pending shoot operation to complete
 	}
 
 	if !instanceIsNotBeingDeleted && instanceHasFinalizer && s.shoot != nil {
@@ -62,7 +62,7 @@ func addFinalizerAndRequeue(ctx context.Context, m *fsm, s *systemState) (stateF
 	if err != nil {
 		return stopWithErrorAndNoRequeue(err)
 	}
-	return nil, nil, nil
+	return nil, &ctrl.Result{Requeue: true}, nil
 }
 
 func removeFinalizerAndStop(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.Result, error) {

diff --git a/internal/controller/runtime/suite_test.go b/internal/controller/runtime/suite_test.go
@@ -172,7 +172,7 @@ func fixGardenerShootsForProvisioning(shoot *gardener_api.Shoot) []*gardener_api
 
 	//processedShoot := processingShoot.DeepCopy() // will add specific data later
 
-	return []*gardener_api.Shoot{missingShoot, missingShoot, initialisedShoot, processingShoot, readyShoot, readyShoot, readyShoot, readyShoot}
+	return []*gardener_api.Shoot{missingShoot, missingShoot, missingShoot, initialisedShoot, processingShoot, readyShoot, readyShoot, readyShoot, readyShoot}
 }
 
 func fixConverterConfigForTests() gardener_shoot.ConverterConfig {