fixup

Signed-off-by: Anatolii Bazko <abazko@redhat.com>

Author: tolusha

controllers/workspace/devworkspace_controller.go

@@ -264,7 +264,6 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		K8sClient:                   r.Client,
 		HttpClient:                  httpClient,
 		DefaultResourceRequirements: workspace.Config.Workspace.DefaultContainerResources,
-		ResourceCaps:                workspace.Config.Workspace.ContainerResourceCaps,
 	}
 
 	if wsDefaults.NeedsDefaultTemplate(workspace) {
@@ -358,7 +357,6 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		Image:     workspace.Config.Workspace.ProjectCloneConfig.Image,
 		Env:       env.GetEnvironmentVariablesForProjectClone(workspace),
 		Resources: workspace.Config.Workspace.ProjectCloneConfig.Resources,
-		Caps:      workspace.Config.Workspace.ContainerResourceCaps,
 	}
 	if workspace.Config.Workspace.ProjectCloneConfig.ImagePullPolicy != "" {
 		projectCloneOptions.PullPolicy = config.Workspace.ProjectCloneConfig.ImagePullPolicy

pkg/library/resources/helper.go

@@ -166,21 +166,21 @@ func ApplyDefaults(resources, defaults *corev1.ResourceRequirements) *corev1.Res
 	}
 
 	// Set default limits if not present
-	for resourceName, quantity := range defaults.Limits {
+	for resource, quantity := range defaults.Limits {
 		if result.Limits == nil {
 			result.Limits = corev1.ResourceList{}
 		}
-		if _, ok := result.Limits[resourceName]; !ok && !quantity.IsZero() {
-			result.Limits[resourceName] = quantity
+		if _, ok := result.Limits[resource]; !ok && !quantity.IsZero() {
+			result.Limits[resource] = quantity
 		}
 	}
 	// Set default requests if not present
-	for resourceName, quantity := range defaults.Requests {
+	for resource, quantity := range defaults.Requests {
 		if result.Requests == nil {
 			result.Requests = corev1.ResourceList{}
 		}
-		if _, ok := result.Requests[resourceName]; !ok && !quantity.IsZero() {
-			result.Requests[resourceName] = quantity
+		if _, ok := result.Requests[resource]; !ok && !quantity.IsZero() {
+			result.Requests[resource] = quantity
 		}
 	}