pao:hypershift: add management client

Adding a management client to be used on a hypershift platform. Signed-off-by: Talor Itzhak <[email protected]>
openshift · May 15, 2024 · be1e986 · be1e986
1 parent 911eab4
commit be1e986
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmd/cluster-node-tuning-operator/main.go b/cmd/cluster-node-tuning-operator/main.go
@@ -181,6 +181,7 @@ func operatorRun() {
 		}
 		if err = (&paocontroller.PerformanceProfileReconciler{
 			Client:            mgr.GetClient(),
+			ManagementClient:  mgr.GetClient(),
 			Recorder:          mgr.GetEventRecorderFor("performance-profile-controller"),
 			FeatureGate:       fg,
 			ComponentsHandler: handler.NewHandler(mgr.GetClient(), mgr.GetScheme()),

diff --git a/pkg/performanceprofile/controller/performanceprofile_controller.go b/pkg/performanceprofile/controller/performanceprofile_controller.go
@@ -61,6 +61,7 @@ const finalizer = "foreground-deletion"
 // PerformanceProfileReconciler reconciles a PerformanceProfile object
 type PerformanceProfileReconciler struct {
 	client.Client
+	ManagementClient  client.Client
 	Recorder          record.EventRecorder
 	FeatureGate       featuregates.FeatureGate
 	ComponentsHandler components.Handler
@@ -424,8 +425,6 @@ func (r *PerformanceProfileReconciler) Reconcile(ctx context.Context, req ctrl.R
 	return ctrl.Result{}, nil
 }
 
-func (r *PerformanceProfileReconciler) isMixedCPUsEnabled(profile *performancev2.PerformanceProfile) bool {
-	if !r.FeatureGate.Enabled(apiconfigv1.FeatureGateMixedCPUsAllocation) {
 func (r *PerformanceProfileReconciler) isMixedCPUsEnabled(object client.Object) bool {
 	if ntoconfig.InHyperShift() {
 		return false

diff --git a/pkg/performanceprofile/controller/performanceprofile_controller_test.go b/pkg/performanceprofile/controller/performanceprofile_controller_test.go
@@ -1139,6 +1139,7 @@ func newFakeReconciler(profile client.Object, initObjects ...runtime.Object) *Pe
 	fg, _ := fakeFeatureGateAccessor.CurrentFeatureGates()
 	return &PerformanceProfileReconciler{
 		Client:            fakeClient,
+		ManagementClient:  fakeClient,
 		Recorder:          fakeRecorder,
 		FeatureGate:       fg,
 		ComponentsHandler: handler.NewHandler(fakeClient, scheme.Scheme),