[ws-manager-mk2] include nodeName on failure (#20252)

kylos101 · web-flow · commit ca933cb63bda · 2024-10-02T08:31:18.000-04:00
diff --git a/components/ws-manager-mk2/controllers/status.go b/components/ws-manager-mk2/controllers/status.go
@@ -124,8 +124,12 @@ func (r *WorkspaceReconciler) updateWorkspaceStatus(ctx context.Context, workspa
 	}
 
 	if failure != "" && !workspace.IsConditionTrue(workspacev1.WorkspaceConditionFailed) {
+		var nodeName string
+		if workspace.Status.Runtime != nil {
+			nodeName = workspace.Status.Runtime.NodeName
+		}
 		// workspaces can fail only once - once there is a failed condition set, stick with it
-		log.Info("workspace failed", "workspace", workspace.Name, "reason", failure)
+		log.Info("workspace failed", "workspace", workspace.Name, "node", nodeName, "reason", failure)
 		workspace.Status.SetCondition(workspacev1.NewWorkspaceConditionFailed(failure))
 		r.Recorder.Event(workspace, corev1.EventTypeWarning, "Failed", failure)
 	}

Original file line number	Diff line number	Diff line change
`@@ -124,8 +124,12 @@ func (r *WorkspaceReconciler) updateWorkspaceStatus(ctx context.Context, workspa`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if failure != "" && !workspace.IsConditionTrue(workspacev1.WorkspaceConditionFailed) {`
	`127`	`+ var nodeName string`
	`128`	`+ if workspace.Status.Runtime != nil {`
	`129`	`+ nodeName = workspace.Status.Runtime.NodeName`
	`130`	`+ }`
`127`	`131`	`// workspaces can fail only once - once there is a failed condition set, stick with it`
`128`		`- log.Info("workspace failed", "workspace", workspace.Name, "reason", failure)`
	`132`	`+ log.Info("workspace failed", "workspace", workspace.Name, "node", nodeName, "reason", failure)`
`129`	`133`	`workspace.Status.SetCondition(workspacev1.NewWorkspaceConditionFailed(failure))`
`130`	`134`	`r.Recorder.Event(workspace, corev1.EventTypeWarning, "Failed", failure)`
`131`	`135`	`}`