Commit 6e48ca9b authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Tidy up function calls with many args

parent 6ef00009
...@@ -188,7 +188,8 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error { ...@@ -188,7 +188,8 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
servicelb.DefaultLBImage = config.ControlConfig.SystemDefaultRegistry + "/" + servicelb.DefaultLBImage servicelb.DefaultLBImage = config.ControlConfig.SystemDefaultRegistry + "/" + servicelb.DefaultLBImage
} }
helm.Register(ctx, sc.Apply, helm.Register(ctx,
sc.Apply,
sc.Helm.Helm().V1().HelmChart(), sc.Helm.Helm().V1().HelmChart(),
sc.Helm.Helm().V1().HelmChartConfig(), sc.Helm.Helm().V1().HelmChartConfig(),
sc.Batch.Batch().V1().Job(), sc.Batch.Batch().V1().Job(),
...@@ -204,7 +205,8 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error { ...@@ -204,7 +205,8 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
sc.Core.Core().V1().Pod(), sc.Core.Core().V1().Pod(),
sc.Core.Core().V1().Service(), sc.Core.Core().V1().Service(),
sc.Core.Core().V1().Endpoints(), sc.Core.Core().V1().Endpoints(),
!config.DisableServiceLB, config.Rootless); err != nil { !config.DisableServiceLB,
config.Rootless); err != nil {
return err return err
} }
...@@ -213,7 +215,10 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error { ...@@ -213,7 +215,10 @@ func coreControllers(ctx context.Context, sc *Context, config *Config) error {
} }
if config.Rootless { if config.Rootless {
return rootlessports.Register(ctx, sc.Core.Core().V1().Service(), !config.DisableServiceLB, config.ControlConfig.HTTPSPort) return rootlessports.Register(ctx,
sc.Core.Core().V1().Service(),
!config.DisableServiceLB,
config.ControlConfig.HTTPSPort)
} }
return nil return nil
...@@ -242,7 +247,11 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control) ...@@ -242,7 +247,11 @@ func stageFiles(ctx context.Context, sc *Context, controlConfig *config.Control)
return err return err
} }
return deploy.WatchFiles(ctx, sc.Apply, sc.K3s.K3s().V1().Addon(), controlConfig.Disables, dataDir) return deploy.WatchFiles(ctx,
sc.Apply,
sc.K3s.K3s().V1().Addon(),
controlConfig.Disables,
dataDir)
} }
// registryTemplate behaves like the system_default_registry template in Rancher helm charts, // registryTemplate behaves like the system_default_registry template in Rancher helm charts,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment