Merge pull request #60895 from BenTheElder/translate-verbose-kubetest

Automatic merge from submit-queue (batch tested with PRs 60710, 60855, 60873, 60895, 60862). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. translate hack/e2e.go -v to --verbose-commands **What this PR does / why we need it**: translates the old `go run hack/e2e.go` `-v` flag to `--verbose-commands` for kubetest. kubetest now imports client-go, which imports `glog`, which registers an incompatible `-v level` flag so kubetest now uses `--verbose-commands` instead. This should fix existing workflows. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: See also: https://github.com/kubernetes/community/pull/1901 **Release note**: ```release-note NONE ```

Merge pull request #60895 from BenTheElder/translate-verbose-kubetest
17839216 · Kubernetes Submit Queue · GitHub · 95d1fb7c · 96747928 · 17839216
Unverified Commit 17839216 authored Mar 20, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 20, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 6 deletions

e2e.go hack/e2e.go +3 -1

e2e_test.go hack/e2e_test.go +15 -5

No files found.
--- a/hack/e2e.go
+++ b/hack/e2e.go
@@ -46,6 +46,7 @@ func parse(args []string) (flags, error) {
 	fs := flag.NewFlagSet(args[0], flag.ContinueOnError)
 	get := fs.Bool("get", getDefault, "go get -u kubetest if old or not installed")
 	old := fs.Duration("old", oldDefault, "Consider kubetest old if it exceeds this")
+	verbose := fs.Bool("v", true, "this flag is translated to kubetest's --verbose-commands")
 	var a []string
 	if err := fs.Parse(args[1:]); err == flag.ErrHelp {
 		os.Stderr.WriteString("  -- kubetestArgs\n")
@@ -58,7 +59,8 @@ func parse(args []string) (flags, error) {
 		log.Print("  The -- flag separator also suppresses this message")
 		a = args[len(args)-fs.NArg()-1:]
 	} else {
-		a = fs.Args()
+		a = append(a, fmt.Sprintf("--verbose-commands=%t", *verbose))
+		a = append(a, fs.Args()...)
 	}
 	return flags{*get, *old, a}, nil
 }

--- a/hack/e2e_test.go
+++ b/hack/e2e_test.go
@@ -63,13 +63,23 @@ func TestParse(t *testing.T) {
 		err      error
 	}{
 		{
+			[]string{"foo", "-v=false"},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=false"}},
+			nil,
+		},
+		{
+			[]string{"foo", "-v"},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true"}},
+			nil,
+		},
+		{
 			[]string{"hello", "world"},
-			flags{getDefault, oldDefault, []string{"world"}},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true", "world"}},
 			nil,
 		},
 		{
 			[]string{"hello", "--", "--venus", "--karaoke"},
-			flags{getDefault, oldDefault, []string{"--venus", "--karaoke"}},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true", "--venus", "--karaoke"}},
 			nil,
 		},
 		{
@@ -84,12 +94,12 @@ func TestParse(t *testing.T) {
 		},
 		{
 			[]string{"omg", "--get=false", "--", "ugh"},
-			flags{false, oldDefault, []string{"ugh"}},
+			flags{false, oldDefault, []string{"--verbose-commands=true", "ugh"}},
 			nil,
 		},
 		{
 			[]string{"wee", "--old=5m", "--get"},
-			flags{true, 5 * time.Minute, []string{}},
+			flags{true, 5 * time.Minute, []string{"--verbose-commands=true"}},
 			nil,
 		},
 		{
@@ -104,7 +114,7 @@ func TestParse(t *testing.T) {
 		},
 		{
 			[]string{"wut", "--", "-h"},
-			flags{getDefault, oldDefault, []string{"-h"}},
+			flags{getDefault, oldDefault, []string{"--verbose-commands=true", "-h"}},
 			nil,
 		},
 	}