[ws-manager] Properly stop all headless workspaces

not just prebuilds

Author: csweichel

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

@@ -576,12 +576,6 @@ func extractFailure(wso workspaceObjects) (string, *api.WorkspacePhase) {
 		return reason, nil
 	}
 
-	tpe, err := wso.WorkspaceType()
-	if err != nil {
-		log.WithError(err).Warn("cannot determine workspace type - assuming this is a regular")
-		tpe = api.WorkspaceType_REGULAR
-	}
-
 	status := pod.Status
 	if status.Phase == corev1.PodFailed && (status.Reason != "" || status.Message != "") {
 		// Don't force the phase to UNKNONWN here to leave a chance that we may detect the actual phase of
@@ -621,8 +615,8 @@ func extractFailure(wso workspaceObjects) (string, *api.WorkspacePhase) {
 					return fmt.Sprintf("container %s ran with an error: exit code %d", cs.Name, terminationState.ExitCode), nil
 				}
 			} else if terminationState.Reason == "Completed" {
-				if tpe == api.WorkspaceType_PREBUILD {
-					// default way for prebuilds to be done
+				if wso.IsWorkspaceHeadless() {
+					// default way for headless workspaces to be done
 					return "", nil
 				}
 				return fmt.Sprintf("container %s completed; containers of a workspace pod are not supposed to do that", cs.Name), nil

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

@@ -0,0 +1,38 @@
+{
+    "status": {
+        "id": "0dd5700a790e7ca2-95291c91f6e61c2e-e06ba50b",
+        "metadata": {
+            "owner": "image-builder",
+            "meta_id": "0dd5700a790e7ca2-95291c91f6e61c2e-e06ba50b",
+            "started_at": {
+                "seconds": 1626883365
+            },
+            "annotations": {
+                "baseref": "eu.gcr.io/gitpod-core-dev/registry/base-images:d04c64d5d108632a1768e4af9c3a8a3e6a87c96d2566fb1b0d1aec2fd630e8bd",
+                "ref": "eu.gcr.io/gitpod-core-dev/registry/workspace-images:a277dab62e839192eb320da283d4e8488a2b2f46fceb4677a7d571431e239aa5"
+            }
+        },
+        "spec": {
+            "workspace_image": "eu.gcr.io/gitpod-core-dev/build/image-builder-mk3/bob:2cf747867ff804ee0edc0a2607cb8ca06242083a",
+            "ide_image": "eu.gcr.io/gitpod-core-dev/build/image-builder-mk3/bob:2cf747867ff804ee0edc0a2607cb8ca06242083a",
+            "headless": true,
+            "url": "https://0dd5700a790e7ca2-95291c91f6e61c2e-e06ba50b.ws-dev.cw-imgbuilder-mk3-rebase.staging.gitpod-dev.com",
+            "type": 4,
+            "timeout": "1h0m0s"
+        },
+        "phase": 5,
+        "conditions": {
+            "service_exists": 1,
+            "deployed": 1
+        },
+        "message": "headless workspace is stopping",
+        "runtime": {
+            "node_name": "gke-dev-workload-1-49d27f81-8s5c",
+            "pod_name": "imagebuild-0dd5700a790e7ca2-95291c91f6e61c2e-e06ba50b",
+            "node_ip": "10.132.0.17"
+        },
+        "auth": {
+            "owner_token": "osZStmqg3TI0NrkLe3edax9bYCknXWtr"
+        }
+    }
+}