Remove embedded reconcile.Reconciler (#2698)

Signed-off-by: Arnon Gilboa <agilboa@redhat.com>

pkg/controller/datavolume/controller-base.go

@@ -108,7 +108,6 @@ type dvSyncState struct {
 
 // ReconcilerBase members
 type ReconcilerBase struct {
-	reconcile.Reconciler
 	client          client.Client
 	recorder        record.EventRecorder
 	scheme          *runtime.Scheme
@@ -354,6 +353,7 @@ func getSourceRefOp(log logr.Logger, dv *cdiv1.DataVolume, client client.Client)
 }
 
 type dvController interface {
+	reconcile.Reconciler
 	sync(log logr.Logger, req reconcile.Request) (dvSyncResult, error)
 	updateStatusPhase(pvc *corev1.PersistentVolumeClaim, dataVolumeCopy *cdiv1.DataVolume, event *Event) error
 }

pkg/controller/datavolume/external-population-controller.go

@@ -69,7 +69,6 @@ func NewPopulatorController(ctx context.Context, mgr manager.Manager, log logr.L
 			installerLabels: installerLabels,
 		},
 	}
-	reconciler.Reconciler = reconciler
 
 	datavolumeController, err := controller.New(populatorControllerName, mgr, controller.Options{Reconciler: reconciler})
 	if err != nil {

pkg/controller/datavolume/external-population-controller_test.go

@@ -380,7 +380,6 @@ func createPopulatorReconcilerWithoutConfig(objects ...runtime.Object) *Populato
 			},
 		},
 	}
-	r.Reconciler = r
 	return r
 }
 

pkg/controller/datavolume/import-controller.go

@@ -85,7 +85,6 @@ func NewImportController(
 			installerLabels: installerLabels,
 		},
 	}
-	reconciler.Reconciler = reconciler
 
 	datavolumeController, err := controller.New(importControllerName, mgr, controller.Options{
 		Reconciler: reconciler,

pkg/controller/datavolume/import-controller_test.go

@@ -1295,7 +1295,7 @@ var _ = Describe("All DataVolume Tests", func() {
 })
 
 func dvPhaseTest(reconciler ReconcilerBase, dvc dvController, testDv runtime.Object, current, expected cdiv1.DataVolumePhase, pvcPhase corev1.PersistentVolumeClaimPhase, podPhase corev1.PodPhase, ann, expectedEvent string, extraAnnotations ...string) {
-	_, err := reconciler.Reconciler.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}})
+	_, err := dvc.Reconcile(context.TODO(), reconcile.Request{NamespacedName: types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}})
 	Expect(err).ToNot(HaveOccurred())
 	dv := &cdiv1.DataVolume{}
 	err = reconciler.client.Get(context.TODO(), types.NamespacedName{Name: "test-dv", Namespace: metav1.NamespaceDefault}, dv)
@@ -1443,7 +1443,6 @@ func createImportReconcilerWithoutConfig(objects ...runtime.Object) *ImportRecon
 			},
 		},
 	}
-	r.Reconciler = r
 	return r
 }
 

pkg/controller/datavolume/pvc-clone-controller.go

@@ -111,7 +111,6 @@ func NewPvcCloneController(
 		},
 		sccs: sccs,
 	}
-	reconciler.Reconciler = reconciler
 
 	dataVolumeCloneController, err := controller.New(pvcCloneControllerName, mgr, controller.Options{
 		Reconciler: reconciler,

pkg/controller/datavolume/pvc-clone-controller_test.go

@@ -1007,7 +1007,6 @@ func createCloneReconcilerWithoutConfig(objects ...runtime.Object) *PvcCloneReco
 		},
 		sccs: sccs,
 	}
-	r.Reconciler = r
 	return r
 }
 

pkg/controller/datavolume/snapshot-clone-controller.go

@@ -83,7 +83,6 @@ func NewSnapshotCloneController(
 			tokenGenerator: newLongTermCloneTokenGenerator(tokenPrivateKey),
 		},
 	}
-	reconciler.Reconciler = reconciler
 
 	dataVolumeCloneController, err := controller.New(snapshotCloneControllerName, mgr, controller.Options{
 		Reconciler: reconciler,

pkg/controller/datavolume/snapshot-clone-controller_test.go

@@ -282,7 +282,6 @@ func createSnapshotCloneReconcilerWithoutConfig(objects ...runtime.Object) *Snap
 			tokenGenerator: &FakeGenerator{token: "foobar"},
 		},
 	}
-	r.Reconciler = r
 	return r
 }
 

pkg/controller/datavolume/upload-controller.go

@@ -78,7 +78,6 @@ func NewUploadController(
 			installerLabels: installerLabels,
 		},
 	}
-	reconciler.Reconciler = reconciler
 
 	datavolumeController, err := controller.New(uploadControllerName, mgr, controller.Options{
 		Reconciler: reconciler,

pkg/controller/datavolume/upload-controller_test.go

@@ -118,6 +118,5 @@ func createUploadReconcilerWithoutConfig(objects ...runtime.Object) *UploadRecon
 			},
 		},
 	}
-	r.Reconciler = r
 	return r
 }