From 26fe6ad6ff6885811026af6f93f98b93f25f2637 Mon Sep 17 00:00:00 2001 From: Rafael Raposo Date: Thu, 21 Mar 2024 07:24:31 +0100 Subject: [PATCH] LP and WF Signed-off-by: Rafael Raposo --- .../pkg/manager/impl/execution_manager.go | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/flyteadmin/pkg/manager/impl/execution_manager.go b/flyteadmin/pkg/manager/impl/execution_manager.go index 4b9d76e061..584da56cbc 100644 --- a/flyteadmin/pkg/manager/impl/execution_manager.go +++ b/flyteadmin/pkg/manager/impl/execution_manager.go @@ -952,17 +952,23 @@ func (m *ExecutionManager) launchExecutionAndPrepareModel( return nil, nil, err } + var executionClusterLabel *admin.ExecutionClusterLabel + if requestSpec.ExecutionClusterLabel == nil { + executionClusterLabel = requestSpec.ExecutionClusterLabel + } + executionParameters := workflowengineInterfaces.ExecutionParameters{ - Inputs: executionInputs, - AcceptedAt: requestedAt, - Labels: labels, - Annotations: annotations, - ExecutionConfig: executionConfig, - TaskResources: &platformTaskResources, - EventVersion: m.config.ApplicationConfiguration().GetTopLevelConfig().EventVersion, - RoleNameKey: m.config.ApplicationConfiguration().GetTopLevelConfig().RoleNameKey, - RawOutputDataConfig: rawOutputDataConfig, - ClusterAssignment: clusterAssignment, + Inputs: executionInputs, + AcceptedAt: requestedAt, + Labels: labels, + Annotations: annotations, + ExecutionConfig: executionConfig, + TaskResources: &platformTaskResources, + EventVersion: m.config.ApplicationConfiguration().GetTopLevelConfig().EventVersion, + RoleNameKey: m.config.ApplicationConfiguration().GetTopLevelConfig().RoleNameKey, + RawOutputDataConfig: rawOutputDataConfig, + ClusterAssignment: clusterAssignment, + ExecutionClusterLabel: executionClusterLabel, } overrides, err := m.addPluginOverrides(ctx, &workflowExecutionID, launchPlan.GetSpec().WorkflowId.Name, launchPlan.Id.Name)