Pass cluster Capabilities instance to initializer

Use the cluster.Capabilities instance created in main for the
ConsolePlugin instead than create a new one.

Signed-off-by: Carlo Lobrano <[email protected]>

Author: clobrano

controllers/console/plugin.go

@@ -24,7 +24,6 @@ import (
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/rest"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	"github.com/openshift/api/console/v1alpha1"
@@ -47,14 +46,10 @@ const (
 // HEADS UP: consider cleanup of old resources in case of name changes or removals!
 //
 // TODO image reference to console plugin in CSV?
-func CreateOrUpdatePlugin(ctx context.Context, cl client.Client, config *rest.Config, namespace string, log logr.Logger) error {
+func CreateOrUpdatePlugin(ctx context.Context, cl client.Client, caps cluster.Capabilities, namespace string, log logr.Logger) error {
 
 	// check if we are on OCP
-	clusterCapabilities, err := cluster.NewCapabilities(config)
-	if err != nil {
-		return errors.Wrap(err, "failed to check cluster capabilities")
-	}
-	if !clusterCapabilities.IsOnOpenshift {
+	if !caps.IsOnOpenshift {
 		log.Info("we are not on Openshift, skipping console plugin activation")
 		return nil
 	}

controllers/initializer/init.go

@@ -6,10 +6,10 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/pkg/errors"
 
-	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
+	"github.com/medik8s/node-healthcheck-operator/controllers/cluster"
 	"github.com/medik8s/node-healthcheck-operator/controllers/console"
 	"github.com/medik8s/node-healthcheck-operator/controllers/rbac"
 	"github.com/medik8s/node-healthcheck-operator/controllers/utils"
@@ -20,17 +20,17 @@ import (
 // - create default NHC
 // - create console plugin
 type initializer struct {
-	cl     client.Client
-	config *rest.Config
-	logger logr.Logger
+	cl           client.Client
+	capabilities cluster.Capabilities
+	logger       logr.Logger
 }
 
 // New returns a new Initializer
-func New(mgr ctrl.Manager, logger logr.Logger) *initializer {
+func New(mgr ctrl.Manager, caps cluster.Capabilities, logger logr.Logger) *initializer {
 	return &initializer{
-		cl:     mgr.GetClient(),
-		config: mgr.GetConfig(),
-		logger: logger,
+		cl:           mgr.GetClient(),
+		capabilities: caps,
+		logger:       logger,
 	}
 }
 
@@ -46,7 +46,7 @@ func (i *initializer) Start(ctx context.Context) error {
 		return errors.Wrap(err, "failed to create or update RBAC aggregation role")
 	}
 
-	if err = console.CreateOrUpdatePlugin(ctx, i.cl, i.config, ns, ctrl.Log.WithName("console-plugin")); err != nil {
+	if err = console.CreateOrUpdatePlugin(ctx, i.cl, i.capabilities, ns, ctrl.Log.WithName("console-plugin")); err != nil {
 		return errors.Wrap(err, "failed to create or update the console plugin")
 	}
 

controllers/initializer/init_test.go

@@ -7,14 +7,17 @@ import (
 	. "github.com/onsi/gomega"
 
 	ctrl "sigs.k8s.io/controller-runtime"
+
+	"github.com/medik8s/node-healthcheck-operator/controllers/cluster"
 )
 
 var _ = Describe("Init", func() {
 
 	var initializer *initializer
 
 	JustBeforeEach(func() {
-		initializer = New(k8sManager, ctrl.Log.WithName("test initializer"))
+		caps := cluster.Capabilities{IsOnOpenshift: true, HasMachineAPI: true}
+		initializer = New(k8sManager, caps, ctrl.Log.WithName("test initializer"))
 	})
 
 	AfterEach(func() {

main.go

@@ -199,7 +199,7 @@ func main() {
 	ctx := ctrl.SetupSignalHandler()
 
 	// Do some initialization
-	initializer := initializer.New(mgr, ctrl.Log.WithName("Initializer"))
+	initializer := initializer.New(mgr, caps, ctrl.Log.WithName("Initializer"))
 	if err = mgr.Add(initializer); err != nil {
 		setupLog.Error(err, "failed to add initializer to the manager")
 		os.Exit(1)