From c3de5b707e24d9ec9c20b476b89fb18b13cf2378 Mon Sep 17 00:00:00 2001
From: Davanum Srinivas <davanum@gmail.com>
Date: Thu, 27 Feb 2025 12:28:30 -0500
Subject: [PATCH] Do not look for SSH external IP for NFSPersistentVolumes
 tests

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
---
 .../nfs_persistent_volume-disruptive.go       | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/test/e2e/storage/nfs_persistent_volume-disruptive.go b/test/e2e/storage/nfs_persistent_volume-disruptive.go
index 64b46665745..c484d66cbdc 100644
--- a/test/e2e/storage/nfs_persistent_volume-disruptive.go
+++ b/test/e2e/storage/nfs_persistent_volume-disruptive.go
@@ -49,15 +49,15 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
 	f := framework.NewDefaultFramework("disruptive-pv")
 	f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
 	var (
-		c                           clientset.Interface
-		ns                          string
-		nfsServerPod                *v1.Pod
-		nfsPVconfig                 e2epv.PersistentVolumeConfig
-		pvcConfig                   e2epv.PersistentVolumeClaimConfig
-		nfsServerHost, clientNodeIP string
-		clientNode                  *v1.Node
-		volLabel                    labels.Set
-		selector                    *metav1.LabelSelector
+		c             clientset.Interface
+		ns            string
+		nfsServerPod  *v1.Pod
+		nfsPVconfig   e2epv.PersistentVolumeConfig
+		pvcConfig     e2epv.PersistentVolumeClaimConfig
+		nfsServerHost string
+		clientNode    *v1.Node
+		volLabel      labels.Set
+		selector      *metav1.LabelSelector
 	)
 
 	ginkgo.BeforeEach(func(ctx context.Context) {
@@ -88,20 +88,18 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
 			Selector:         selector,
 			StorageClassName: &emptyStorageClass,
 		}
-		// Get the first ready node IP that is not hosting the NFS pod.
-		if clientNodeIP == "" {
+		if clientNode == nil {
 			framework.Logf("Designating test node")
 			nodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
 			framework.ExpectNoError(err)
 			for _, node := range nodes.Items {
 				if node.Name != nfsServerPod.Spec.NodeName {
 					clientNode = &node
-					clientNodeIP, err = e2enode.GetSSHExternalIP(clientNode)
 					framework.ExpectNoError(err)
 					break
 				}
 			}
-			gomega.Expect(clientNodeIP).NotTo(gomega.BeEmpty())
+			gomega.Expect(clientNode).NotTo(gomega.BeEmpty())
 		}
 	})