github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68915 from oomichi/issue/68914

Browse Source 
Add fall-back to get node IP on host_path tests
This commit is contained in:
k8s-ci-robot 2018-10-03 13:01:54 -07:00 committed by GitHub
commit 10368ee68b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e/common/host_path.go
View File

@ -136,9 +136,12 @@ var _ = Describe("[sig-storage] HostPath", func() {
// Create the subPath directory on the host
existing := path.Join(source.Path, subPath)
externalIP, err := framework.GetNodeExternalIP(&nodeList.Items[0])
nodeIP, err := framework.GetNodeExternalIP(&nodeList.Items[0])
if err != nil {
nodeIP, err = framework.GetNodeInternalIP(&nodeList.Items[0])
}
framework.ExpectNoError(err)
result, err := framework.SSH(fmt.Sprintf("mkdir -p %s", existing), externalIP, framework.TestContext.Provider)
result, err := framework.SSH(fmt.Sprintf("mkdir -p %s", existing), nodeIP, framework.TestContext.Provider)
framework.LogSSHResult(result)
framework.ExpectNoError(err)
if result.Code != 0 {
@ -182,9 +185,12 @@ var _ = Describe("[sig-storage] HostPath", func() {
// Create the subPath file on the host
existing := path.Join(source.Path, subPath)
externalIP, err := framework.GetNodeExternalIP(&nodeList.Items[0])
nodeIP, err := framework.GetNodeExternalIP(&nodeList.Items[0])
if err != nil {
nodeIP, err = framework.GetNodeInternalIP(&nodeList.Items[0])
}
framework.ExpectNoError(err)
result, err := framework.SSH(fmt.Sprintf("echo \"mount-tester new file\" > %s", existing), externalIP, framework.TestContext.Provider)
result, err := framework.SSH(fmt.Sprintf("echo \"mount-tester new file\" > %s", existing), nodeIP, framework.TestContext.Provider)
framework.LogSSHResult(result)
framework.ExpectNoError(err)
if result.Code != 0 {