Fix resources requests for AWS Batch plugin (#400)

* retrieving resources from container before merging with overrides and defaults Signed-off-by: Daniel Rammer <[email protected]> * fixed linter Signed-off-by: Daniel Rammer <[email protected]> --------- Signed-off-by: Daniel Rammer <[email protected]>
flyteorg · Sep 7, 2023 · c978638 · c978638
1 parent 552f145
commit c978638
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/go/tasks/plugins/array/awsbatch/transformer.go b/go/tasks/plugins/array/awsbatch/transformer.go
@@ -81,7 +81,17 @@ func FlyteTaskToBatchInput(ctx context.Context, tCtx pluginCore.TaskExecutionCon
 	}
 
 	envVars := getEnvVarsForTask(ctx, tCtx.TaskExecutionMetadata().GetTaskExecutionID(), taskTemplate.GetContainer().GetEnv(), cfg.DefaultEnvVars)
-	res := tCtx.TaskExecutionMetadata().GetOverrides().GetResources()
+
+	// compile resources
+	res, err := flytek8s.ToK8sResourceRequirements(taskTemplate.GetContainer().GetResources())
+	if err != nil {
+		return nil, err
+	}
+
+	if overrideResources := tCtx.TaskExecutionMetadata().GetOverrides().GetResources(); overrideResources != nil {
+		flytek8s.MergeResources(*overrideResources, res)
+	}
+
 	platformResources := tCtx.TaskExecutionMetadata().GetPlatformResources()
 	if platformResources == nil {
 		platformResources = &v1.ResourceRequirements{}