Giving up on the idea of automatically cleanup of the annotation with…

… operation start time
kyma-project · Aug 7, 2024 · 07fcd90 · 07fcd90
1 parent 446637d
commit 07fcd90
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/api/v1/runtime_types.go b/api/v1/runtime_types.go
@@ -331,3 +331,13 @@ func (k *Runtime) HasTimeoutElapsed(timeLimit time.Duration) bool {
 
 	return false
 }
+
+func (k *Runtime) HasRuntimeOperationTimedOut() bool {
+	if k.Status.State != RuntimeStateFailed {
+		return false
+	}
+
+	return k.IsConditionSet(ConditionTypeRuntimeProvisioned, ConditionReasonShootCreationTimeout) ||
+		k.IsConditionSet(ConditionTypeRuntimeDeprovisioned, ConditionReasonShootDeletionTimeout) ||
+		k.IsConditionSet(ConditionTypeRuntimeProvisioned, ConditionReasonShootProcessingTimeout)
+}
diff --git a/internal/controller/runtime/fsm/runtime_fsm_delete_shoot.go b/internal/controller/runtime/fsm/runtime_fsm_delete_shoot.go
@@ -18,8 +18,8 @@ func sFnDeleteShoot(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl
 	if !s.shoot.GetDeletionTimestamp().IsZero() {
 		if s.instance.HasTimeoutElapsed(m.DeprovisionTimeout) {
 			m.log.Info(fmt.Sprintf("Runtime deprovision timeout for %s", s.shoot.Name))
-			s.instance.UpdateStateDeletion(imv1.ConditionTypeRuntimeProvisioned, imv1.ConditionReasonShootDeletionTimeout, "False", "Runtime deprovisioning timeout")
-			return updateStatusAndRequeue() // Requeue to clear annotation
+			s.instance.UpdateStateDeletion(imv1.ConditionTypeRuntimeDeprovisioned, imv1.ConditionReasonShootDeletionTimeout, "False", "Runtime deprovisioning timeout")
+			return updateStatusAndStop()
 		}
 
 		m.log.Info("Waiting for shoot to be deleted", "Name", s.shoot.Name, "Namespace", s.shoot.Namespace)

diff --git a/internal/controller/runtime/fsm/runtime_fsm_initialise.go b/internal/controller/runtime/fsm/runtime_fsm_initialise.go
@@ -33,18 +33,6 @@ func sFnInitialize(ctx context.Context, m *fsm, s *systemState) (stateFn, *ctrl.
 		return updateStatusAndRequeue()
 	}
 
-	if s.instance.Status.State == imv1.RuntimeStateFailed || s.instance.Status.State == imv1.RuntimeStateReady {
-		if s.instance.Annotations != nil {
-			if val, found := s.instance.Annotations[imv1.AnnotationRuntimeOperationStarted]; found {
-				if val != "" {
-					s.instance.Annotations[imv1.AnnotationRuntimeOperationStarted] = ""
-					m.Update(ctx, &s.instance)
-					return stop()
-				}
-			}
-		}
-	}
-
 	if instanceIsNotBeingDeleted && s.shoot == nil {
 		m.log.Info("Gardener shoot does not exist, creating new one")
 		if !dryRunMode {

diff --git a/internal/controller/runtime/fsm/runtime_fsm_select_shoot_processing.go b/internal/controller/runtime/fsm/runtime_fsm_select_shoot_processing.go
@@ -27,8 +27,13 @@ func sFnSelectShootProcessing(_ context.Context, m *fsm, s *systemState) (stateF
 		return updateStatusAndRequeueAfter(gardenerRequeueDuration)
 	}
 
-	if s.instance.Status.State == imv1.RuntimeStateReady && lastOperation.State == gardener.LastOperationStateSucceeded ||
-		s.instance.Status.State == imv1.RuntimeStateFailed { // to make possible to recover from timeout during previous operation
+	if s.instance.HasRuntimeOperationTimedOut() {
+		// recovering from previous operation timeout after manual intervention
+		m.log.Info("Patching Gardener shoot after previously operation timeout")
+		return switchState(sFnPatchExistingShoot)
+	}
+
+	if s.instance.Status.State == imv1.RuntimeStateReady && lastOperation.State == gardener.LastOperationStateSucceeded {
 		// only allow to patch if full previous cycle was completed
 		m.log.Info("Gardener shoot already exists, updating")
 		return switchState(sFnPatchExistingShoot)

diff --git a/internal/controller/runtime/fsm/runtime_fsm_waiting_for_shoot_reconcile.go b/internal/controller/runtime/fsm/runtime_fsm_waiting_for_shoot_reconcile.go
@@ -14,7 +14,7 @@ func sFnWaitForShootReconcile(ctx context.Context, m *fsm, s *systemState) (stat
 	if s.instance.HasTimeoutElapsed(m.UpdateTimeout) {
 		m.log.Info(fmt.Sprintf("Shoot creation timeout for %s", s.shoot.Name))
 		s.instance.UpdateStatePending(imv1.ConditionTypeRuntimeProvisioned, imv1.ConditionReasonShootProcessingTimeout, "False", "Shoot reconcile timeout")
-		return updateStatusAndRequeue() // Requeue to clear annotation
+		return updateStatusAndStop()
 	}
 
 	switch s.shoot.Status.LastOperation.State {

diff --git a/internal/controller/runtime/fsm/runtime_fsm_waiting_shoot_creation.go b/internal/controller/runtime/fsm/runtime_fsm_waiting_shoot_creation.go
@@ -42,7 +42,7 @@ func sFnWaitForShootCreation(_ context.Context, m *fsm, s *systemState) (stateFn
 	if s.instance.HasTimeoutElapsed(m.ProvisionTimeout) {
 		m.log.Info(fmt.Sprintf("Shoot creation timeout for %s", s.shoot.Name))
 		s.instance.UpdateStatePending(imv1.ConditionTypeRuntimeProvisioned, imv1.ConditionReasonShootCreationTimeout, "False", "Shoot creation timeout")
-		return updateStatusAndRequeue() // Requeue to clear annotation
+		return updateStatusAndStop()
 	}
 
 	switch s.shoot.Status.LastOperation.State {