Simplify content ready check

WVerlaek · WVerlaek · commit b0c58b2bd30d · 2023-03-02T14:34:11.000Z
diff --git a/components/ws-manager-mk2/controllers/status.go b/components/ws-manager-mk2/controllers/status.go
@@ -188,12 +188,11 @@ func updateWorkspaceStatus(ctx context.Context, workspace *workspacev1.Workspace
 }
 
 func isDisposalFinished(ws *workspacev1.Workspace) bool {
-	c := wsk8s.GetCondition(ws.Status.Conditions, string(workspacev1.WorkspaceConditionContentReady))
-	noContentInit := c == nil || c.Status == metav1.ConditionFalse
 	return wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionBackupComplete)) ||
 		wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionBackupFailure)) ||
 		wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionAborted)) ||
-		noContentInit
+		// Nothing to dispose if content wasn't ready.
+		!wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionContentReady))
 }
 
 // extractFailure returns a pod failure reason and possibly a phase. If phase is nil then

Original file line number	Diff line number	Diff line change
`@@ -188,12 +188,11 @@ func updateWorkspaceStatus(ctx context.Context, workspace *workspacev1.Workspace`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`func isDisposalFinished(ws *workspacev1.Workspace) bool {`
`191`		`- c := wsk8s.GetCondition(ws.Status.Conditions, string(workspacev1.WorkspaceConditionContentReady))`
`192`		`- noContentInit := c == nil \|\| c.Status == metav1.ConditionFalse`
`193`	`191`	`return wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionBackupComplete)) \|\|`
`194`	`192`	`wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionBackupFailure)) \|\|`
`195`	`193`	`wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionAborted)) \|\|`
`196`		`- noContentInit`
	`194`	`+ // Nothing to dispose if content wasn't ready.`
	`195`	`+ !wsk8s.ConditionPresentAndTrue(ws.Status.Conditions, string(workspacev1.WorkspaceConditionContentReady))`
`197`	`196`	`}`
`198`	`197`
`199`	`198`	`// extractFailure returns a pod failure reason and possibly a phase. If phase is nil then`