mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-02 16:29:21 +00:00
Merge pull request #130476 from dims/do-not-look-for-ssh-external-ip-for-NFSPersistentVolumes-tests
Do not look for SSH external IP for NFSPersistentVolumes tests
This commit is contained in:
commit
eddb6a7303
@ -54,7 +54,7 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
|
|||||||
nfsServerPod *v1.Pod
|
nfsServerPod *v1.Pod
|
||||||
nfsPVconfig e2epv.PersistentVolumeConfig
|
nfsPVconfig e2epv.PersistentVolumeConfig
|
||||||
pvcConfig e2epv.PersistentVolumeClaimConfig
|
pvcConfig e2epv.PersistentVolumeClaimConfig
|
||||||
nfsServerHost, clientNodeIP string
|
nfsServerHost string
|
||||||
clientNode *v1.Node
|
clientNode *v1.Node
|
||||||
volLabel labels.Set
|
volLabel labels.Set
|
||||||
selector *metav1.LabelSelector
|
selector *metav1.LabelSelector
|
||||||
@ -88,20 +88,18 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes", framework.WithDisruptive(), fu
|
|||||||
Selector: selector,
|
Selector: selector,
|
||||||
StorageClassName: &emptyStorageClass,
|
StorageClassName: &emptyStorageClass,
|
||||||
}
|
}
|
||||||
// Get the first ready node IP that is not hosting the NFS pod.
|
if clientNode == nil {
|
||||||
if clientNodeIP == "" {
|
|
||||||
framework.Logf("Designating test node")
|
framework.Logf("Designating test node")
|
||||||
nodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
|
nodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
for _, node := range nodes.Items {
|
for _, node := range nodes.Items {
|
||||||
if node.Name != nfsServerPod.Spec.NodeName {
|
if node.Name != nfsServerPod.Spec.NodeName {
|
||||||
clientNode = &node
|
clientNode = &node
|
||||||
clientNodeIP, err = e2enode.GetSSHExternalIP(clientNode)
|
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
gomega.Expect(clientNodeIP).NotTo(gomega.BeEmpty())
|
gomega.Expect(clientNode).NotTo(gomega.BeEmpty())
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user