Merge pull request #2005 from p0lyn0mial/operator-workload-rm-dep-co

NO-JIRA: operator/apiserver/workload: remove unused dependency on ClusterOperatorResource

Author: openshift-merge-bot[bot]

pkg/operator/apiserver/controller/workload/workload.go

@@ -18,7 +18,6 @@ import (
 	"k8s.io/client-go/util/workqueue"
 
 	operatorv1 "github.com/openshift/api/operator/v1"
-	openshiftconfigclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
 	applyoperatorv1 "github.com/openshift/client-go/operator/applyconfigurations/operator/v1"
 	"github.com/openshift/library-go/pkg/apps/deployment"
 	"github.com/openshift/library-go/pkg/controller/factory"
@@ -65,9 +64,8 @@ type Controller struct {
 
 	podsLister corev1listers.PodLister
 
-	operatorClient               v1helpers.OperatorClient
-	kubeClient                   kubernetes.Interface
-	openshiftClusterConfigClient openshiftconfigclientv1.ClusterOperatorInterface
+	operatorClient v1helpers.OperatorClient
+	kubeClient     kubernetes.Interface
 
 	delegate           Delegate
 	queue              workqueue.RateLimitingInterface
@@ -90,24 +88,22 @@ func NewController(instanceName, operatorNamespace, targetNamespace, targetOpera
 	informers []factory.Informer,
 	tagetNamespaceInformers []factory.Informer,
 	delegate Delegate,
-	openshiftClusterConfigClient openshiftconfigclientv1.ClusterOperatorInterface,
 	eventRecorder events.Recorder,
 	versionRecorder status.VersionGetter,
 ) factory.Controller {
 	controllerRef := &Controller{
-		controllerInstanceName:       factory.ControllerInstanceName(instanceName, "Workload"),
-		operatorNamespace:            operatorNamespace,
-		targetNamespace:              targetNamespace,
-		targetOperandVersion:         targetOperandVersion,
-		operandNamePrefix:            operandNamePrefix,
-		conditionsPrefix:             conditionsPrefix,
-		operatorClient:               operatorClient,
-		kubeClient:                   kubeClient,
-		podsLister:                   podLister,
-		delegate:                     delegate,
-		openshiftClusterConfigClient: openshiftClusterConfigClient,
-		versionRecorder:              versionRecorder,
-		queue:                        workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), instanceName),
+		controllerInstanceName: factory.ControllerInstanceName(instanceName, "Workload"),
+		operatorNamespace:      operatorNamespace,
+		targetNamespace:        targetNamespace,
+		targetOperandVersion:   targetOperandVersion,
+		operandNamePrefix:      operandNamePrefix,
+		conditionsPrefix:       conditionsPrefix,
+		operatorClient:         operatorClient,
+		kubeClient:             kubeClient,
+		podsLister:             podLister,
+		delegate:               delegate,
+		versionRecorder:        versionRecorder,
+		queue:                  workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), instanceName),
 	}
 
 	c := factory.New()

pkg/operator/apiserver/controllerset/apiservercontrollerset.go

@@ -9,7 +9,6 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	configv1client "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
-	openshiftconfigclientv1 "github.com/openshift/client-go/config/clientset/versioned/typed/config/v1"
 	configinformers "github.com/openshift/client-go/config/informers/externalversions"
 	configv1informers "github.com/openshift/client-go/config/informers/externalversions/config/v1"
 	"github.com/openshift/library-go/pkg/controller/factory"
@@ -267,7 +266,6 @@ func (cs *APIServerControllerSet) WithWorkloadController(
 	name, operatorNamespace, targetNamespace, targetOperandVersion, operandNamePrefix, conditionsPrefix string,
 	kubeClient kubernetes.Interface,
 	delegate workload.Delegate,
-	openshiftClusterConfigClient openshiftconfigclientv1.ClusterOperatorInterface,
 	versionRecorder status.VersionGetter,
 	kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces,
 	informers ...factory.Informer) *APIServerControllerSet {
@@ -292,7 +290,6 @@ func (cs *APIServerControllerSet) WithWorkloadController(
 		[]factory.Informer{kubeInformersForNamespaces.InformersFor(targetNamespace).Core().V1().Namespaces().Informer()},
 
 		delegate,
-		openshiftClusterConfigClient,
 		cs.eventRecorder,
 		versionRecorder)