fixup

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

Author: tolusha

pkg/library/container/conversion.go

@@ -25,12 +25,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-func convertContainerToK8s(
-	devfileComponent dw.Component,
-	securityContext *corev1.SecurityContext,
-	pullPolicy string,
-	defaultResources *corev1.ResourceRequirements,
-) (*corev1.Container, error) {
+func convertContainerToK8s(devfileComponent dw.Component, securityContext *corev1.SecurityContext, pullPolicy string, defaultResources *corev1.ResourceRequirements) (*corev1.Container, error) {
 	if devfileComponent.Container == nil {
 		return nil, fmt.Errorf("cannot get k8s container from non-container component")
 	}

pkg/library/flatten/flatten.go

@@ -50,7 +50,6 @@ type ResolverTools struct {
 	K8sClient                   client.Client
 	HttpClient                  network.HTTPGetter
 	DefaultResourceRequirements *corev1.ResourceRequirements
-	ResourceCaps                *corev1.ResourceRequirements
 }
 
 // ResolveDevWorkspace takes a devworkspace and returns a "resolved" version of it -- i.e. one where all plugins and parents
@@ -68,7 +67,7 @@ func ResolveDevWorkspace(workspace *dw.DevWorkspaceTemplateSpec, contributions [
 	}
 
 	if needsMerge, err := needsContainerContributionMerge(resolvedDW); needsMerge {
-		if err := mergeContainerContributions(resolvedDW, tooling.DefaultResourceRequirements, tooling.ResourceCaps); err != nil {
+		if err := mergeContainerContributions(resolvedDW, tooling.DefaultResourceRequirements); err != nil {
 			return nil, nil, err
 		}
 	} else if err != nil {

pkg/library/flatten/merge.go

@@ -175,11 +175,7 @@ func needsContainerContributionMerge(flattenedSpec *dw.DevWorkspaceTemplateSpec)
 	return hasContribution && hasTarget, nil
 }
 
-func mergeContainerContributions(
-	flattenedSpec *dw.DevWorkspaceTemplateSpec,
-	defaultResources *corev1.ResourceRequirements,
-	resourceCaps *corev1.ResourceRequirements,
-) error {
+func mergeContainerContributions(flattenedSpec *dw.DevWorkspaceTemplateSpec, defaultResources *corev1.ResourceRequirements) error {
 	var contributions []dw.Component
 	contributionNameSet := map[string]bool{}
 	for _, component := range flattenedSpec.Components {
@@ -205,7 +201,7 @@ func mergeContainerContributions(
 			// drop contributions from updated list as they will be merged
 			continue
 		} else if component.Name == targetComponentName && !mergeDone {
-			mergedComponent, err := mergeContributionsInto(&component, contributions, defaultResources, resourceCaps)
+			mergedComponent, err := mergeContributionsInto(&component, contributions, defaultResources)
 			if err != nil {
 				return fmt.Errorf("failed to merge container contributions: %w", err)
 			}
@@ -273,12 +269,7 @@ func findMergeTarget(flattenedSpec *dw.DevWorkspaceTemplateSpec) (mergeTargetCom
 	return "", fmt.Errorf("couldn't find any merge contribution target component")
 }
 
-func mergeContributionsInto(
-	mergeInto *dw.Component,
-	contributions []dw.Component,
-	defaultResources *corev1.ResourceRequirements,
-	resourceCaps *corev1.ResourceRequirements,
-) (*dw.Component, error) {
+func mergeContributionsInto(mergeInto *dw.Component, contributions []dw.Component, defaultResources *corev1.ResourceRequirements) (*dw.Component, error) {
 	if mergeInto == nil || mergeInto.Container == nil {
 		return nil, fmt.Errorf("attempting to merge container contributions into a non-container component")
 	}

pkg/library/projects/clone.go

@@ -38,7 +38,6 @@ type Options struct {
 	Image      string
 	PullPolicy corev1.PullPolicy
 	Resources  *corev1.ResourceRequirements
-	Caps       *corev1.ResourceRequirements
 	Env        []corev1.EnvVar
 }