Add fall-back to get node IP on host_path tests

As the same as the commit[1], this adds fall-back way to get a
node IP address on host_path e2e tests for environments which
don't support external IPs.

[1]: 4e7c2f638d (diff-5ee86aefbb33223865bc542107ea8560L81)
This commit is contained in:
Kenichi Omichi 2018-09-21 00:59:12 +00:00
parent 165faaaddf
commit dd9cffb18f

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 {