Skip to content

K
k3s
Unverified Commit 10368ee6 authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #68915 from oomichi/issue/68914

Add fall-back to get node IP on host_path tests
parents 34bf1160 dd9cffb1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
test/e2e/common/host_path.go
View file @ 10368ee6
...@@ -136,9 +136,12 @@ var _ = Describe("[sig-storage] HostPath", func() { ...@@ -136,9 +136,12 @@ var _ = Describe("[sig-storage] HostPath", func() {
// Create the subPath directory on the host // Create the subPath directory on the host
existing := path.Join(source.Path, subPath) 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) 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.LogSSHResult(result)
framework.ExpectNoError(err) framework.ExpectNoError(err)
if result.Code != 0 { if result.Code != 0 {
...@@ -182,9 +185,12 @@ var _ = Describe("[sig-storage] HostPath", func() { ...@@ -182,9 +185,12 @@ var _ = Describe("[sig-storage] HostPath", func() {
// Create the subPath file on the host // Create the subPath file on the host
existing := path.Join(source.Path, subPath) 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) 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.LogSSHResult(result)
framework.ExpectNoError(err) framework.ExpectNoError(err)
if result.Code != 0 { if result.Code != 0 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment