[ws-manager] don't ever set PodRejected if WorkspaceConditionEverRead…

…y=true (#20372)
gitpod-io · Nov 15, 2024 · 355ece1 · 355ece1
1 parent 99cc66b
commit 355ece1
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/components/ws-manager-mk2/controllers/status.go b/components/ws-manager-mk2/controllers/status.go
@@ -143,10 +143,14 @@ func (r *WorkspaceReconciler) updateWorkspaceStatus(ctx context.Context, workspa
 	if failure != "" && !workspace.IsConditionTrue(workspacev1.WorkspaceConditionPodRejected) {
 		// Check: A situation where we want to retry?
 		if isPodRejected(pod) {
-			// This is a situation where we want to re-create the pod!
-			log.Info("workspace scheduling failed", "workspace", workspace.Name, "reason", failure)
-			workspace.Status.SetCondition(workspacev1.NewWorkspaceConditionPodRejected(failure, metav1.ConditionTrue))
-			r.Recorder.Event(workspace, corev1.EventTypeWarning, "PodRejected", failure)
+			if !workspace.IsConditionTrue(workspacev1.WorkspaceConditionEverReady) {
+				// This is a situation where we want to re-create the pod!
+				log.Info("workspace got rejected", "workspace", workspace.Name, "reason", failure)
+				workspace.Status.SetCondition(workspacev1.NewWorkspaceConditionPodRejected(failure, metav1.ConditionTrue))
+				r.Recorder.Event(workspace, corev1.EventTypeWarning, "PodRejected", failure)
+			} else {
+				log.Info("workspace got rejected, but we don't handle it, because EveryReady=true", "workspace", workspace.Name, "reason", failure)
+			}
 		}
 	}