remove unnecessary interface to force compile failure on users

Author: deads2k

pkg/operator/apiserver/controllerset/apiservercontrollerset.go

@@ -310,7 +310,7 @@ func (cs *APIServerControllerSet) WithRevisionController(
 	configMaps []revisioncontroller.RevisionResource,
 	secrets []revisioncontroller.RevisionResource,
 	kubeInformersForTargetNamespace kubeinformers.SharedInformerFactory,
-	revisionClient revisioncontroller.LatestRevisionClient,
+	operatorClient v1helpers.OperatorClient,
 	configMapGetter corev1client.ConfigMapsGetter,
 	secretGetter corev1client.SecretsGetter,
 ) *APIServerControllerSet {
@@ -320,7 +320,7 @@ func (cs *APIServerControllerSet) WithRevisionController(
 		configMaps,
 		secrets,
 		kubeInformersForTargetNamespace,
-		revisionClient,
+		operatorClient,
 		configMapGetter,
 		secretGetter,
 		cs.eventRecorder,

pkg/operator/revisioncontroller/revision_controller.go

@@ -24,17 +24,6 @@ import (
 	"k8s.io/klog/v2"
 )
 
-// LatestRevisionClient is an operator client for an operator status with a latest revision field.
-// Deprecated
-type LatestRevisionClient interface {
-	v1helpers.OperatorClient
-
-	// GetLatestRevisionState returns the spec, status and latest revision.
-	GetLatestRevisionState() (spec *operatorv1.OperatorSpec, status *operatorv1.OperatorStatus, rev int32, rv string, err error)
-	// UpdateLatestRevisionOperatorStatus updates the status with the given latestAvailableRevision and the by applying the given updateFuncs.
-	UpdateLatestRevisionOperatorStatus(ctx context.Context, latestAvailableRevision int32, updateFuncs ...v1helpers.UpdateStatusFunc) (*operatorv1.OperatorStatus, bool, error)
-}
-
 // RevisionController is a controller that watches a set of configmaps and secrets and them against a revision snapshot
 // of them. If the original resources changes, the revision counter is increased, stored in LatestAvailableRevision
 // field of the operator config and new snapshots suffixed by the revision are created.

pkg/operator/revisioncontroller/revision_controller_test.go

@@ -538,7 +538,7 @@ func TestRevisionController(t *testing.T) {
 				tc.testConfigs,
 				tc.testSecrets,
 				informers.NewSharedInformerFactoryWithOptions(kubeClient, 1*time.Minute, informers.WithNamespace(tc.targetNamespace)),
-				StaticPodLatestRevisionClient{StaticPodOperatorClient: tc.staticPodOperatorClient},
+				tc.staticPodOperatorClient,
 				kubeClient.CoreV1(),
 				kubeClient.CoreV1(),
 				eventRecorder,
@@ -566,25 +566,6 @@ func TestRevisionController(t *testing.T) {
 	}
 }
 
-type fakeStaticPodLatestRevisionClient struct {
-	v1helpers.StaticPodOperatorClient
-	client                                 *StaticPodLatestRevisionClient
-	updateLatestRevisionOperatorStatusErrs bool
-}
-
-var _ LatestRevisionClient = &fakeStaticPodLatestRevisionClient{}
-
-func (c fakeStaticPodLatestRevisionClient) GetLatestRevisionState() (*operatorv1.OperatorSpec, *operatorv1.OperatorStatus, int32, string, error) {
-	return c.client.GetLatestRevisionState()
-}
-
-func (c fakeStaticPodLatestRevisionClient) UpdateLatestRevisionOperatorStatus(ctx context.Context, latestAvailableRevision int32, updateFuncs ...v1helpers.UpdateStatusFunc) (*operatorv1.OperatorStatus, bool, error) {
-	if c.updateLatestRevisionOperatorStatusErrs {
-		return nil, false, fmt.Errorf("Operation cannot be fulfilled on kubeapiservers.operator.openshift.io \"cluster\": the object has been modified; please apply your changes to the latest version and try again")
-	}
-	return c.client.UpdateLatestRevisionOperatorStatus(ctx, latestAvailableRevision, updateFuncs...)
-}
-
 func TestRevisionControllerRevisionCreatedFailedStatusUpdate(t *testing.T) {
 	startingObjects := []runtime.Object{
 		&v1.Secret{ObjectMeta: metav1.ObjectMeta{Name: "test-secret", Namespace: targetNamespace}},
@@ -832,7 +813,7 @@ func TestSyncWithRevisionPrecondition(t *testing.T) {
 				tc.testConfigs,
 				tc.testSecrets,
 				informers.NewSharedInformerFactoryWithOptions(kubeClient, 1*time.Minute, informers.WithNamespace(targetNamespace)),
-				StaticPodLatestRevisionClient{StaticPodOperatorClient: tc.staticPodOperatorClient},
+				tc.staticPodOperatorClient,
 				kubeClient.CoreV1(),
 				kubeClient.CoreV1(),
 				eventRecorder,

pkg/operator/revisioncontroller/staticpod.go

@@ -236,7 +236,7 @@ func (b *staticPodOperatorControllerBuilder) ToControllers() (manager.Controller
 			b.revisionConfigMaps,
 			b.revisionSecrets,
 			operandInformers,
-			revisioncontroller.StaticPodLatestRevisionClient{StaticPodOperatorClient: b.staticPodOperatorClient},
+			b.staticPodOperatorClient,
 			configMapClient,
 			secretClient,
 			eventRecorder,