Skip to content

Commit bec8713

Browse files
authored
[ws-manager-mk2] Remove headless field (#16611)
1 parent cf0dd55 commit bec8713

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

components/ws-manager-api/go/crd/v1/workspace_types.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ type PortSpec struct {
116116
// WorkspaceStatus defines the observed state of Workspace
117117
type WorkspaceStatus struct {
118118
PodStarts int `json:"podStarts"`
119-
Headless bool `json:"headless"`
120119
URL string `json:"url,omitempty"`
121120
OwnerToken string `json:"ownerToken,omitempty"`
122121

components/ws-manager-mk2/config/crd/bases/workspace.gitpod.io_workspaces.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,6 @@ spec:
501501
type: string
502502
type: array
503503
type: object
504-
headless:
505-
type: boolean
506504
ownerToken:
507505
type: string
508506
phase:
@@ -538,7 +536,6 @@ spec:
538536
url:
539537
type: string
540538
required:
541-
- headless
542539
- podStarts
543540
type: object
544541
type: object

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func (r *WorkspaceReconciler) actOnStatus(ctx context.Context, workspace *worksp
219219
case isWorkspaceBeingDeleted(workspace) && !isPodBeingDeleted(pod):
220220
return r.deleteWorkspacePod(ctx, pod, "workspace deleted")
221221

222-
case workspace.Status.Headless && workspace.Status.Phase == workspacev1.WorkspacePhaseStopped && !isPodBeingDeleted(pod):
222+
case workspace.IsHeadless() && workspace.Status.Phase == workspacev1.WorkspacePhaseStopped && !isPodBeingDeleted(pod):
223223
// Workspace was requested to be deleted, propagate by deleting the Pod.
224224
// The Pod deletion will then trigger workspace disposal steps.
225225
err := r.Client.Delete(ctx, pod)

0 commit comments

Comments
 (0)