From c978638d6ffe10344eeed308f882a2b6f7ec490b Mon Sep 17 00:00:00 2001 From: Dan Rammer Date: Thu, 7 Sep 2023 09:25:46 -0500 Subject: [PATCH] Fix resources requests for AWS Batch plugin (#400) * retrieving resources from container before merging with overrides and defaults Signed-off-by: Daniel Rammer * fixed linter Signed-off-by: Daniel Rammer --------- Signed-off-by: Daniel Rammer --- go/tasks/plugins/array/awsbatch/transformer.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/go/tasks/plugins/array/awsbatch/transformer.go b/go/tasks/plugins/array/awsbatch/transformer.go index e3cd7041f..ee0809cb9 100644 --- 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{}