github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Update method name to make it more explicit

Browse Source
This commit is contained in:
Ang Gao 2022-11-23 23:20:25 +00:00
parent 2baa25027e
commit 3540f948e9
4 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/network/utils.go
View File

@ -1070,7 +1070,7 @@ func httpGetNoConnectionPoolTimeout(url string, timeout time.Duration) (*http.Re
// This function executes commands on a node so it will work only for some // This function executes commands on a node so it will work only for some
// environments. // environments.
func TestUnderTemporaryNetworkFailure(c clientset.Interface, ns string, node *v1.Node, testFunc func()) { func TestUnderTemporaryNetworkFailure(c clientset.Interface, ns string, node *v1.Node, testFunc func()) {
host, err := e2enode.GetExternalIP(node) host, err := e2enode.GetSSHExternalIP(node)
if err != nil { if err != nil {
framework.Failf("Error getting node external ip : %v", err) framework.Failf("Error getting node external ip : %v", err)
} }

28
test/e2e/framework/node/resource.go
View File

@ -217,36 +217,28 @@ func TotalReady(c clientset.Interface) (int, error) {
return len(nodes.Items), nil return len(nodes.Items), nil
} }
// GetExternalIP returns node external IP concatenated with port 22 for ssh // GetSSHExternalIP returns node external IP concatenated with port 22 for ssh
// e.g. 1.2.3.4:22 // e.g. 1.2.3.4:22
func GetExternalIP(node *v1.Node) (string, error) { func GetSSHExternalIP(node *v1.Node) (string, error) {
framework.Logf("Getting external IP address for %s", node.Name) framework.Logf("Getting external IP address for %s", node.Name)
host := ""
for _, a := range node.Status.Addresses { for _, a := range node.Status.Addresses {
if a.Type == v1.NodeExternalIP && a.Address != "" { if a.Type == v1.NodeExternalIP && a.Address != "" {
host = net.JoinHostPort(a.Address, sshPort) return net.JoinHostPort(a.Address, sshPort), nil
break
} }
} }
if host == "" { return "", fmt.Errorf("Couldn't get the external IP of host %s with addresses %v", node.Name, node.Status.Addresses)
return "", fmt.Errorf("Couldn't get the external IP of host %s with addresses %v", node.Name, node.Status.Addresses)
}
return host, nil
} }
// GetInternalIP returns node internal IP // GetSSHInternalIP returns node internal IP concatenated with port 22 for ssh
func GetInternalIP(node *v1.Node) (string, error) { func GetSSHInternalIP(node *v1.Node) (string, error) {
host := ""
for _, address := range node.Status.Addresses { for _, address := range node.Status.Addresses {
if address.Type == v1.NodeInternalIP && address.Address != "" { if address.Type == v1.NodeInternalIP && address.Address != "" {
host = net.JoinHostPort(address.Address, sshPort) return net.JoinHostPort(address.Address, sshPort), nil
break
} }
} }
if host == "" {
return "", fmt.Errorf("Couldn't get the internal IP of host %s with addresses %v", node.Name, node.Status.Addresses) return "", fmt.Errorf("Couldn't get the internal IP of host %s with addresses %v", node.Name, node.Status.Addresses)
}
return host, nil
} }
// FirstAddressByTypeAndFamily returns the first address that matches the given type and family of the list of nodes // FirstAddressByTypeAndFamily returns the first address that matches the given type and family of the list of nodes

8
test/e2e/storage/flexvolume.go
View File

@ -78,9 +78,9 @@ func installFlex(c clientset.Interface, node *v1.Node, vendor, driver, filePath
host := "" host := ""
var err error var err error
if node != nil { if node != nil {
host, err = e2enode.GetExternalIP(node) host, err = e2enode.GetSSHExternalIP(node)
if err != nil { if err != nil {
host, err = e2enode.GetInternalIP(node) host, err = e2enode.GetSSHInternalIP(node)
} }
} else { } else {
instanceWithPort := framework.APIAddress() instanceWithPort := framework.APIAddress()
@ -110,9 +110,9 @@ func uninstallFlex(c clientset.Interface, node *v1.Node, vendor, driver string)
host := "" host := ""
var err error var err error
if node != nil { if node != nil {
host, err = e2enode.GetExternalIP(node) host, err = e2enode.GetSSHExternalIP(node)
if err != nil { if err != nil {
host, err = e2enode.GetInternalIP(node) host, err = e2enode.GetSSHInternalIP(node)
} }
} else { } else {
instanceWithPort := framework.APIAddress() instanceWithPort := framework.APIAddress()

2
test/e2e/storage/nfs_persistent_volume-disruptive.go
View File

@ -126,7 +126,7 @@ var _ = utils.SIGDescribe("NFSPersistentVolumes[Disruptive][Flaky]", func() {
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.GetExternalIP(clientNode) clientNodeIP, err = e2enode.GetSSHExternalIP(clientNode)
framework.ExpectNoError(err) framework.ExpectNoError(err)
break break
} }