[ws-manager-mk2] Ensure workspace enters stopped (#16479)

Author: Furisto

components/ws-daemon/pkg/controller/workspace_operations.go

@@ -86,7 +86,7 @@ func NewWorkspaceOperations(config content.Config, store *session.Store, reg pro
 func (wso *WorkspaceOperations) InitWorkspaceContent(ctx context.Context, options InitContentOptions) (bool, string, error) {
 	res, err := wso.store.NewWorkspace(
 		ctx, options.Meta.InstanceId, filepath.Join(wso.store.Location, options.Meta.InstanceId),
-		wso.creator(options.Meta.Owner, options.Meta.WorkspaceId, options.Meta.InstanceId, options.Initializer, options.Headless))
+		wso.creator(options.Meta.Owner, options.Meta.WorkspaceId, options.Meta.InstanceId, options.Initializer, false))
 	if errors.Is(err, storage.ErrNotFound) {
 		return false, "", nil
 	}

components/ws-manager-mk2/controllers/status.go

@@ -171,6 +171,10 @@ func updateWorkspaceStatus(ctx context.Context, workspace *workspacev1.Workspace
 	case workspace.IsHeadless() && (pod.Status.Phase == corev1.PodSucceeded || pod.Status.Phase == corev1.PodFailed):
 		workspace.Status.Phase = workspacev1.WorkspacePhaseStopping
 
+		if isDisposalFinished(workspace) {
+			workspace.Status.Phase = workspacev1.WorkspacePhaseStopped
+		}
+
 	case pod.Status.Phase == corev1.PodUnknown:
 		workspace.Status.Phase = workspacev1.WorkspacePhaseUnknown
 

components/ws-manager-mk2/controllers/workspace_controller.go

@@ -241,6 +241,16 @@ func (r *WorkspaceReconciler) actOnStatus(ctx context.Context, workspace *worksp
 			return ctrl.Result{Requeue: true}, err
 		}
 
+	case workspace.Status.Headless && workspace.Status.Phase == workspacev1.WorkspacePhaseStopped && !isPodBeingDeleted(pod):
+		// Workspace was requested to be deleted, propagate by deleting the Pod.
+		// The Pod deletion will then trigger workspace disposal steps.
+		err := r.Client.Delete(ctx, pod)
+		if errors.IsNotFound(err) {
+			// pod is gone - nothing to do here
+		} else {
+			return ctrl.Result{Requeue: true}, err
+		}
+
 	// we've disposed already - try to remove the finalizer and call it a day
 	case workspace.Status.Phase == workspacev1.WorkspacePhaseStopped:
 		hadFinalizer := controllerutil.ContainsFinalizer(pod, workspacev1.GitpodFinalizerName)