hypershift: check for platform

There are places where the deployer should behave the same for OpenShift and HyperShift. For example when it sets the selinux policy. Hence, we want to add `platform.HyperShift` under the check. Signed-off-by: Talor Itzhak <[email protected]>
k8stopologyawareschedwg · Sep 22, 2024 · 8dae24a · 8dae24a
1 parent 16e4670
commit 8dae24a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/manifests/rte/rte.go b/pkg/manifests/rte/rte.go
@@ -68,7 +68,7 @@ func (mf Manifests) Clone() Manifests {
 		ConfigMap:          mf.ConfigMap.DeepCopy(),
 	}
 
-	if mf.plat == platform.OpenShift {
+	if mf.plat == platform.OpenShift || mf.plat == platform.HyperShift {
 		//  MachineConfig is obsolete starting from OCP v4.18
 		if mf.MachineConfig != nil {
 			ret.MachineConfig = mf.MachineConfig.DeepCopy()
@@ -111,7 +111,7 @@ func (mf Manifests) Render(opts options.UpdaterDaemon) (Manifests, error) {
 	}
 	rteupdate.DaemonSet(ret.DaemonSet, mf.plat, rteConfigMapName, opts.DaemonSet)
 
-	if mf.plat == platform.OpenShift {
+	if mf.plat == platform.OpenShift || mf.plat == platform.HyperShift {
 		selinuxType := selinuxassets.RTEContextType
 		if mf.MachineConfig != nil {
 			if opts.Name != "" {

diff --git a/pkg/manifests/sched/sched.go b/pkg/manifests/sched/sched.go
@@ -145,7 +145,7 @@ func (mf Manifests) Render(logger logr.Logger, opts options.Scheduler) (Manifest
 	schedupdate.ControllerDeployment(ret.DPController, opts.PullIfNotPresent, opts.CtrlPlaneAffinity)
 	if opts.Namespace != "" {
 		ret.Namespace.Name = opts.Namespace
-	} else if mf.plat == platform.OpenShift {
+	} else if mf.plat == platform.OpenShift || mf.plat == platform.HyperShift {
 		ret.Namespace.Name = NamespaceOpenShift
 	}