Skip to content

Commit

Permalink
deployer: pass UpdaterCustomSELinuxPolicy
Browse files Browse the repository at this point in the history
There were few places where we forgot to pass the `UpdaterCustomSELinuxPolicy`
option. This commit is suppose to fix that.

Signed-off-by: Talor Itzhak <[email protected]>
  • Loading branch information
Tal-or committed Sep 22, 2024
1 parent 21c9507 commit 16e4670
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 18 deletions.
13 changes: 7 additions & 6 deletions pkg/commands/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -145,12 +145,13 @@ func NewDeployTopologyUpdaterCommand(env *deployer.Environment, commonOpts *opti

env.Log.V(3).Info("detection", "platform", commonOpts.ClusterPlatform, "reason", reason, "version", commonOpts.ClusterVersion, "source", source)
return updaters.Deploy(env, commonOpts.UpdaterType, options.Updater{
Platform: commonOpts.ClusterPlatform,
PlatformVersion: commonOpts.ClusterVersion,
WaitCompletion: commonOpts.WaitCompletion,
RTEConfigData: commonOpts.RTEConfigData,
DaemonSet: options.ForDaemonSet(commonOpts),
EnableCRIHooks: commonOpts.UpdaterCRIHooksEnable,
Platform: commonOpts.ClusterPlatform,
PlatformVersion: commonOpts.ClusterVersion,
WaitCompletion: commonOpts.WaitCompletion,
RTEConfigData: commonOpts.RTEConfigData,
DaemonSet: options.ForDaemonSet(commonOpts),
EnableCRIHooks: commonOpts.UpdaterCRIHooksEnable,
CustomSELinuxPolicy: commonOpts.UpdaterCustomSELinuxPolicy,
})
},
Args: cobra.NoArgs,
Expand Down
13 changes: 7 additions & 6 deletions pkg/commands/remove.go
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,13 @@ func NewRemoveTopologyUpdaterCommand(env *deployer.Environment, commonOpts *opti

env.Log.V(3).Info("detection", "platform", commonOpts.ClusterPlatform, "reason", reason, "version", commonOpts.ClusterVersion, "source", source)
return updaters.Remove(env, commonOpts.UpdaterType, options.Updater{
Platform: commonOpts.ClusterPlatform,
PlatformVersion: commonOpts.ClusterVersion,
WaitCompletion: commonOpts.WaitCompletion,
RTEConfigData: commonOpts.RTEConfigData,
DaemonSet: options.ForDaemonSet(commonOpts),
EnableCRIHooks: commonOpts.UpdaterCRIHooksEnable,
Platform: commonOpts.ClusterPlatform,
PlatformVersion: commonOpts.ClusterVersion,
WaitCompletion: commonOpts.WaitCompletion,
RTEConfigData: commonOpts.RTEConfigData,
DaemonSet: options.ForDaemonSet(commonOpts),
EnableCRIHooks: commonOpts.UpdaterCRIHooksEnable,
CustomSELinuxPolicy: commonOpts.UpdaterCustomSELinuxPolicy,
})
},
Args: cobra.NoArgs,
Expand Down
13 changes: 7 additions & 6 deletions pkg/deploy/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@ func OnCluster(env *deployer.Environment, commonOpts *options.Options) error {
return err
}
if err := updaters.Deploy(env, commonOpts.UpdaterType, options.Updater{
Platform: commonOpts.ClusterPlatform,
PlatformVersion: commonOpts.ClusterVersion,
WaitCompletion: commonOpts.WaitCompletion,
RTEConfigData: commonOpts.RTEConfigData,
DaemonSet: options.ForDaemonSet(commonOpts),
EnableCRIHooks: commonOpts.UpdaterCRIHooksEnable,
Platform: commonOpts.ClusterPlatform,
PlatformVersion: commonOpts.ClusterVersion,
WaitCompletion: commonOpts.WaitCompletion,
RTEConfigData: commonOpts.RTEConfigData,
DaemonSet: options.ForDaemonSet(commonOpts),
EnableCRIHooks: commonOpts.UpdaterCRIHooksEnable,
CustomSELinuxPolicy: commonOpts.UpdaterCustomSELinuxPolicy,
}); err != nil {
return err
}
Expand Down

0 comments on commit 16e4670

Please sign in to comment.