Set hostname to workspace ID rather than instance ID

iQQBot · roboquat · commit 94c71c03cab3 · 2021-12-29T15:40:52.000+01:00
diff --git a/components/ws-manager/pkg/manager/create.go b/components/ws-manager/pkg/manager/create.go
@@ -378,6 +378,7 @@ func (m *Manager) createDefiniteWorkspacePod(startContext *startWorkspaceContext
 			Finalizers:  []string{"gitpod.io/finalizer"},
 		},
 		Spec: corev1.PodSpec{
+			Hostname:                     req.Metadata.MetaId,
 			AutomountServiceAccountToken: &boolFalse,
 			ServiceAccountName:           "workspace",
 			SchedulerName:                m.Config.SchedulerName,
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden b/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden
@@ -207,6 +207,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden b/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden
@@ -199,6 +199,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden b/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden
@@ -201,6 +201,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden b/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden
@@ -236,6 +236,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden b/components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden
@@ -204,6 +204,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden b/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden
@@ -193,6 +193,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_ghost.golden b/components/ws-manager/pkg/manager/testdata/cdwp_ghost.golden
@@ -195,6 +195,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden
@@ -225,6 +225,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden
@@ -238,6 +238,7 @@
                     "name": "eu.gcr.io-gitpod"
                 }
             ],
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden b/components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden
@@ -201,6 +201,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden
@@ -207,6 +207,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden
@@ -220,6 +220,7 @@
                     "name": "eu.gcr.io-gitpod"
                 }
             ],
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden
@@ -220,6 +220,7 @@
                     "name": "eu.gcr.io-gitpod"
                 }
             ],
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_probe.golden b/components/ws-manager/pkg/manager/testdata/cdwp_probe.golden
@@ -207,6 +207,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden b/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden
@@ -203,6 +203,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden b/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden
@@ -207,6 +207,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_template.golden
@@ -216,6 +216,7 @@
                     "name": "eu.gcr.io-gitpod"
                 }
             ],
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden b/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden
@@ -208,6 +208,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden b/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden
@@ -203,6 +203,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden b/components/ws-manager/pkg/manager/testdata/cdwp_with_ephemeral_storage.golden
@@ -222,6 +222,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "schedulerName": "workspace-scheduler",
             "tolerations": [
                 {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden b/components/ws-manager/pkg/manager/testdata/cdwp_withaffinity_regular.golden
@@ -203,6 +203,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden b/components/ws-manager/pkg/manager/testdata/cdwp_withaffinityheadless.golden
@@ -225,6 +225,7 @@
             "restartPolicy": "Never",
             "serviceAccountName": "workspace",
             "automountServiceAccountToken": false,
+            "hostname": "foobar",
             "affinity": {
                 "nodeAffinity": {
                     "requiredDuringSchedulingIgnoredDuringExecution": {

Original file line number	Diff line number	Diff line change
`@@ -207,6 +207,7 @@`
`207`	`207`	`"restartPolicy": "Never",`
`208`	`208`	`"serviceAccountName": "workspace",`
`209`	`209`	`"automountServiceAccountToken": false,`
	`210`	`+ "hostname": "foobar",`
`210`	`211`	`"schedulerName": "workspace-scheduler",`
`211`	`212`	`"tolerations": [`
`212`	`213`	`{`
Original file line number	Diff line number	Diff line change
`@@ -201,6 +201,7 @@`
`201`	`201`	`"restartPolicy": "Never",`
`202`	`202`	`"serviceAccountName": "workspace",`
`203`	`203`	`"automountServiceAccountToken": false,`
	`204`	`+ "hostname": "foobar",`
`204`	`205`	`"schedulerName": "workspace-scheduler",`
`205`	`206`	`"tolerations": [`
`206`	`207`	`{`
Original file line number	Diff line number	Diff line change
`@@ -236,6 +236,7 @@`
`236`	`236`	`"restartPolicy": "Never",`
`237`	`237`	`"serviceAccountName": "workspace",`
`238`	`238`	`"automountServiceAccountToken": false,`
	`239`	`+ "hostname": "foobar",`
`239`	`240`	`"schedulerName": "workspace-scheduler",`
`240`	`241`	`"tolerations": [`
`241`	`242`	`{`
Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,7 @@`
`204`	`204`	`"restartPolicy": "Never",`
`205`	`205`	`"serviceAccountName": "workspace",`
`206`	`206`	`"automountServiceAccountToken": false,`
	`207`	`+ "hostname": "foobar",`
`207`	`208`	`"schedulerName": "workspace-scheduler",`
`208`	`209`	`"tolerations": [`
`209`	`210`	`{`
Original file line number	Diff line number	Diff line change
`@@ -193,6 +193,7 @@`
`193`	`193`	`"restartPolicy": "Never",`
`194`	`194`	`"serviceAccountName": "workspace",`
`195`	`195`	`"automountServiceAccountToken": false,`
	`196`	`+ "hostname": "foobar",`
`196`	`197`	`"schedulerName": "workspace-scheduler",`
`197`	`198`	`"tolerations": [`
`198`	`199`	`{`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@`
`195`	`195`	`"restartPolicy": "Never",`
`196`	`196`	`"serviceAccountName": "workspace",`
`197`	`197`	`"automountServiceAccountToken": false,`
	`198`	`+ "hostname": "foobar",`
`198`	`199`	`"schedulerName": "workspace-scheduler",`
`199`	`200`	`"tolerations": [`
`200`	`201`	`{`
Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,7 @@`
`225`	`225`	`"restartPolicy": "Never",`
`226`	`226`	`"serviceAccountName": "workspace",`
`227`	`227`	`"automountServiceAccountToken": false,`
	`228`	`+ "hostname": "foobar",`
`228`	`229`	`"schedulerName": "workspace-scheduler",`
`229`	`230`	`"tolerations": [`
`230`	`231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,7 @@`
`238`	`238`	`"name": "eu.gcr.io-gitpod"`
`239`	`239`	`}`
`240`	`240`	`],`
	`241`	`+ "hostname": "foobar",`
`241`	`242`	`"affinity": {`
`242`	`243`	`"nodeAffinity": {`
`243`	`244`	`"requiredDuringSchedulingIgnoredDuringExecution": {`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,7 @@`
`220`	`220`	`"name": "eu.gcr.io-gitpod"`
`221`	`221`	`}`
`222`	`222`	`],`
	`223`	`+ "hostname": "foobar",`
`223`	`224`	`"affinity": {`
`224`	`225`	`"nodeAffinity": {`
`225`	`226`	`"requiredDuringSchedulingIgnoredDuringExecution": {`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,7 @@`
`203`	`203`	`"restartPolicy": "Never",`
`204`	`204`	`"serviceAccountName": "workspace",`
`205`	`205`	`"automountServiceAccountToken": false,`
	`206`	`+ "hostname": "foobar",`
`206`	`207`	`"schedulerName": "workspace-scheduler",`
`207`	`208`	`"tolerations": [`
`208`	`209`	`{`