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

Reverting the default values for service account to empty #450

Merged
merged 2 commits into from
Jun 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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