diff --git a/components/ws-manager/pkg/manager/status.go b/components/ws-manager/pkg/manager/status.go index 016addbe8469af..346cde423c3695 100644 --- a/components/ws-manager/pkg/manager/status.go +++ b/components/ws-manager/pkg/manager/status.go @@ -502,7 +502,7 @@ func (m *Manager) extractStatusFromPod(result *api.WorkspaceStatus, wso workspac return nil } - // the pod phase of pending is somtimes slipped because it may not be PENDING at the stage of retrieving information on the workspace pod. + // the pod phase of pending is sometimes slipped because it may not be PENDING at the stage of retrieving information on the workspace pod. if !wso.AlreadyInitializing() { result.Phase = api.WorkspacePhase_CREATING result.Message = "pod is running but init has not started yet or is not finished" diff --git a/components/ws-manager/pkg/manager/testdata/actOnPodEvent_wsstartup_Creating01.golden b/components/ws-manager/pkg/manager/testdata/actOnPodEvent_wsstartup_Creating01.golden new file mode 100644 index 00000000000000..5981ded50b76f0 --- /dev/null +++ b/components/ws-manager/pkg/manager/testdata/actOnPodEvent_wsstartup_Creating01.golden @@ -0,0 +1,3 @@ +{ + "actions": null +} diff --git a/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json b/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json index 37c43e69d0eea4..edc9adb3899137 100644 --- a/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json +++ b/components/ws-manager/pkg/manager/testdata/status_firstUserActivity_RUNNING.json @@ -26,6 +26,7 @@ "gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z", "gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f", "gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com", "gitpod/exposedPorts": "CgUIuQoYAQoFCLgXGAEKBQi5FxgBCgUIoB8YAQoFCI1IGAEKBQiMLhgBCgUIwC8YAQoFCI9OGAEKBQjJZRgBCgUI4TwYAQoFCIRpGAE=", diff --git a/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json b/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json index 3ed90726cacb43..b596437f3413f6 100644 --- a/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json +++ b/components/ws-manager/pkg/manager/testdata/status_imagespec_RUNNING00.json @@ -27,6 +27,7 @@ "gitpod/firstUserActivity": "2020-03-09T15:31:26.855961185Z", "gitpod/id": "27e46234-5004-44c1-a2e8-56d68ac3c70b", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "db334047-3c4b-49cc-a5fb-a089bff656e0", "gitpod/url": "http://db334047-3c4b-49cc-a5fb-a089bff656e0.ws-dev.cw-registry.staging.gitpod-dev.com", "gitpod/exposedPorts": "CgUIkD8YAQ==", diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted.json b/components/ws-manager/pkg/manager/testdata/status_interrupted.json index ca5e8cc5865620..cca7b79e38e61c 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted.json +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted.json @@ -24,6 +24,7 @@ "gitpod/contentInitializer": "[redacted]", "gitpod/id": "283522ed-51f1-4838-951b-0f115c0a7aae", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "b246b28e-4776-47d5-961d-10548ffac9a8", "gitpod/url": "https://b246b28e-4776-47d5-961d-10548ffac9a8.ws-eu0.gitpod-staging.com", "gitpod/exposedPorts": "CgMIjC4KAwiQPw==", diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json b/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json index f2489ad48b71b8..092833e2d97bcd 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_CREATING00.json @@ -23,6 +23,7 @@ "gitpod/contentInitializer": "[redacted]", "gitpod/id": "4bf2e82d-cdc7-4764-b8ad-6973e3c4a629", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "f75a430d-331d-4977-a4dc-16939c0752e1", "gitpod/url": "http://f75a430d-331d-4977-a4dc-16939c0752e1.ws-eu.cw-gh-2720.staging.gitpod.io" } diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json index 79aea8c408cadf..9baf192c805c42 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_1_event_only.json @@ -25,6 +25,7 @@ "gitpod/customTimeout": "30m", "gitpod/id": "da9ffbf1-a12d-4a58-8593-475394eedb00", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "c0eabd01-6315-4fc4-8f60-1b008e100743", "gitpod/url": "https://c0eabd01-6315-4fc4-8f60-1b008e100743.ws-eu01.gitpod.io", "gitpod/exposedPorts": "CgUIuBcYAQ==", diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json index 583cc47e67dff9..c07277f1b339fd 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_2_event_and_exitcode.json @@ -25,6 +25,7 @@ "gitpod/customTimeout": "30m", "gitpod/id": "0c5a8ef3-052b-44a7-b11c-3542a0928076", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "d6427c17-62b8-4bb5-a974-f97f77b370dc", "gitpod/url": "https://d6427c17-62b8-4bb5-a974-f97f77b370dc.ws-eu01.gitpod.io", "gitpod/exposedPorts": "CgUIkD8YAQ==", diff --git a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json index 4044f7641ff419..7aa258c8b70c1b 100644 --- a/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json +++ b/components/ws-manager/pkg/manager/testdata/status_interrupted_networkNotReady_3_recovered_CONSTRUCTED.json @@ -25,6 +25,7 @@ "gitpod/customTimeout": "30m", "gitpod/id": "0c5a8ef3-052b-44a7-b11c-3542a0928076", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "d6427c17-62b8-4bb5-a974-f97f77b370dc", "gitpod/url": "https://d6427c17-62b8-4bb5-a974-f97f77b370dc.ws-eu01.gitpod.io", "gitpod/exposedPorts": "CgUIkD8YAQ==", diff --git a/components/ws-manager/pkg/manager/testdata/status_metadata.json b/components/ws-manager/pkg/manager/testdata/status_metadata.json index 6b55b9b29e8c8c..8d29803bf72945 100644 --- a/components/ws-manager/pkg/manager/testdata/status_metadata.json +++ b/components/ws-manager/pkg/manager/testdata/status_metadata.json @@ -20,6 +20,7 @@ "gitpod/id": "foobas", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082", + "gitpod.io/alreadyInitializing": "true", "gitpod/exposedPorts": "CgMIkD8=" } }, diff --git a/components/ws-manager/pkg/manager/testdata/status_ownerToken.json b/components/ws-manager/pkg/manager/testdata/status_ownerToken.json index c5c5e40bdab212..c1bf4d13d47010 100644 --- a/components/ws-manager/pkg/manager/testdata/status_ownerToken.json +++ b/components/ws-manager/pkg/manager/testdata/status_ownerToken.json @@ -25,6 +25,7 @@ "gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z", "gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f", "gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com", "gitpod/exposedPorts": "CgUIuQoYAQoFCLgXGAEKBQi5FxgBCgUIoB8YAQoFCI1IGAEKBQiMLhgBCgUIwC8YAQoFCI9OGAEKBQjJZRgBCgUI4TwYAQoFCIRpGAE=", diff --git a/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json b/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json index ca5d23b8da5ba4..b57b5d46e9b1d8 100644 --- a/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json +++ b/components/ws-manager/pkg/manager/testdata/status_regularStart_Initializing00.json @@ -19,6 +19,7 @@ "gitpod/id": "foobas", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082", + "gitpod.io/alreadyInitializing": "true", "gitpod/never-ready": "true" } }, diff --git a/components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json b/components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json index 623dec412a45ce..adf808282a741f 100644 --- a/components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json +++ b/components/ws-manager/pkg/manager/testdata/status_stoppedByRequest_000_RUNNING00.json @@ -31,6 +31,7 @@ "gitpod/contentInitializer": "[redacted]", "gitpod/exposedPorts": "ClEIuBciTGh0dHBzOi8vMzAwMC1saW1lLW9wb3NzdW0tM2pmdGY2NWkud3MtZGV2LmN3LWZpeC02MjEzLnN0YWdpbmcuZ2l0cG9kLWRldi5jb20KUwiJ0wEiTWh0dHBzOi8vMjcwMTctbGltZS1vcG9zc3VtLTNqZnRmNjVpLndzLWRldi5jdy1maXgtNjIxMy5zdGFnaW5nLmdpdHBvZC1kZXYuY29tClEIjUgiTGh0dHBzOi8vOTIyOS1saW1lLW9wb3NzdW0tM2pmdGY2NWkud3MtZGV2LmN3LWZpeC02MjEzLnN0YWdpbmcuZ2l0cG9kLWRldi5jb20=", "gitpod/customTimeout": "60m", + "gitpod.io/alreadyInitializing": "true", "gitpod/firstUserActivity": "2021-10-14T19:11:43.983492544Z", "gitpod/id": "18f99de5-090f-4318-9759-05f5ef0277f7", "gitpod/imageSpec": "CnRldS5nY3IuaW8vZ2l0cG9kLWNvcmUtZGV2L3JlZ2lzdHJ5L3dvcmtzcGFjZS1pbWFnZXM6M2JkNWNlMTJmN2FjZDFmZjE5NDk0YTI1YWEyZmYwMWZmOWE3YjkzODU2N2M4NGQ1MmNlNmFhMGIyYmQ0MDA5MhJYZXUuZ2NyLmlvL2dpdHBvZC1jb3JlLWRldi9idWlsZC9pZGUvY29kZTpjb21taXQtNzEwN2ZiOGJkZTBiMWY5MjI2NTQwMmFkNWZhMDlhNTEwMjJiMTRkZA==", diff --git a/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden b/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden index e476ec2d591232..d1cc429da3671e 100644 --- a/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden +++ b/components/ws-manager/pkg/manager/testdata/status_stuckInCreating_CREATING00.golden @@ -15,11 +15,12 @@ "timeout": "30m", "ide_image": {} }, - "phase": 4, + "phase": 2, "conditions": { "timeout": "workspace timed out after I've meddled with this test data set", "volume_snapshot": {} }, + "message": "pod is running but init has not started yet or is not finished", "runtime": { "node_name": "gke-production--gitp-workspace-pool-2-a3afc0b4-tmz8", "pod_name": "ws-2513d0b4-3c18-4735-b32e-1bbdead24b78", diff --git a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json index b2fdc9dcdadf8a..328e5928c6ee4e 100644 --- a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json +++ b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating00.json @@ -19,6 +19,7 @@ "gitpod/id": "foobar", "gitpod/servicePrefix": "foobar", "gitpod/url": "http://10.0.0.114:8082", + "gitpod.io/alreadyInitializing": "true", "gitpod/never-ready": "true" } }, diff --git a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.golden b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.golden new file mode 100644 index 00000000000000..ca90be0c55a52e --- /dev/null +++ b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.golden @@ -0,0 +1,29 @@ +{ + "status": { + "id": "foobas", + "status_version": 65536, + "metadata": { + "owner": "foobar", + "meta_id": "metameta", + "started_at": { + "seconds": 1552236488 + } + }, + "spec": { + "workspace_image": "nginx:latest", + "url": "http://10.0.0.114:8082", + "ide_image": {} + }, + "phase": 2, + "conditions": { + "volume_snapshot": {} + }, + "message": "pod is running but init has not started yet or is not finished", + "runtime": { + "node_name": "minikube", + "pod_name": "ws-foobas", + "node_ip": "10.0.2.15" + }, + "auth": {} + } +} diff --git a/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.json b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.json new file mode 100644 index 00000000000000..ca5d23b8da5ba4 --- /dev/null +++ b/components/ws-manager/pkg/manager/testdata/status_wsstartup_Creating01.json @@ -0,0 +1,306 @@ +{ + "pod": { + "metadata": { + "name": "ws-foobas", + "namespace": "default", + "selfLink": "/api/v1/namespaces/default/pods/ws-foobas", + "uid": "486e5f88-4354-11e9-aee4-080027861af1", + "resourceVersion": "64953", + "creationTimestamp": "2019-03-10T16:48:08Z", + "labels": { + "gpwsman": "true", + "headless": "false", + "owner": "foobar", + "metaID": "metameta", + "workspaceID": "foobas", + "workspaceType": "regular" + }, + "annotations": { + "gitpod/id": "foobas", + "gitpod/servicePrefix": "foobas", + "gitpod/url": "http://10.0.0.114:8082", + "gitpod/never-ready": "true" + } + }, + "spec": { + "volumes": [ + { + "name": "vol-this-workspace", + "hostPath": { + "path": "/tmp/workspaces/foobas", + "type": "DirectoryOrCreate" + } + }, + { + "name": "vol-sync-tmp", + "hostPath": { + "path": "/tmp/workspaces/sync-tmp", + "type": "DirectoryOrCreate" + } + }, + { + "name": "default-token-6qnvx", + "secret": { + "secretName": "default-token-6qnvx", + "defaultMode": 420 + } + } + ], + "containers": [ + { + "name": "workspace", + "image": "nginx:latest", + "ports": [ + { + "containerPort": 23000, + "protocol": "TCP" + } + ], + "env": [ + { + "name": "THEIA_WORKSPACE_ROOT", + "value": "/workspace" + }, + { + "name": "GITPOD_THEIA_PORT", + "value": "23000" + }, + { + "name": "GITPOD_HOST", + "value": "gitpod.io" + }, + { + "name": "GITPOD_INTERVAL", + "value": "30" + }, + { + "name": "GITPOD_WSSYNC_APITOKEN", + "value": "c17a7eaf-e5de-4e9d-815a-7919379e2bf8" + }, + { + "name": "GITPOD_WSSYNC_APIPORT", + "value": "44444" + }, + { + "name": "GITPOD_REPO_ROOT", + "value": "/workspace" + }, + { + "name": "GITPOD_CLI_APITOKEN", + "value": "690516e2-c416-4a28-ba74-e36f125922aa" + }, + { + "name": "GITPOD_WORKSPACE_ID", + "value": "foobas" + }, + { + "name": "GITPOD_GIT_USER_NAME", + "value": "usernameGoesHere" + }, + { + "name": "GITPOD_GIT_USER_EMAIL", + "value": "some@user.com" + } + ], + "resources": { + "limits": { + "cpu": "100m", + "memory": "100Mi" + }, + "requests": { + "cpu": "100m", + "memory": "100Mi" + } + }, + "volumeMounts": [ + { + "name": "vol-this-workspace", + "mountPath": "/workspace" + }, + { + "name": "default-token-6qnvx", + "readOnly": true, + "mountPath": "/var/run/secrets/kubernetes.io/serviceaccount" + } + ], + "livenessProbe": { + "httpGet": { + "path": "/", + "port": 23000, + "scheme": "HTTP" + }, + "timeoutSeconds": 1, + "periodSeconds": 30, + "successThreshold": 1, + "failureThreshold": 3 + }, + "readinessProbe": { + "httpGet": { + "path": "/", + "port": 23000, + "scheme": "HTTP" + }, + "timeoutSeconds": 1, + "periodSeconds": 1, + "successThreshold": 1, + "failureThreshold": 3 + }, + "terminationMessagePath": "/dev/termination-log", + "terminationMessagePolicy": "File", + "imagePullPolicy": "Always" + } + ], + "restartPolicy": "Always", + "terminationGracePeriodSeconds": 30, + "dnsPolicy": "ClusterFirst", + "serviceAccountName": "default", + "serviceAccount": "default", + "nodeName": "minikube", + "securityContext": {}, + "schedulerName": "default-scheduler", + "tolerations": [ + { + "key": "node.kubernetes.io/not-ready", + "operator": "Exists", + "effect": "NoExecute", + "tolerationSeconds": 300 + }, + { + "key": "node.kubernetes.io/unreachable", + "operator": "Exists", + "effect": "NoExecute", + "tolerationSeconds": 300 + } + ] + }, + "status": { + "phase": "Running", + "conditions": [ + { + "type": "Initialized", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-03-10T16:48:08Z" + }, + { + "type": "Ready", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-03-10T16:48:13Z" + }, + { + "type": "PodScheduled", + "status": "True", + "lastProbeTime": null, + "lastTransitionTime": "2019-03-10T16:48:08Z" + } + ], + "hostIP": "10.0.2.15", + "podIP": "172.17.0.5", + "startTime": "2019-03-10T16:48:08Z", + "containerStatuses": [ + { + "name": "sync", + "state": { + "running": { + "startedAt": "2019-03-10T16:48:13Z" + } + }, + "lastState": {}, + "ready": true, + "restartCount": 0, + "image": "csweichel/noop:latest", + "imageID": "docker-pullable://csweichel/noop@sha256:aaa6b993f4c853fac7101aa7fc087926f829004e62cbce6e1852e5a3aac87c52", + "containerID": "docker://9961f75ea72f36bb0ba1e42b3b2da98eb44a9dc12e7c7e8edfb52512b3b04016" + }, + { + "name": "workspace", + "state": { + "running": { + "startedAt": "2019-03-10T16:48:12Z" + } + }, + "lastState": {}, + "ready": true, + "restartCount": 0, + "image": "nginx:latest", + "imageID": "docker-pullable://nginx@sha256:98efe605f61725fd817ea69521b0eeb32bef007af0e3d0aeb6258c6e6fe7fc1a", + "containerID": "docker://e7080b843a47db414d6c94cfda7f657b99d8aa5bbf7c9c118ec98c0eefb6c0df" + } + ], + "qosClass": "Guaranteed" + } + }, + "theiaService": { + "metadata": { + "name": "foobas-theia", + "namespace": "default", + "selfLink": "/api/v1/namespaces/default/services/foobas-theia", + "uid": "48687212-4354-11e9-aee4-080027861af1", + "resourceVersion": "64923", + "creationTimestamp": "2019-03-10T16:48:08Z", + "labels": { + "gpwsman": "true", + "headless": "false", + "owner": "foobar", + "metaID": "metameta", + "workspaceID": "foobas" + } + }, + "spec": { + "ports": [ + { + "name": "theia", + "protocol": "TCP", + "port": 23000, + "targetPort": 23000 + } + ], + "selector": { + "gpwsman": "true", + "headless": "false", + "owner": "foobar", + "workspaceID": "foobas" + }, + "clusterIP": "10.103.194.121", + "type": "ClusterIP", + "sessionAffinity": "None" + }, + "status": { + "loadBalancer": {} + } + }, + "portsService": { + "metadata": { + "name": "foobas-ports", + "namespace": "default", + "selfLink": "/api/v1/namespaces/default/services/foobas-ports", + "uid": "486cb304-4354-11e9-aee4-080027861af1", + "resourceVersion": "64926", + "creationTimestamp": "2019-03-10T16:48:08Z", + "labels": { + "gpwsman": "true", + "workspaceID": "foobas" + } + }, + "spec": { + "ports": [ + { + "protocol": "TCP", + "port": 8080, + "targetPort": 8080 + } + ], + "selector": { + "gpwsman": "true", + "workspaceID": "foobas" + }, + "clusterIP": "10.110.184.222", + "type": "ClusterIP", + "sessionAffinity": "None" + }, + "status": { + "loadBalancer": {} + } + } +} diff --git a/components/ws-manager/pkg/manager/testdata/stopping_basic.json b/components/ws-manager/pkg/manager/testdata/stopping_basic.json index e29eeebc9f87ac..b21215d7bc9c5d 100644 --- a/components/ws-manager/pkg/manager/testdata/stopping_basic.json +++ b/components/ws-manager/pkg/manager/testdata/stopping_basic.json @@ -27,6 +27,7 @@ "gitpod/firstUserActivity": "2020-02-28T10:44:36.995133911Z", "gitpod/id": "df376c57-7a0e-4233-976a-7a021e6f088c", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "c372bd58-ef61-4fc0-9083-bd61ef96ad9f", "gitpod/url": "https://c372bd58-ef61-4fc0-9083-bd61ef96ad9f.ws-eu01.gitpod-staging.com", "kubernetes.io/psp": "default-ns-privileged-unconfined" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_invalidValue.json b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_invalidValue.json index ecc4c1d4770b83..d831699ce16f13 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_invalidValue.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_invalidValue.json @@ -20,6 +20,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082", "gitpod/customTimeout": "this is not a valid duration" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_noActivity.json b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_noActivity.json index 3f447bd5bafa40..3d487335b60707 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_noActivity.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_noActivity.json @@ -20,6 +20,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082", "gitpod/customTimeout": "10m" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_validValue.json b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_validValue.json index c54438e2c220f9..4f10f3b8a562d3 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_validValue.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_customTimeout_validValue.json @@ -21,6 +21,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082", "gitpod/customTimeout": "2h" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_interrupted_noActivity.json b/components/ws-manager/pkg/manager/testdata/timeout_interrupted_noActivity.json index 1d8dabbc0589ac..b700ccc8555735 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_interrupted_noActivity.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_interrupted_noActivity.json @@ -26,6 +26,7 @@ "gitpod/contentInitializer": "[redacted]", "gitpod/id": "283522ed-51f1-4838-951b-0f115c0a7aae", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "b246b28e-4776-47d5-961d-10548ffac9a8", "gitpod/url": "https://b246b28e-4776-47d5-961d-10548ffac9a8.ws-eu0.gitpod-staging.com", "kubernetes.io/psp": "workspace" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_interrupted_withActivity.json b/components/ws-manager/pkg/manager/testdata/timeout_interrupted_withActivity.json index 7ba6f4a7856af1..d1aa67d4322039 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_interrupted_withActivity.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_interrupted_withActivity.json @@ -27,6 +27,7 @@ "gitpod/contentInitializer": "[redacted]", "gitpod/id": "283522ed-51f1-4838-951b-0f115c0a7aae", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "b246b28e-4776-47d5-961d-10548ffac9a8", "gitpod/url": "https://b246b28e-4776-47d5-961d-10548ffac9a8.ws-eu0.gitpod-staging.com", "kubernetes.io/psp": "workspace" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_customTimeout.json b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_customTimeout.json index 8a6c1ba46ad26b..fed1c54ffa1657 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_customTimeout.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_customTimeout.json @@ -20,6 +20,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082", "gitpod/customTimeout": "2h" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_overdue.json b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_overdue.json index 57a0c46ed91fee..dae1b06470d595 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_prebuild_overdue.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_prebuild_overdue.json @@ -20,6 +20,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082" } diff --git a/components/ws-manager/pkg/manager/testdata/timeout_regular_closed.json b/components/ws-manager/pkg/manager/testdata/timeout_regular_closed.json index e551c21e649f4b..4c2029ff99f49d 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_regular_closed.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_regular_closed.json @@ -21,6 +21,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/closed": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082" diff --git a/components/ws-manager/pkg/manager/testdata/timeout_regular_maxLifetime.json b/components/ws-manager/pkg/manager/testdata/timeout_regular_maxLifetime.json index e5afa76effb94c..fcee4307ab0cef 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_regular_maxLifetime.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_regular_maxLifetime.json @@ -21,6 +21,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082" } diff --git a/components/ws-manager/pkg/manager/testdata/timeout_regular_noActivity.json b/components/ws-manager/pkg/manager/testdata/timeout_regular_noActivity.json index 9d071d4d53b1c3..5b57027f566b32 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_regular_noActivity.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_regular_noActivity.json @@ -20,6 +20,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082" } diff --git a/components/ws-manager/pkg/manager/testdata/timeout_regular_withActivityOK.json b/components/ws-manager/pkg/manager/testdata/timeout_regular_withActivityOK.json index b72cedf44b2171..9734ba38c42ed8 100644 --- a/components/ws-manager/pkg/manager/testdata/timeout_regular_withActivityOK.json +++ b/components/ws-manager/pkg/manager/testdata/timeout_regular_withActivityOK.json @@ -21,6 +21,7 @@ "annotations": { "gitpod/id": "foobas", "gitpod/ready": "true", + "gitpod.io/alreadyInitializing": "true", "gitpod/servicePrefix": "foobas", "gitpod/url": "http://10.0.0.114:8082" }