From 16e4670dc536f164ea50e1f5ff22339fdd4fada9 Mon Sep 17 00:00:00 2001 From: Talor Itzhak Date: Sun, 22 Sep 2024 18:19:48 +0300 Subject: [PATCH] deployer: pass `UpdaterCustomSELinuxPolicy` There were few places where we forgot to pass the `UpdaterCustomSELinuxPolicy` option. This commit is suppose to fix that. Signed-off-by: Talor Itzhak --- pkg/commands/deploy.go | 13 +++++++------ pkg/commands/remove.go | 13 +++++++------ pkg/deploy/cluster.go | 13 +++++++------ 3 files changed, 21 insertions(+), 18 deletions(-) diff --git a/pkg/commands/deploy.go b/pkg/commands/deploy.go index ef7e7299..cc75c0e2 100644 --- a/pkg/commands/deploy.go +++ b/pkg/commands/deploy.go @@ -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, diff --git a/pkg/commands/remove.go b/pkg/commands/remove.go index 49e8e258..bae2ee8a 100644 --- a/pkg/commands/remove.go +++ b/pkg/commands/remove.go @@ -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, diff --git a/pkg/deploy/cluster.go b/pkg/deploy/cluster.go index 1d8a0e9c..05a4164d 100644 --- a/pkg/deploy/cluster.go +++ b/pkg/deploy/cluster.go @@ -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 }