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

Merge pull request #50484 from sbezverk/ssh_local_ips

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 49904, 50484, 50214)

Adding support for internal IP for e2e tests

Currently IssueSSHComand in util.go only checks for External IP address
to ssh, this PR adds check for internal IP too.
Closes #50630
This commit is contained in:
Kubernetes Submit Queue 2017-08-14 13:09:56 -07:00 committed by GitHub
commit f8aee18527
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/framework/util.go
View File

@ -3219,7 +3219,17 @@ func IssueSSHCommandWithResult(cmd, provider string, node *v1.Node) (*SSHResult,
}
if host == "" {
return nil, fmt.Errorf("couldn't find external IP address for node %s", node.Name)
// No external IPs were found, let's try to use internal as plan B
for _, a := range node.Status.Addresses {
if a.Type == v1.NodeInternalIP {
host = net.JoinHostPort(a.Address, sshPort)
break
}
}
}
if host == "" {
return nil, fmt.Errorf("couldn't find any IP address for node %s", node.Name)
}
Logf("SSH %q on %s(%s)", cmd, node.Name, host)