fixup

Signed-off-by: Anatolii Bazko <[email protected]>

Author: tolusha

pkg/library/container/container.go

@@ -32,6 +32,7 @@ import (
 	"github.com/devfile/devworkspace-operator/pkg/library/flatten"
 	"github.com/devfile/devworkspace-operator/pkg/library/lifecycle"
 	"github.com/devfile/devworkspace-operator/pkg/library/overrides"
+	dwResources "github.com/devfile/devworkspace-operator/pkg/library/resources"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -68,7 +69,7 @@ func GetKubeContainersFromDevfile(
 		if component.Container == nil {
 			continue
 		}
-		k8sContainer, err := convertContainerToK8s(component, securityContext, pullPolicy, defaultResources, resourceCaps)
+		k8sContainer, err := convertContainerToK8s(component, securityContext, pullPolicy, defaultResources)
 		if err != nil {
 			return nil, err
 		}
@@ -82,6 +83,11 @@ func GetKubeContainersFromDevfile(
 			}
 			k8sContainer = patchedContainer
 		}
+
+		// applying caps only after overrides
+		resources := dwResources.ApplyCaps(&k8sContainer.Resources, resourceCaps)
+		k8sContainer.Resources = *resources
+
 		podAdditions.Containers = append(podAdditions.Containers, *k8sContainer)
 	}
 
@@ -94,7 +100,7 @@ func GetKubeContainersFromDevfile(
 	}
 
 	for _, initComponent := range initComponents {
-		k8sContainer, err := convertContainerToK8s(initComponent, securityContext, pullPolicy, defaultResources, nil)
+		k8sContainer, err := convertContainerToK8s(initComponent, securityContext, pullPolicy, defaultResources)
 		if err != nil {
 			return nil, err
 		}

pkg/library/container/conversion.go

@@ -30,7 +30,6 @@ func convertContainerToK8s(
 	securityContext *corev1.SecurityContext,
 	pullPolicy string,
 	defaultResources *corev1.ResourceRequirements,
-	resourceCaps *corev1.ResourceRequirements,
 ) (*corev1.Container, error) {
 	if devfileComponent.Container == nil {
 		return nil, fmt.Errorf("cannot get k8s container from non-container component")
@@ -42,7 +41,6 @@ func convertContainerToK8s(
 		return nil, fmt.Errorf("failed to get resources for container %s: %s", devfileComponent.Name, err)
 	}
 	containerResources = dwResources.ApplyDefaults(containerResources, defaultResources)
-	containerResources = dwResources.ApplyCaps(containerResources, resourceCaps)
 	if err := dwResources.ValidateResources(containerResources); err != nil {
 		return nil, fmt.Errorf("container resources are invalid for component %s: %w", devfileComponent.Name, err)
 	}

pkg/library/flatten/merge.go

@@ -312,7 +312,6 @@ func mergeContributionsInto(
 			return nil, err
 		}
 		totalResources = dwResources.AddResourceRequirements(totalResources, componentResources)
-		totalResources = dwResources.ApplyCaps(totalResources, resourceCaps)
 
 		component.Container.MemoryLimit = ""
 		component.Container.MemoryRequest = ""