fix: clean up retained TrueNAS resources in E2E tests

The reclaim policy retain tests and adoption tests were leaving
TrueNAS backend resources (datasets, NFS shares, NVMe-oF subsystems,
iSCSI targets/extents) after each run because:

- Reclaim retain tests only deleted the K8s PV but not the TrueNAS
  resources (Retain policy skips CSI DeleteVolume)
- Adoption tests cleaned up the adopted volume but not the original
  retained ZVOL that was orphaned during the test

Add explicit TrueNAS cleanup for all three protocols in the retain
tests and delete the original retained ZVOL in both adoption tests.

Author: fenio

tests/e2e/iscsi/adoption_test.go

@@ -214,9 +214,13 @@ var _ = Describe("iSCSI Volume Adoption", func() {
 		err = f.K8s.WaitForPodDeleted(ctx, adoptedPodName, deleteTimeout)
 		Expect(err).NotTo(HaveOccurred())
 
-		// TrueNAS resources (iSCSI target, extent, ZVOL) are cleaned up
-		// by the framework's PVC cleanup, which triggers CSI DeleteVolume.
-		// The adopting StorageClass has no deleteStrategy=retain, so CSI performs full cleanup.
+		// The adopted PVC cleanup (via RegisterPVCCleanup) triggers CSI DeleteVolume
+		// which cleans up the NEW iSCSI target/extent and ZVOL. However, the ORIGINAL
+		// retained ZVOL (zvolPath) is left behind because adoption creates a new
+		// dataset path. Clean up the original retained ZVOL explicitly.
+		By("Cleaning up original retained ZVOL from TrueNAS")
+		err = f.TrueNAS.DeleteDataset(ctx, zvolPath)
+		Expect(err).NotTo(HaveOccurred(), "Failed to delete original retained ZVOL")
 	})
 
 	It("should mark a volume as adoptable when markAdoptable=true", func() {

tests/e2e/nvmeof/adoption_test.go

@@ -215,9 +215,13 @@ var _ = Describe("NVMe-oF Volume Adoption", func() {
 		err = f.K8s.WaitForPodDeleted(ctx, adoptedPodName, deleteTimeout)
 		Expect(err).NotTo(HaveOccurred())
 
-		// TrueNAS resources (NVMe-oF subsystem, port bindings, ZVOL) are cleaned up
-		// by the framework's PVC cleanup, which triggers CSI DeleteVolume.
-		// The adopting StorageClass has no deleteStrategy=retain, so CSI performs full cleanup.
+		// The adopted PVC cleanup (via RegisterPVCCleanup) triggers CSI DeleteVolume
+		// which cleans up the NEW subsystem and namespace. However, the ORIGINAL
+		// retained ZVOL (zvolPath) is left behind because adoption creates a new
+		// dataset path. Clean up the original retained ZVOL explicitly.
+		By("Cleaning up original retained ZVOL from TrueNAS")
+		err = f.TrueNAS.DeleteDataset(ctx, zvolPath)
+		Expect(err).NotTo(HaveOccurred(), "Failed to delete original retained ZVOL")
 	})
 
 	It("should mark a volume as adoptable when markAdoptable=true", func() {

tests/e2e/reclaim_policy_test.go

@@ -3,11 +3,13 @@ package e2e
 
 import (
 	"context"
+	"path"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/klog/v2"
 
 	"github.com/fenio/tns-csi/tests/e2e/framework"
 )
@@ -222,9 +224,52 @@ var _ = Describe("Reclaim Policy", func() {
 				GinkgoWriter.Printf("[%s] Retain reclaim policy verified - PV retained in %s state\n", proto.name, pv.Status.Phase)
 			}
 
+			By("Getting volume handle before cleaning up retained PV")
+			volumeHandle, handleErr := f.K8s.GetVolumeHandle(ctx, pvName)
+			Expect(handleErr).NotTo(HaveOccurred(), "Failed to get volume handle")
+
 			By("Cleaning up retained PV")
 			err = f.K8s.DeletePV(ctx, pvName)
 			Expect(err).NotTo(HaveOccurred(), "Failed to delete retained PV")
+
+			By("Cleaning up retained TrueNAS resources")
+			if f.TrueNAS != nil && volumeHandle != "" {
+				cleanupRetainedTrueNASResources(ctx, f.TrueNAS, proto.id, volumeHandle)
+			}
 		})
 	}
 })
+
+// cleanupRetainedTrueNASResources removes TrueNAS backend resources that are left behind
+// when a volume uses Retain reclaim policy (K8s PV deletion does not trigger CSI DeleteVolume).
+func cleanupRetainedTrueNASResources(ctx context.Context, truenas *framework.TrueNASVerifier, protocol, volumeHandle string) {
+	switch protocol {
+	case "nfs":
+		sharePath := "/mnt/" + volumeHandle
+		if err := truenas.DeleteNFSShare(ctx, sharePath); err != nil {
+			klog.Warningf("Failed to cleanup retained NFS share %s: %v", sharePath, err)
+		}
+		if err := truenas.DeleteDataset(ctx, volumeHandle); err != nil {
+			klog.Warningf("Failed to cleanup retained NFS dataset %s: %v", volumeHandle, err)
+		}
+	case "nvmeof":
+		subsystemNQN := "nqn.2137.csi.tns:" + path.Base(volumeHandle)
+		if err := truenas.DeleteNVMeOFSubsystem(ctx, subsystemNQN); err != nil {
+			klog.Warningf("Failed to cleanup retained NVMe-oF subsystem %s: %v", subsystemNQN, err)
+		}
+		if err := truenas.DeleteDataset(ctx, volumeHandle); err != nil {
+			klog.Warningf("Failed to cleanup retained ZVOL %s: %v", volumeHandle, err)
+		}
+	case "iscsi":
+		targetName := path.Base(volumeHandle)
+		if err := truenas.DeleteISCSITarget(ctx, targetName); err != nil {
+			klog.Warningf("Failed to cleanup retained iSCSI target %s: %v", targetName, err)
+		}
+		if err := truenas.DeleteISCSIExtent(ctx, targetName); err != nil {
+			klog.Warningf("Failed to cleanup retained iSCSI extent %s: %v", targetName, err)
+		}
+		if err := truenas.DeleteDataset(ctx, volumeHandle); err != nil {
+			klog.Warningf("Failed to cleanup retained ZVOL %s: %v", volumeHandle, err)
+		}
+	}
+}