Stop using deprecated methods

- RemoveFinalizerWithError to RemoveFinalizer
- AddFinalizerWithError to AddFinalizer
- zap.LoggerTo to zap.New
- use context.Background() directly in SetupWithManager instead of
saving it to a variable

Author: ChunyiLyu

api/v1beta1/suite_test.go

@@ -40,7 +40,8 @@ func TestAPIs(t *testing.T) {
 }
 
 var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{

controllers/rabbitmqcluster_controller.go

@@ -486,10 +486,7 @@ func (r *RabbitmqClusterReconciler) prepareForDeletion(ctx context.Context, rabb
 }
 
 func (r *RabbitmqClusterReconciler) removeFinalizer(ctx context.Context, rabbitmqCluster *rabbitmqv1beta1.RabbitmqCluster) error {
-	if err := controllerutil.RemoveFinalizerWithError(rabbitmqCluster, deletionFinalizer); err != nil {
-		return err
-	}
-
+	controllerutil.RemoveFinalizer(rabbitmqCluster, deletionFinalizer)
 	if err := r.Client.Update(ctx, rabbitmqCluster); err != nil {
 		return err
 	}
@@ -525,10 +522,7 @@ func (r *RabbitmqClusterReconciler) addRabbitmqDeletionLabel(ctx context.Context
 func (r *RabbitmqClusterReconciler) addFinalizerIfNeeded(ctx context.Context, rabbitmqCluster *rabbitmqv1beta1.RabbitmqCluster) error {
 	// The RabbitmqCluster is not marked for deletion (no deletion timestamp) but does not have the deletion finalizer
 	if rabbitmqCluster.ObjectMeta.DeletionTimestamp.IsZero() && !containsString(rabbitmqCluster.ObjectMeta.Finalizers, deletionFinalizer) {
-		if err := controllerutil.AddFinalizerWithError(rabbitmqCluster, deletionFinalizer); err != nil {
-			return err
-		}
-
+		controllerutil.AddFinalizer(rabbitmqCluster, deletionFinalizer)
 		if err := r.Client.Update(ctx, rabbitmqCluster); err != nil {
 			return err
 		}
@@ -567,9 +561,8 @@ func (r *RabbitmqClusterReconciler) getRabbitmqCluster(ctx context.Context, name
 }
 
 func (r *RabbitmqClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
-	ctx := context.Background()
 	for _, resource := range []runtime.Object{&appsv1.StatefulSet{}, &corev1.ConfigMap{}, &corev1.Service{}} {
-		if err := mgr.GetFieldIndexer().IndexField(ctx, resource, ownerKey, addResourceToIndex); err != nil {
+		if err := mgr.GetFieldIndexer().IndexField(context.Background(), resource, ownerKey, addResourceToIndex); err != nil {
 			return err
 		}
 	}

controllers/suite_test.go

@@ -57,7 +57,7 @@ func TestControllers(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	var err error
-	logf.SetLogger(zap.LoggerTo(GinkgoWriter, true))
+	logf.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{