Add error DevWorkspace Phase and ConditionType

amisevsk · amisevsk · commit 45d962c93de8 · 2021-01-20T17:37:22.000-05:00
Add an error Phase to DevWorkspace status and a corresponding
ConditionType. The error phase is used to represent server-side errors
than impact the DevWorkspace (e.g. failed to clean up storage when
deleting a workspace).

Signed-off-by: Angel Misevski &lt;amisevsk@redhat.com&gt;
diff --git a/pkg/apis/workspaces/v1alpha1/devworkspace_types.go b/pkg/apis/workspaces/v1alpha1/devworkspace_types.go
@@ -37,6 +37,7 @@ const (
 	WorkspaceStatusStopped  WorkspacePhase = "Stopped"
 	WorkspaceStatusStopping WorkspacePhase = "Stopping"
 	WorkspaceStatusFailed   WorkspacePhase = "Failed"
+	WorkspaceStatusError    WorkspacePhase = "Error"
 )
 
 // WorkspaceCondition contains details for the current condition of this workspace.
@@ -63,6 +64,7 @@ const (
 	WorkspaceServiceAccountReady WorkspaceConditionType = "ServiceAccountReady"
 	WorkspaceReady               WorkspaceConditionType = "Ready"
 	WorkspaceFailedStart         WorkspaceConditionType = "FailedStart"
+	WorkspaceError               WorkspaceConditionType = "Error"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
diff --git a/pkg/apis/workspaces/v1alpha2/devworkspace_types.go b/pkg/apis/workspaces/v1alpha2/devworkspace_types.go
@@ -35,6 +35,7 @@ const (
 	WorkspaceStatusStopped  WorkspacePhase = "Stopped"
 	WorkspaceStatusStopping WorkspacePhase = "Stopping"
 	WorkspaceStatusFailed   WorkspacePhase = "Failed"
+	WorkspaceStatusError    WorkspacePhase = "Error"
 )
 
 // WorkspaceCondition contains details for the current condition of this workspace.
@@ -61,6 +62,7 @@ const (
 	WorkspaceServiceAccountReady WorkspaceConditionType = "ServiceAccountReady"
 	WorkspaceReady               WorkspaceConditionType = "Ready"
 	WorkspaceFailedStart         WorkspaceConditionType = "FailedStart"
+	WorkspaceError               WorkspaceConditionType = "Error"
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ const (`
`37`	`37`	`WorkspaceStatusStopped WorkspacePhase = "Stopped"`
`38`	`38`	`WorkspaceStatusStopping WorkspacePhase = "Stopping"`
`39`	`39`	`WorkspaceStatusFailed WorkspacePhase = "Failed"`
	`40`	`+ WorkspaceStatusError WorkspacePhase = "Error"`
`40`	`41`	`)`
`41`	`42`
`42`	`43`	`// WorkspaceCondition contains details for the current condition of this workspace.`
`@@ -63,6 +64,7 @@ const (`
`63`	`64`	`WorkspaceServiceAccountReady WorkspaceConditionType = "ServiceAccountReady"`
`64`	`65`	`WorkspaceReady WorkspaceConditionType = "Ready"`
`65`	`66`	`WorkspaceFailedStart WorkspaceConditionType = "FailedStart"`
	`67`	`+ WorkspaceError WorkspaceConditionType = "Error"`
`66`	`68`	`)`
`67`	`69`
`68`	`70`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ const (`
`35`	`35`	`WorkspaceStatusStopped WorkspacePhase = "Stopped"`
`36`	`36`	`WorkspaceStatusStopping WorkspacePhase = "Stopping"`
`37`	`37`	`WorkspaceStatusFailed WorkspacePhase = "Failed"`
	`38`	`+ WorkspaceStatusError WorkspacePhase = "Error"`
`38`	`39`	`)`
`39`	`40`
`40`	`41`	`// WorkspaceCondition contains details for the current condition of this workspace.`
`@@ -61,6 +62,7 @@ const (`
`61`	`62`	`WorkspaceServiceAccountReady WorkspaceConditionType = "ServiceAccountReady"`
`62`	`63`	`WorkspaceReady WorkspaceConditionType = "Ready"`
`63`	`64`	`WorkspaceFailedStart WorkspaceConditionType = "FailedStart"`
	`65`	`+ WorkspaceError WorkspaceConditionType = "Error"`
`64`	`66`	`)`
`65`	`67`
`66`	`68`	`// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object`