secretannotator: Only pass clients to Reconciler

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

pkg/operator/secretannotator/aws/reconciler.go

@@ -38,16 +38,16 @@ const (
 	AwsSecretAccessKeyName = "aws_secret_access_key"
 )
 
-func NewReconciler(c client.Client, mgr manager.Manager) reconcile.Reconciler {
+func NewReconciler(client, rootCredClient, liveClient client.Client) reconcile.Reconciler {
 	r := &ReconcileCloudCredSecret{
-		Client:           c,
-		RootCredClient:   mgr.GetClient(),
-		LiveClient:       utils.LiveClient(mgr),
+		Client:           client,
+		RootCredClient:   rootCredClient,
+		LiveClient:       liveClient,
 		Logger:           log.WithField("controller", constants.SecretAnnotatorControllerName),
 		AWSClientBuilder: awsutils.ClientBuilder,
 	}
 
-	s := status.NewSecretStatusHandler(c)
+	s := status.NewSecretStatusHandler(client)
 	statuscontroller.AddHandler(constants.SecretAnnotatorControllerName, s)
 
 	return r

pkg/operator/secretannotator/azure/reconciler.go

@@ -38,14 +38,14 @@ type ReconcileCloudCredSecret struct {
 	Logger         log.FieldLogger
 }
 
-func NewReconciler(c client.Client, mgr manager.Manager) reconcile.Reconciler {
+func NewReconciler(client, rootCredClient client.Client) reconcile.Reconciler {
 	r := &ReconcileCloudCredSecret{
-		Client:         c,
-		RootCredClient: mgr.GetClient(),
+		Client:         client,
+		RootCredClient: rootCredClient,
 		Logger:         log.WithField("controller", constants.SecretAnnotatorControllerName),
 	}
 
-	s := status.NewSecretStatusHandler(c)
+	s := status.NewSecretStatusHandler(client)
 	statuscontroller.AddHandler(constants.SecretAnnotatorControllerName, s)
 
 	return r

pkg/operator/secretannotator/gcp/reconciler.go

@@ -40,16 +40,16 @@ const (
 	GCPAuthJSONKey = "service_account.json"
 )
 
-func NewReconciler(c client.Client, mgr manager.Manager, projectName string) reconcile.Reconciler {
+func NewReconciler(client, rootCredClient client.Client, projectName string) reconcile.Reconciler {
 	r := &ReconcileCloudCredSecret{
-		Client:           c,
-		RootCredClient:   mgr.GetClient(),
+		Client:           client,
+		RootCredClient:   rootCredClient,
 		Logger:           log.WithField("controller", constants.SecretAnnotatorControllerName),
 		GCPClientBuilder: ccgcp.NewClientFromJSON,
 		ProjectName:      projectName,
 	}
 
-	s := status.NewSecretStatusHandler(c)
+	s := status.NewSecretStatusHandler(client)
 	statuscontroller.AddHandler(controllerName, s)
 
 	return r

pkg/operator/secretannotator/openstack/reconciler.go

@@ -49,15 +49,15 @@ import (
 	"github.com/openshift/cloud-credential-operator/pkg/operator/utils"
 )
 
-func NewReconciler(c client.Client, mgr manager.Manager) reconcile.Reconciler {
+func NewReconciler(client, rootCredClient, liveClient client.Client) reconcile.Reconciler {
 	r := &ReconcileCloudCredSecret{
-		Client:         c,
-		RootCredClient: mgr.GetClient(),
-		LiveClient:     utils.LiveClient(mgr),
+		Client:         client,
+		RootCredClient: rootCredClient,
+		LiveClient:     liveClient,
 		Logger:         log.WithField("controller", constants.SecretAnnotatorControllerName),
 	}
 
-	s := status.NewSecretStatusHandler(c)
+	s := status.NewSecretStatusHandler(client)
 	statuscontroller.AddHandler(constants.SecretAnnotatorControllerName, s)
 
 	return r

pkg/operator/secretannotator/secretannotator_controller.go

@@ -26,6 +26,7 @@ import (
 	"github.com/openshift/cloud-credential-operator/pkg/operator/secretannotator/gcp"
 	"github.com/openshift/cloud-credential-operator/pkg/operator/secretannotator/openstack"
 	"github.com/openshift/cloud-credential-operator/pkg/operator/secretannotator/vsphere"
+	"github.com/openshift/cloud-credential-operator/pkg/operator/utils"
 	log "github.com/sirupsen/logrus"
 )
 
@@ -40,19 +41,19 @@ func Add(mgr, rootCredentialManager manager.Manager, kubeconfig string) error {
 
 	switch platformType {
 	case configv1.AzurePlatformType:
-		return azure.Add(mgr, rootCredentialManager, azure.NewReconciler(mgr.GetClient(), rootCredentialManager))
+		return azure.Add(mgr, rootCredentialManager, azure.NewReconciler(mgr.GetClient(), rootCredentialManager.GetClient()))
 	case configv1.AWSPlatformType:
-		return aws.Add(mgr, rootCredentialManager, aws.NewReconciler(mgr.GetClient(), rootCredentialManager))
+		return aws.Add(mgr, rootCredentialManager, aws.NewReconciler(mgr.GetClient(), rootCredentialManager.GetClient(), utils.LiveClient(mgr)))
 	case configv1.GCPPlatformType:
 		if infraStatus.PlatformStatus == nil || infraStatus.PlatformStatus.GCP == nil {
 			log.Fatalf("Missing GCP configuration in infrastructure platform status")
 		}
-		return gcp.Add(mgr, rootCredentialManager, gcp.NewReconciler(mgr.GetClient(), rootCredentialManager, infraStatus.PlatformStatus.GCP.ProjectID))
+		return gcp.Add(mgr, rootCredentialManager, gcp.NewReconciler(mgr.GetClient(), rootCredentialManager.GetClient(), infraStatus.PlatformStatus.GCP.ProjectID))
 	case configv1.VSpherePlatformType:
-		return vsphere.Add(mgr, rootCredentialManager, vsphere.NewReconciler(mgr.GetClient(), rootCredentialManager))
+		return vsphere.Add(mgr, rootCredentialManager, vsphere.NewReconciler(mgr.GetClient(), rootCredentialManager.GetClient()))
 	case configv1.OpenStackPlatformType:
-		return openstack.Add(mgr, rootCredentialManager, openstack.NewReconciler(mgr.GetClient(), rootCredentialManager))
+		return openstack.Add(mgr, rootCredentialManager, openstack.NewReconciler(mgr.GetClient(), rootCredentialManager.GetClient(), utils.LiveClient(mgr)))
 	default: // returning the AWS implementation for default to avoid changing any behavior
-		return aws.Add(mgr, rootCredentialManager, aws.NewReconciler(mgr.GetClient(), rootCredentialManager))
+		return aws.Add(mgr, rootCredentialManager, aws.NewReconciler(mgr.GetClient(), rootCredentialManager.GetClient(), utils.LiveClient(mgr)))
 	}
 }

pkg/operator/secretannotator/vsphere/reconciler.go

@@ -58,10 +58,10 @@ type ReconcileCloudCredSecret struct {
 }
 
 // NewReconciler will return a reconciler for handling vSphere cloud cred secrets.
-func NewReconciler(c client.Client, mgr manager.Manager) reconcile.Reconciler {
+func NewReconciler(client, rootCredClient client.Client) reconcile.Reconciler {
 	return &ReconcileCloudCredSecret{
-		Client:         c,
-		RootCredClient: mgr.GetClient(),
+		Client:         client,
+		RootCredClient: rootCredClient,
 		Logger:         log.WithField("controller", constants.SecretAnnotatorControllerName),
 	}
 }