Add a non namespaced client to SriovOperatorConfigReconciler

Signed-off-by: Andrea Panattoni <apanatto@redhat.com>
k8snetworkplumbingwg · Jul 3, 2024 · 7aacaae · 7aacaae
1 parent 57a2f8e
commit 7aacaae
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/controllers/sriovoperatorconfig_controller.go b/controllers/sriovoperatorconfig_controller.go
@@ -56,6 +56,7 @@ type SriovOperatorConfigReconciler struct {
 	Scheme         *runtime.Scheme
 	PlatformHelper platforms.Interface
 	FeatureGate    featuregate.FeatureGate
+	GlobalClient   client.Client
 }
 
 //+kubebuilder:rbac:groups=sriovnetwork.openshift.io,resources=sriovoperatorconfigs,verbs=get;list;watch;create;update;patch;delete
@@ -237,7 +238,7 @@ func (r *SriovOperatorConfigReconciler) syncMetricsExporter(ctx context.Context,
 	data.Data["MetricsExporterPort"] = os.Getenv("METRICS_EXPORTER_PORT")
 	data.Data["MetricsExporterKubeRbacProxyImage"] = os.Getenv("METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE")
 	data.Data["IsOpenshift"] = r.PlatformHelper.IsOpenshiftCluster()
-	data.Data["IsPrometheusOperatorInstalled"] = isPrometheusOperatorInstalled(ctx, r.Client)
+	data.Data["IsPrometheusOperatorInstalled"] = isPrometheusOperatorInstalled(ctx, r.GlobalClient)
 	data.Data["NodeSelectorField"] = GetDefaultNodeSelector()
 	if dc.Spec.ConfigDaemonNodeSelector != nil {
 		data.Data["NodeSelectorField"] = dc.Spec.ConfigDaemonNodeSelector

diff --git a/controllers/sriovoperatorconfig_controller_test.go b/controllers/sriovoperatorconfig_controller_test.go
@@ -83,6 +83,7 @@ var _ = Describe("SriovOperatorConfig controller", Ordered, func() {
 
 		reconciler = &SriovOperatorConfigReconciler{
 			Client:         k8sManager.GetClient(),
+			GlobalClient:         k8sManager.GetClient(),
 			Scheme:         k8sManager.GetScheme(),
 			PlatformHelper: platformHelper,
 			FeatureGate:    featuregate.New(),

diff --git a/main.go b/main.go
@@ -222,6 +222,7 @@ func main() {
 	}
 	if err = (&controllers.SriovOperatorConfigReconciler{
 		Client:         mgr.GetClient(),
+		GlobalClient:   mgrGlobal.GetClient(),
 		Scheme:         mgr.GetScheme(),
 		PlatformHelper: platformsHelper,
 		FeatureGate:    featureGate,