@@ -49,15 +49,15 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
49
49
f := framework .NewDefaultFramework ("disruptive-pv" )
50
50
f .NamespacePodSecurityLevel = admissionapi .LevelPrivileged
51
51
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
61
61
)
62
62
63
63
ginkgo .BeforeEach (func (ctx context.Context ) {
@@ -88,20 +88,18 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
88
88
Selector : selector ,
89
89
StorageClassName : & emptyStorageClass ,
90
90
}
91
- // Get the first ready node IP that is not hosting the NFS pod.
92
- if clientNodeIP == "" {
91
+ if clientNode == nil {
93
92
framework .Logf ("Designating test node" )
94
93
nodes , err := e2enode .GetReadySchedulableNodes (ctx , c )
95
94
framework .ExpectNoError (err )
96
95
for _ , node := range nodes .Items {
97
96
if node .Name != nfsServerPod .Spec .NodeName {
98
97
clientNode = & node
99
- clientNodeIP , err = e2enode .GetSSHExternalIP (clientNode )
100
98
framework .ExpectNoError (err )
101
99
break
102
100
}
103
101
}
104
- gomega .Expect (clientNodeIP ).NotTo (gomega .BeEmpty ())
102
+ gomega .Expect (clientNode ).NotTo (gomega .BeEmpty ())
105
103
}
106
104
})
107
105
0 commit comments