Skip to content
This repository has been archived by the owner on Oct 9, 2023. It is now read-only.

Commit

Permalink
Merge 0471ff9 into ccf8286
Browse files Browse the repository at this point in the history
  • Loading branch information
pmahindrakar-oss authored Jun 29, 2022
2 parents ccf8286 + 0471ff9 commit 6cc3074
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
7 changes: 6 additions & 1 deletion pkg/manager/impl/execution_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,6 @@ func mergeIntoExecConfig(workflowExecConfig admin.WorkflowExecutionConfig, spec
workflowExecConfig.GetInterruptible().GetValue() != spec.GetInterruptible().GetValue()) {
workflowExecConfig.Interruptible = spec.GetInterruptible()
}

return workflowExecConfig
}

Expand Down Expand Up @@ -538,6 +537,12 @@ func (m *ExecutionManager) getExecutionConfig(ctx context.Context, request *admi
}
// merge the application config into workflowExecConfig. If even the deprecated fields are not set
workflowExecConfig = mergeIntoExecConfig(workflowExecConfig, m.config.ApplicationConfiguration().GetTopLevelConfig())
// Explicitly set the security context if its nil since downstream we expect this settings to be available
if workflowExecConfig.GetSecurityContext() == nil {
workflowExecConfig.SecurityContext = &core.SecurityContext{
RunAs: &core.Identity{},
}
}
logger.Infof(ctx, "getting the workflow execution config from application configuration")
// Defaults to one from the application config
return &workflowExecConfig, nil
Expand Down
2 changes: 1 addition & 1 deletion pkg/runtime/application_config_provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var flyteAdminConfig = config.MustRegisterSection(flyteAdmin, &interfaces.Applic
EventVersion: 2,
AsyncEventsBufferSize: 100,
MaxParallelism: 25,
K8SServiceAccount: "default",
K8SServiceAccount: "",
})

var schedulerConfig = config.MustRegisterSection(scheduler, &interfaces.SchedulerConfig{
Expand Down

0 comments on commit 6cc3074

Please sign in to comment.