github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Clean up e2e/framework/upgrade_util.go

Browse Source
This commit is contained in:
Jiatong Wang 2019-04-14 21:24:05 -07:00
parent 8045a99a70
commit 6d7869ee96
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e/framework/upgrade_util.go
View File

@ -34,7 +34,7 @@ func RealVersion(s string) (string, error) {
Logf("Getting real version for %q", s) Logf("Getting real version for %q", s)
v, _, err := RunCmd(path.Join(TestContext.RepoRoot, "hack/get-build.sh"), "-v", s) v, _, err := RunCmd(path.Join(TestContext.RepoRoot, "hack/get-build.sh"), "-v", s)
if err != nil { if err != nil {
return v, err return v, fmt.Errorf("error getting real version for %q: %v", s, err)
} }
Logf("Version for %q is %q", s, v) Logf("Version for %q is %q", s, v)
return strings.TrimPrefix(strings.TrimSpace(v), "v"), nil return strings.TrimPrefix(strings.TrimSpace(v), "v"), nil
@ -46,14 +46,13 @@ func traceRouteToMaster() {
Logf("Could not find traceroute program") Logf("Could not find traceroute program")
return return
} }
cmd := exec.Command(path, "-I", GetMasterHost()) cmd := exec.Command(path, "-I", GetMasterHost())
out, err := cmd.Output() out, err := cmd.Output()
if len(out) != 0 { if len(out) != 0 {
Logf(string(out)) Logf(string(out))
} }
if exiterr, ok := err.(*exec.ExitError); err != nil && ok { if exiterr, ok := err.(*exec.ExitError); err != nil && ok {
Logf("error while running traceroute: %s", exiterr.Stderr) Logf("Error while running traceroute: %s", exiterr.Stderr)
} }
} }
@ -78,8 +77,7 @@ func CheckMasterVersion(c clientset.Interface, want string) error {
// got looks like: v0.19.3-815-g50e67d4034e858-dirty // got looks like: v0.19.3-815-g50e67d4034e858-dirty
got := strings.TrimPrefix(v.GitVersion, "v") got := strings.TrimPrefix(v.GitVersion, "v")
if !strings.HasPrefix(got, want) { if !strings.HasPrefix(got, want) {
return fmt.Errorf("master had kube-apiserver version %s which does not start with %s", return fmt.Errorf("master had kube-apiserver version %s which does not start with %s", got, want)
got, want)
} }
Logf("Master is at version %s", want) Logf("Master is at version %s", want)
return nil return nil