Resolve conflict in reconciler_test.go

By bring in the change from latest commit: 7b3376

Author: mytreya-rh

pkg/rotation/reconciler_test.go

@@ -433,6 +433,7 @@ func TestReconcileNoError(t *testing.T) {
 
 			// test with pod being terminated
 			podToAdd.DeletionTimestamp = &metav1.Time{Time: time.Now()}
+			podToAdd.Finalizers = []string{"testingFinalizer"}
 			kubeClient = fake.NewSimpleClientset(podToAdd, test.nodePublishSecretRefSecretToAdd)
 			initObjects = []client.Object{
 				podToAdd,