[ws-manager] Update tests

gitpod-io · Jul 18, 2022 · 491cd95 · 491cd95
1 parent 31b395c
commit 491cd95
Show file tree

Hide file tree

Showing 37 changed files with 94 additions and 29 deletions.
diff --git a/components/ws-manager-api/go/config/config.go b/components/ws-manager-api/go/config/config.go
@@ -297,15 +297,15 @@ type ContainerConfiguration struct {
 // Validate validates a container configuration
 func (c *ContainerConfiguration) Validate() error {
 	return ozzo.ValidateStruct(c,
-		ozzo.Field(&c.Requests, validResourceConfig),
-		ozzo.Field(&c.Limits, validResourceConfig),
+		ozzo.Field(&c.Requests, validResourceRequestConfig),
+		ozzo.Field(&c.Limits, validResourceLimitConfig),
 	)
 }
 
-var validResourceConfig = ozzo.By(func(o interface{}) error {
+var validResourceRequestConfig = ozzo.By(func(o interface{}) error {
 	rc, ok := o.(*ResourceRequestConfiguration)
 	if !ok {
-		return xerrors.Errorf("can only validate ResourceConfiguration")
+		return xerrors.Errorf("can only validate ResourceRequestConfiguration")
 	}
 	if rc == nil {
 		return nil

diff --git a/components/ws-manager/pkg/manager/create_test.go b/components/ws-manager/pkg/manager/create_test.go
@@ -28,13 +28,13 @@ var (
 
 func TestCreateDefiniteWorkspacePod(t *testing.T) {
 	type WorkspaceClass struct {
-		DefaultTemplate    *corev1.Pod                   `json:"defaultTemplate,omitempty"`
-		PrebuildTemplate   *corev1.Pod                   `json:"prebuildTemplate,omitempty"`
-		ProbeTemplate      *corev1.Pod                   `json:"probeTemplate,omitempty"`
-		ImagebuildTemplate *corev1.Pod                   `json:"imagebuildTemplate,omitempty"`
-		RegularTemplate    *corev1.Pod                   `json:"regularTemplate,omitempty"`
-		ResourceRequests   *config.ResourceConfiguration `json:"resourceRequests,omitempty"`
-		ResourceLimits     *config.ResourceConfiguration `json:"resourceLimits,omitempty"`
+		DefaultTemplate    *corev1.Pod                          `json:"defaultTemplate,omitempty"`
+		PrebuildTemplate   *corev1.Pod                          `json:"prebuildTemplate,omitempty"`
+		ProbeTemplate      *corev1.Pod                          `json:"probeTemplate,omitempty"`
+		ImagebuildTemplate *corev1.Pod                          `json:"imagebuildTemplate,omitempty"`
+		RegularTemplate    *corev1.Pod                          `json:"regularTemplate,omitempty"`
+		ResourceRequests   *config.ResourceRequestConfiguration `json:"resourceRequests,omitempty"`
+		ResourceLimits     *config.ResourceLimitConfiguration   `json:"resourceLimits,omitempty"`
 	}
 	type tpl struct {
 		FN      string
@@ -190,9 +190,9 @@ func TestCreateDefiniteWorkspacePod(t *testing.T) {
 
 func TestCreatePVCForWorkspacePod(t *testing.T) {
 	type WorkspaceClass struct {
-		PVCConfig        *config.PVCConfiguration      `json:"pvcConfig,omitempty"`
-		ResourceRequests *config.ResourceConfiguration `json:"resourceRequests,omitempty"`
-		ResourceLimits   *config.ResourceConfiguration `json:"resourceLimits,omitempty"`
+		PVCConfig        *config.PVCConfiguration             `json:"pvcConfig,omitempty"`
+		ResourceRequests *config.ResourceRequestConfiguration `json:"resourceRequests,omitempty"`
+		ResourceLimits   *config.ResourceLimitConfiguration   `json:"resourceLimits,omitempty"`
 	}
 	type fixture struct {
 		WorkspaceClass

diff --git a/components/ws-manager/pkg/manager/integration_test.go b/components/ws-manager/pkg/manager/integration_test.go
@@ -75,13 +75,13 @@ func forIntegrationTestGetManager(t *testing.T) *Manager {
 			"": {
 				Container: config.ContainerConfiguration{
 					Limits: &config.ResourceLimitConfiguration{
-						CPU: config.CpuResourceLimit{
-							MinLimit:   "",
+						CPU: &config.CpuResourceLimit{
+							MinLimit:   "600m",
 							BurstLimit: "900m",
 						},
 						Memory: "1000M",
 					},
-					Requests: &config.ResourceConfiguration{
+					Requests: &config.ResourceRequestConfiguration{
 						CPU:    "1m",
 						Memory: "1m",
 					},

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden b/components/ws-manager/pkg/manager/testdata/cdwp_admission.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_everyone",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden b/components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_broken_resource_request.golden b/components/ws-manager/pkg/manager/testdata/cdwp_broken_resource_request.golden
@@ -9,4 +9,4 @@
         "status": {}
     },
     "error": "cannot create definite workspace pod: cannot create workspace container: cannot parse workspace container requests: cpu: quantities must match the regular expression '^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$'"
-}
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_broken_resource_request.json b/components/ws-manager/pkg/manager/testdata/cdwp_broken_resource_request.json
@@ -28,4 +28,4 @@
     "resourceRequests": {
       "cpu": "foobar"
     }
-}
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_class.golden b/components/ws-manager/pkg/manager/testdata/cdwp_class.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "1200m",
+                "gitpod.io/cpuLimit": "900m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",
@@ -154,7 +156,7 @@
                     ],
                     "resources": {
                         "limits": {
-                            "cpu": "900m"
+                            "cpu": "1200m"
                         },
                         "requests": {
                             "cpu": "900m"

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_class.json b/components/ws-manager/pkg/manager/testdata/cdwp_class.json
@@ -2,7 +2,12 @@
     "classes": {
         "gitpodio-internal-foobar": {
             "resourceRequests": {"cpu": "900m"},
-            "resourceLimits": {"cpu": "900m"},
+            "resourceLimits": {
+                "cpu": {
+                    "min": "900m",
+                    "burst": "1200m"
+                }
+            },
             "defaultTemplate": {
                 "spec": {
                     "dnsConfig": {

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden b/components/ws-manager/pkg/manager/testdata/cdwp_class_notfound.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden b/components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden b/components/ws-manager/pkg/manager/testdata/cdwp_debug_workspace_pod.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

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
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "1200m",
+                "gitpod.io/cpuLimit": "900m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",
@@ -145,6 +147,9 @@
                         }
                     ],
                     "resources": {
+                        "limits": {
+                            "cpu": "1200m"
+                        },
                         "requests": {
                             "cpu": "5m"
                         }

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.json b/components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.json
@@ -28,5 +28,11 @@
     "resourceRequests": {
       "cpu": "5m",
       "memory": "0Gi"
+    },
+    "resourceLimits": {
+        "cpu": {
+            "min": "900m",
+            "burst": "1200m"
+        }
     }
-}
+}
diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden b/components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden b/components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden
@@ -22,6 +22,7 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
                 "gitpod.io/cpuLimit": "900m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden b/components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden
@@ -23,6 +23,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/fullWorkspaceBackup": "true",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "foobar",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "foobar",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "foobar",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "foobar",

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
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "foobar",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_probe.golden b/components/ws-manager/pkg/manager/testdata/cdwp_probe.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "foobar",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden b/components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_secrets.golden b/components/ws-manager/pkg/manager/testdata/cdwp_secrets.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_sshkeys.golden b/components/ws-manager/pkg/manager/testdata/cdwp_sshkeys.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod.io/sshPublicKeys": "Cl9zc2gtZWQyNTUxOSBBQUFBQzNOemFDMWxaREkxTlRFNUFBQUFJSG0yK2tKSy93dWwxVkd3OXJmQ21kY0dqSjBXbUdiQmpDNXA1OTA4VUdnWiBnaXRwb2RAdW5rbm93bgqvAWVjZHNhLXNoYTItbmlzdHAyNTYgQUFBQUUyVmpaSE5oTFhOb1lUSXRibWx6ZEhBeU5UWUFBQUFJYm1semRIQXlOVFlBQUFCQkJNL0Eva3JhV2pXeTI4blZmc1Y0R2EyRjROQUFWT0dwL1YzazNVOThuT3QyVVNZd3U3RXRTcUVPN1BDUFErK3pOSmR1aFk1SjBmYm42TzA0K25LdmR0OD0gZ2l0cG9kQHVua25vd24=",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden b/components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_template.golden b/components/ws-manager/pkg/manager/testdata/cdwp_template.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden b/components/ws-manager/pkg/manager/testdata/cdwp_timeout.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/customTimeout": "35m20s",

diff --git a/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden b/components/ws-manager/pkg/manager/testdata/cdwp_userns.golden
@@ -22,6 +22,8 @@
                 "cluster-autoscaler.kubernetes.io/safe-to-evict": "false",
                 "container.apparmor.security.beta.kubernetes.io/workspace": "unconfined",
                 "gitpod.io/attemptingToCreate": "true",
+                "gitpod.io/cpuBurstLimit": "900m",
+                "gitpod.io/cpuLimit": "300m",
                 "gitpod/admission": "admit_owner_only",
                 "gitpod/contentInitializer": "GmcKZXdvcmtzcGFjZXMvY3J5cHRpYy1pZC1nb2VzLWhlcmcvZmQ2MjgwNGItNGNhYi0xMWU5LTg0M2EtNGU2NDUzNzMwNDhlLnRhckBnaXRwb2QtZGV2LXVzZXItY2hyaXN0ZXN0aW5n",
                 "gitpod/id": "test",
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,4 +9,4 @@ @@
             "status": {}
         },
         "error": "cannot create definite workspace pod: cannot create workspace container: cannot parse workspace container requests: cpu: quantities must match the regular expression '^([+-]?[0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$'"
-    }
+    }