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 #43820 from krousey/upgrades

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42617, 43247, 43509, 43644, 43820)

Adding a SSH tunnel check to GKE upgrades

**What this PR does / why we need it**: After an upgrade, it takes some time fore the master to re-establish SSH tunnels to the nodes. This adds a wait for GKE since it runs in this configuration.

**Which issue this PR fixes**: fixes #43611, #43612
This commit is contained in:
Kubernetes Submit Queue 2017-03-29 16:05:28 -07:00 committed by GitHub
commit 8a62e2a4d6
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/e2e/framework/nodes_util.go
View File

@ -87,7 +87,13 @@ func masterUpgradeGKE(v string) error {
"--master",
fmt.Sprintf("--cluster-version=%s", v),
"--quiet")
return err
if err != nil {
return err
}
waitForSSHTunnels()
return nil
}
func NodeUpgrade(f *Framework, v string, img string) error {
@ -166,7 +172,14 @@ func nodeUpgradeGKE(v string, img string) error {
args = append(args, fmt.Sprintf("--image-type=%s", img))
}
_, _, err := RunCmd("gcloud", args...)
return err
if err != nil {
return err
}
waitForSSHTunnels()
return nil
}
// CheckNodesReady waits up to nt for expect nodes accessed by c to be ready,
@ -270,3 +283,19 @@ func gceUpgradeScript() string {
}
return TestContext.GCEUpgradeScript
}
func waitForSSHTunnels() {
Logf("Waiting for SSH tunnels to establish")
RunKubectl("run", "ssh-tunnel-test",
"--image=gcr.io/google_containers/busybox:1.24",
"--restart=Never",
"--command", "--",
"echo", "Hello")
defer RunKubectl("delete", "pod", "ssh-tunnel-test")
// allow up to a minute for new ssh tunnels to establish
wait.PollImmediate(5*time.Second, time.Minute, func() (bool, error) {
_, err := RunKubectl("logs", "ssh-tunnel-test")
return err == nil, nil
})
}