Respect pod retain annotation in cross ns host assisted clone (#4050)

May be missing something but an admin might have the relevant RBAC
and want to look at the retained pod
(for themselves or tenants behalf)

Relevant discussion on original PR:
https://github.com/kubevirt/containerized-data-importer/pull/2873/changes#r1313295871

Signed-off-by: Alex Kalenyuk <akalenyu@redhat.com>

Author: akalenyu

pkg/controller/populators/clone-populator.go

@@ -599,20 +599,9 @@ func shouldSkipCleanup(pvc *corev1.PersistentVolumeClaim) bool {
 	//   - AnnPodRetainAfterCompletion annotation is set to true. This means that the user explicitly wants
 	//     to keep the pods.
 	//   - Clone is host-assisted, which is the only clone type with transfer pods worth debugging.
-	//   - Clone occurs in a single namespace, so we avoid retaining pods in a namespace we don't have right to access.
 	if pvc.Annotations[cc.AnnCloneType] == string(cdiv1.CloneStrategyHostAssisted) &&
-		pvc.Annotations[cc.AnnPodRetainAfterCompletion] == "true" && !isCrossNamespaceClone(pvc) {
+		pvc.Annotations[cc.AnnPodRetainAfterCompletion] == "true" {
 		return true
 	}
 	return false
 }
-
-func isCrossNamespaceClone(pvc *corev1.PersistentVolumeClaim) bool {
-	dataSourceNamespace := pvc.Namespace
-	if ns, ok := pvc.Annotations[AnnDataSourceNamespace]; ok {
-		dataSourceNamespace = ns
-	} else if pvc.Spec.DataSourceRef.Namespace != nil {
-		dataSourceNamespace = *pvc.Spec.DataSourceRef.Namespace
-	}
-	return dataSourceNamespace != pvc.Namespace
-}

pkg/controller/populators/clone-populator_test.go

@@ -393,6 +393,21 @@ var _ = Describe("Clone populator tests", func() {
 		Expect(pvc.Finalizers).ToNot(ContainElement(cloneFinalizer))
 		Expect(fp.cleanupCalled).To(BeTrue())
 	})
+
+	It("should skip cleanup for cross namespace host-assisted clone with pod retain annotation", func() {
+		target := succeededTarget()
+		target.Annotations[cc.AnnCloneType] = string(cdiv1.CloneStrategyHostAssisted)
+		target.Annotations[cc.AnnPodRetainAfterCompletion] = "true"
+		target.Annotations[AnnDataSourceNamespace] = "other-ns"
+		reconciler := createClonePopulatorReconciler(target)
+		fp := &fakePlanner{}
+		reconciler.planner = fp
+		result, err := reconciler.Reconcile(context.Background(), nn)
+		isDefaultResult(result, err)
+		pvc := getTarget(reconciler.client)
+		Expect(pvc.Finalizers).ToNot(ContainElement(cloneFinalizer))
+		Expect(fp.cleanupCalled).To(BeFalse())
+	})
 })
 
 // fakePlanner implements Plan interface