diff --git a/pkg/commands/deploy.go b/pkg/commands/deploy.go index 2dac64d7..c0b7dd48 100644 --- a/pkg/commands/deploy.go +++ b/pkg/commands/deploy.go @@ -102,14 +102,15 @@ func NewDeploySchedulerPluginCommand(env *deployer.Environment, commonOpts *opti env.Log.Info("detection", "platform", commonOpts.ClusterPlatform, "reason", reason, "version", commonOpts.ClusterVersion, "source", source) return sched.Deploy(env, options.Scheduler{ - Platform: commonOpts.ClusterPlatform, - WaitCompletion: commonOpts.WaitCompletion, - Replicas: int32(commonOpts.Replicas), - PullIfNotPresent: commonOpts.PullIfNotPresent, - ProfileName: commonOpts.SchedProfileName, - CacheResyncPeriod: commonOpts.SchedResyncPeriod, - CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, - Verbose: commonOpts.SchedVerbose, + Platform: commonOpts.ClusterPlatform, + WaitCompletion: commonOpts.WaitCompletion, + Replicas: int32(commonOpts.Replicas), + PullIfNotPresent: commonOpts.PullIfNotPresent, + ProfileName: commonOpts.SchedProfileName, + CacheResyncPeriod: commonOpts.SchedResyncPeriod, + CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, + Verbose: commonOpts.SchedVerbose, + ScoringStratConfigData: commonOpts.SchedScoringStratConfigData, }) }, Args: cobra.NoArgs, diff --git a/pkg/commands/remove.go b/pkg/commands/remove.go index cd1792d8..d00ee662 100644 --- a/pkg/commands/remove.go +++ b/pkg/commands/remove.go @@ -54,13 +54,15 @@ func NewRemoveCommand(env *deployer.Environment, commonOpts *options.Options) *c env.Log.Info("detection", "platform", commonOpts.ClusterPlatform, "reason", reason, "version", commonOpts.ClusterVersion, "source", source) err = sched.Remove(env, options.Scheduler{ - Platform: commonOpts.ClusterPlatform, - WaitCompletion: commonOpts.WaitCompletion, - Replicas: int32(commonOpts.Replicas), - PullIfNotPresent: commonOpts.PullIfNotPresent, - ProfileName: commonOpts.SchedProfileName, - CacheResyncPeriod: commonOpts.SchedResyncPeriod, - CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, + Platform: commonOpts.ClusterPlatform, + WaitCompletion: commonOpts.WaitCompletion, + Replicas: int32(commonOpts.Replicas), + PullIfNotPresent: commonOpts.PullIfNotPresent, + ProfileName: commonOpts.SchedProfileName, + CacheResyncPeriod: commonOpts.SchedResyncPeriod, + CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, + Verbose: commonOpts.SchedVerbose, + ScoringStratConfigData: commonOpts.SchedScoringStratConfigData, }) if err != nil { // intentionally keep going to remove as much as possible @@ -153,14 +155,15 @@ func NewRemoveSchedulerPluginCommand(env *deployer.Environment, commonOpts *opti env.Log.Info("detection", "platform", commonOpts.ClusterPlatform, "reason", reason, "version", commonOpts.ClusterVersion, "source", source) return sched.Remove(env, options.Scheduler{ - Platform: commonOpts.ClusterPlatform, - WaitCompletion: commonOpts.WaitCompletion, - Replicas: int32(commonOpts.Replicas), - PullIfNotPresent: commonOpts.PullIfNotPresent, - ProfileName: commonOpts.SchedProfileName, - CacheResyncPeriod: commonOpts.SchedResyncPeriod, - CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, - Verbose: commonOpts.SchedVerbose, + Platform: commonOpts.ClusterPlatform, + WaitCompletion: commonOpts.WaitCompletion, + Replicas: int32(commonOpts.Replicas), + PullIfNotPresent: commonOpts.PullIfNotPresent, + ProfileName: commonOpts.SchedProfileName, + CacheResyncPeriod: commonOpts.SchedResyncPeriod, + CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, + Verbose: commonOpts.SchedVerbose, + ScoringStratConfigData: commonOpts.SchedScoringStratConfigData, }) }, Args: cobra.NoArgs, diff --git a/pkg/commands/render.go b/pkg/commands/render.go index 3a491fdb..4c702c46 100644 --- a/pkg/commands/render.go +++ b/pkg/commands/render.go @@ -176,12 +176,13 @@ func RenderManifests(env *deployer.Environment, commonOpts *options.Options) err } schedRenderOpts := options.Scheduler{ - Replicas: int32(commonOpts.Replicas), - PullIfNotPresent: commonOpts.PullIfNotPresent, - ProfileName: commonOpts.SchedProfileName, - CacheResyncPeriod: commonOpts.SchedResyncPeriod, - CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, - Verbose: commonOpts.SchedVerbose, + Replicas: int32(commonOpts.Replicas), + PullIfNotPresent: commonOpts.PullIfNotPresent, + ProfileName: commonOpts.SchedProfileName, + CacheResyncPeriod: commonOpts.SchedResyncPeriod, + CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, + Verbose: commonOpts.SchedVerbose, + ScoringStratConfigData: commonOpts.SchedScoringStratConfigData, } schedObjs, err := schedManifests.Render(env.Log, schedRenderOpts) diff --git a/pkg/deploy/cluster.go b/pkg/deploy/cluster.go index b86ccc51..d9e1a3b0 100644 --- a/pkg/deploy/cluster.go +++ b/pkg/deploy/cluster.go @@ -61,14 +61,15 @@ func OnCluster(env *deployer.Environment, commonOpts *options.Options) error { return err } if err := sched.Deploy(env, options.Scheduler{ - Platform: commonOpts.ClusterPlatform, - WaitCompletion: commonOpts.WaitCompletion, - Replicas: int32(commonOpts.Replicas), - PullIfNotPresent: commonOpts.PullIfNotPresent, - ProfileName: commonOpts.SchedProfileName, - CacheResyncPeriod: commonOpts.SchedResyncPeriod, - CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, - Verbose: commonOpts.SchedVerbose, + Platform: commonOpts.ClusterPlatform, + WaitCompletion: commonOpts.WaitCompletion, + Replicas: int32(commonOpts.Replicas), + PullIfNotPresent: commonOpts.PullIfNotPresent, + ProfileName: commonOpts.SchedProfileName, + CacheResyncPeriod: commonOpts.SchedResyncPeriod, + CtrlPlaneAffinity: commonOpts.SchedCtrlPlaneAffinity, + Verbose: commonOpts.SchedVerbose, + ScoringStratConfigData: commonOpts.SchedScoringStratConfigData, }); err != nil { return err }