Skip to content

Commit c3de5b7

Browse files
committed
Do not look for SSH external IP for NFSPersistentVolumes tests
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent 9fe95e7 commit c3de5b7

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

test/e2e/storage/nfs_persistent_volume-disruptive.go

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
4949
f := framework.NewDefaultFramework("disruptive-pv")
5050
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
5151
var (
52-
c clientset.Interface
53-
ns string
54-
nfsServerPod *v1.Pod
55-
nfsPVconfig e2epv.PersistentVolumeConfig
56-
pvcConfig e2epv.PersistentVolumeClaimConfig
57-
nfsServerHost, clientNodeIP string
58-
clientNode *v1.Node
59-
volLabel labels.Set
60-
selector *metav1.LabelSelector
52+
c clientset.Interface
53+
ns string
54+
nfsServerPod *v1.Pod
55+
nfsPVconfig e2epv.PersistentVolumeConfig
56+
pvcConfig e2epv.PersistentVolumeClaimConfig
57+
nfsServerHost string
58+
clientNode *v1.Node
59+
volLabel labels.Set
60+
selector *metav1.LabelSelector
6161
)
6262

6363
ginkgo.BeforeEach(func(ctx context.Context) {
@@ -88,20 +88,18 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
8888
Selector: selector,
8989
StorageClassName: &emptyStorageClass,
9090
}
91-
// Get the first ready node IP that is not hosting the NFS pod.
92-
if clientNodeIP == "" {
91+
if clientNode == nil {
9392
framework.Logf("Designating test node")
9493
nodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
9594
framework.ExpectNoError(err)
9695
for _, node := range nodes.Items {
9796
if node.Name != nfsServerPod.Spec.NodeName {
9897
clientNode = &node
99-
clientNodeIP, err = e2enode.GetSSHExternalIP(clientNode)
10098
framework.ExpectNoError(err)
10199
break
102100
}
103101
}
104-
gomega.Expect(clientNodeIP).NotTo(gomega.BeEmpty())
102+
gomega.Expect(clientNode).NotTo(gomega.BeEmpty())
105103
}
106104
})
107105

0 commit comments

Comments
 (0)