Revert "[ws-manager] do not overwrite failed state"

This reverts commit 96c136f.

Author: iQQBot

components/ws-manager/pkg/manager/status.go

@@ -350,7 +350,11 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac
 		result.Phase = api.WorkspacePhase_STOPPING
 
 		_, podFailedBeforeBeingStopped := pod.Annotations[workspaceFailedBeforeStoppingAnnotation]
-		if podFailedBeforeBeingStopped {
+		if !podFailedBeforeBeingStopped {
+			// While the pod is being deleted we do not care or want to know about any failure state.
+			// If the pod got stopped because it failed we will have sent out a Stopping status with a "failure"
+			result.Conditions.Failed = ""
+		} else {
 			if _, ok := pod.Annotations[workspaceNeverReadyAnnotation]; ok {
 				// The workspace is never ready, so there is no need for a stopping phase.
 				result.Phase = api.WorkspacePhase_STOPPED

components/ws-manager/pkg/manager/testdata/status_containerd4214_STOPPING00.golden

@@ -20,7 +20,6 @@
         },
         "phase": 6,
         "conditions": {
-            "failed": "container workspace completed; containers of a workspace pod are not supposed to do that. Reason: ",
             "final_backup_complete": 1,
             "volume_snapshot": {}
         },

components/ws-manager/pkg/manager/testdata/status_disposal_STOPPED01.golden

@@ -20,7 +20,7 @@
         },
         "phase": 6,
         "conditions": {
-            "failed": "ungraceful shutdown - teardown was unsuccessful: socket did not appear before context was canceled; last backup failed: testing the backup failure mode.",
+            "failed": "last backup failed: testing the backup failure mode.",
             "final_backup_complete": 1,
             "volume_snapshot": {}
         },

components/ws-manager/pkg/manager/testdata/status_disposal_STOPPING02.golden

@@ -20,7 +20,6 @@
         },
         "phase": 6,
         "conditions": {
-            "failed": "ungraceful shutdown - teardown was unsuccessful: socket did not appear before context was canceled",
             "final_backup_complete": 1,
             "volume_snapshot": {}
         },