Skip to content

Commit f25ba24

Browse files
Furistoroboquat
Furisto
authored and
roboquat
committed
Always apply labels and update tests
1 parent f5d5559 commit f25ba24

27 files changed

+54
-4
lines changed

Diff for: ‎components/ws-manager/pkg/manager/create.go

-2
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,6 @@ func (m *Manager) createWorkspaceEnvironment(startContext *startWorkspaceContext
721721
result = append(result, corev1.EnvVar{Name: "GITPOD_REPO_ROOTS", Value: strings.Join(allRepoRoots, ",")})
722722
result = append(result, corev1.EnvVar{Name: "GITPOD_CLI_APITOKEN", Value: startContext.CLIAPIKey})
723723
result = append(result, corev1.EnvVar{Name: "GITPOD_OWNER_ID", Value: startContext.Request.Metadata.Owner})
724-
result = append(result, corev1.EnvVar{Name: "GITPOD_PROJECT_ID", Value: startContext.Request.Metadata.Project})
725-
result = append(result, corev1.EnvVar{Name: "GITPOD_TEAM_ID", Value: startContext.Request.Metadata.Team})
726724
result = append(result, corev1.EnvVar{Name: "GITPOD_WORKSPACE_ID", Value: startContext.Request.Metadata.MetaId})
727725
result = append(result, corev1.EnvVar{Name: "GITPOD_INSTANCE_ID", Value: startContext.Request.Id})
728726
result = append(result, corev1.EnvVar{Name: "GITPOD_THEIA_PORT", Value: strconv.Itoa(int(startContext.IDEPort))})

Diff for: ‎components/ws-manager/pkg/manager/create_test.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,10 @@ func TestCreateDefiniteWorkspacePod(t *testing.T) {
133133
Type: api.WorkspaceType_REGULAR,
134134
Id: "test",
135135
Metadata: &api.WorkspaceMetadata{
136-
Owner: "tester",
137-
MetaId: "foobar",
136+
Owner: "tester",
137+
MetaId: "foobar",
138+
Team: "awesome",
139+
Project: "gitpod",
138140
},
139141
ServicePrefix: "foobarservice",
140142
Spec: &spec,

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_admission.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_class.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
"headless": "false",
1515
"metaID": "foobar",
1616
"owner": "tester",
17+
"project": "gitpod",
18+
"team": "awesome",
1719
"workspaceID": "test",
1820
"workspaceType": "regular"
1921
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "imagebuild"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "imagebuild"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "prebuild"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "prebuild"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "prebuild"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_probe.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "probe"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_template.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_userns.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "imagebuild"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "false",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "gitpod",
17+
"team": "awesome",
1618
"workspaceID": "test",
1719
"workspaceType": "regular"
1820
},

Diff for: ‎components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
"headless": "true",
1414
"metaID": "foobar",
1515
"owner": "tester",
16+
"project": "",
17+
"team": "",
1618
"workspaceID": "foobar",
1719
"workspaceType": "imagebuild"
1820
},

0 commit comments

Comments
 (0)