Skip to content

ws-manager: Add the workspace status for PodInitialzing phase #14146

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
merged 2 commits into from
Oct 25, 2022
Merged

ws-manager: Add the workspace status for PodInitialzing phase #14146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c2761b
tool: Add an allow list for gitleaks
Oct 25, 2022
fd57af9
ws-manager: Add the workspace statys for PodInitialzing phase.
Oct 25, 2022
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
4 changes: 4 additions & 0 deletions .gitleaks.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[allowlist]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the purpose of this file?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We cannot pass the precommit hooks without this file because thb golden file has a token and etc.

paths = [
'''^components/ws-manager/pkg/manager/testdata/.*\.(golden|json)$'''
]
2 changes: 1 addition & 1 deletion components/ws-manager/pkg/manager/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac
// check if any container is still pulling images
for _, cs := range status.ContainerStatuses {
if cs.State.Waiting != nil {
if cs.State.Waiting.Reason != "ContainerCreating" {
if cs.State.Waiting.Reason != "ContainerCreating" && cs.State.Waiting.Reason != "PodInitializing" {
continue
}

Expand Down
3 changes: 3 additions & 0 deletions components/ws-manager/pkg/manager/testdata/actOnPodEvent_prebuildSuccess2_CREATING02.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"actions": null
}
98 changes: 98 additions & 0 deletions components/ws-manager/pkg/manager/testdata/status_prebuildSuccess2_CREATING02.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
{
"status": {
"id": "8e0bbcdf-a926-4670-8c40-b718f035b2ae",
"status_version": 65536,
"metadata": {
"owner": "d98c5b92-2066-4fce-bea6-1e08b58642ab",
"meta_id": "green-wombat-62dzneud",
"started_at": {
"seconds": 1622206099
}
},
"spec": {
"workspace_image": "eu.gcr.io/gitpod-core-dev/registry/workspace-images:81c4fb602a540d261f210cfc8ba0435b63b24238c1762ec029d8edaec816afb6",
"deprecated_ide_image": "eu.gcr.io/gitpod-core-dev/build/ide/code:gpl-headless-log-wsman.17",
"headless": true,
"url": "https://green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com",
"exposed_ports": [
{
"port": 1337,
"visibility": 1,
"url": "https://1337-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 3000,
"visibility": 1,
"url": "https://3000-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 3001,
"visibility": 1,
"url": "https://3001-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 3306,
"visibility": 1,
"url": "https://3306-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 4000,
"visibility": 1,
"url": "https://4000-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 5900,
"visibility": 1,
"url": "https://5900-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 6080,
"url": "https://6080-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 9229,
"visibility": 1,
"url": "https://9229-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 9999,
"visibility": 1,
"url": "https://9999-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 13001,
"visibility": 1,
"url": "https://13001-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 7777,
"visibility": 1,
"url": "https://7777-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
},
{
"port": 13444,
"visibility": 1,
"url": "https://13444-green-wombat-62dzneud.ws-dev.gpl-headless-log-wsman.staging.gitpod-dev.com"
}
],
"type": 1,
"ide_image": {
"web_ref": "eu.gcr.io/gitpod-core-dev/build/ide/code:gpl-headless-log-wsman.17"
}
},
"phase": 2,
"conditions": {
"pulling_images": 1,
"volume_snapshot": {}
},
"message": "containers are being created",
"runtime": {
"node_name": "gke-dev-workload-1-49d27f81-pd35",
"pod_name": "prebuild-8e0bbcdf-a926-4670-8c40-b718f035b2ae",
"node_ip": "10.132.15.221"
},
"auth": {
"owner_token": "FZ2k9zbSCo9e85Y21yh.SHLJbya7pW2Y"
}
}
}
1 change: 1 addition & 0 deletions components/ws-manager/pkg/manager/testdata/status_prebuildSuccess2_CREATING02.json
View file
Open in desktop

Large diffs are not rendered by default.