Skip to content

[ws-manager] fix incorrect status when image pull is done #8335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roboquat merged 1 commit into from
Feb 21, 2022
Merged

[ws-manager] fix incorrect status when image pull is done #8335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions components/ws-manager/pkg/manager/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,15 +453,6 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac
result.Message = fmt.Sprintf("container %s was terminated unexpectedly - workspace is recovering", cs.Name)
return nil
}

_, neverWereReady := pod.Annotations[workspaceNeverReadyAnnotation]
if neverWereReady && !cs.Ready {
// container isn't ready yet (never has been), thus we're still in the creating phase.
result.Phase = api.WorkspacePhase_CREATING
result.Message = "containers are starting"
result.Conditions.PullingImages = api.WorkspaceConditionBool_FALSE
return nil
}
}

tpe, err := wso.WorkspaceType()
Expand Down
4 changes: 2 additions & 2 deletions components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
"url": "http://10.0.0.114:8082",
"ide_image": {}
},
"phase": 2,
"phase": 3,
"conditions": {
"failed": "container sync completed; containers of a workspace pod are not supposed to do that"
},
"message": "containers are starting",
"message": "workspace initializer is running",
"runtime": {
"node_name": "gke-gitpod-dev-worker-pool-2-184c607e-g6l3",
"pod_name": "ws-foobar",
Expand Down