Refactor and fix

kyma-project · Sep 5, 2024 · 25f37f3 · 25f37f3
1 parent 08cc2d7
commit 25f37f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/internal/controller/runtime/fsm/runtime_fsm_configure_auditlog.go b/internal/controller/runtime/fsm/runtime_fsm_configure_auditlog.go
@@ -32,14 +32,13 @@ func sFnConfigureAuditLog(ctx context.Context, m *fsm, s *systemState) (stateFn,
 			"False",
 			err.Error(),
 		)
-		return updateStatusAndRequeueAfter(gardenerRequeueDuration)
+	} else {
+		s.instance.UpdateStateReady(
+			imv1.ConditionTypeAuditLogConfigured,
+			imv1.ConditionReasonAuditLogConfigured,
+			"Audit Log configured successfully",
+		)
 	}
 
-	s.instance.UpdateStateReady(
-		imv1.ConditionTypeAuditLogConfigured,
-		imv1.ConditionReasonAuditLogConfigured,
-		"Audit Log configured successfully",
-	)
-
 	return updateStatusAndStop()
 }
diff --git a/internal/controller/runtime/fsm/runtime_fsm_configure_auditlog_test.go b/internal/controller/runtime/fsm/runtime_fsm_configure_auditlog_test.go
@@ -84,7 +84,7 @@ func TestAuditLogState(t *testing.T) {
 		assert.Equal(t, expectedRuntimeConditions, systemState.instance.Status.Conditions)
 	})
 
-	t.Run("Should requeue in case of error during configuration and set status on Runtime CR", func(t *testing.T) {
+	t.Run("Should stop in case of error during configuration and set status on Runtime CR", func(t *testing.T) {
 		// given
 		ctx := context.Background()
 		auditLog := &mocks.AuditLogging{}

diff --git a/internal/controller/runtime/fsm/runtime_fsm_waiting_shoot_creation.go b/internal/controller/runtime/fsm/runtime_fsm_waiting_shoot_creation.go
@@ -31,7 +31,7 @@ func sFnWaitForShootCreation(_ context.Context, m *fsm, s *systemState) (stateFn
 	m.log.Info("Waiting for shoot creation state")
 
 	switch s.shoot.Status.LastOperation.State {
-	case gardener.LastOperationStateProcessing, gardener.LastOperationStatePending, gardener.LastOperationStateAborted:
+	case gardener.LastOperationStateProcessing, gardener.LastOperationStatePending, gardener.LastOperationStateAborted, gardener.LastOperationStateError:
 		m.log.Info(fmt.Sprintf("Shoot %s is in %s state, scheduling for retry", s.shoot.Name, s.shoot.Status.LastOperation.State))
 
 		s.instance.UpdateStatePending(