Merge pull request #2142 from benluddy/kind-log-verbosity

openshift-merge-robot · web-flow · commit f966f02a7eb7 · 2021-05-05T15:59:10.000-04:00
Add -kind.verbosity provisioner option and reduce default verbosity.
diff --git a/test/e2e/ctx/provisioner_kind.go b/test/e2e/ctx/provisioner_kind.go
@@ -22,8 +22,15 @@ import (
 
 var (
 	images = flag.String("kind.images", "", "comma-separated list of image archives to load on cluster nodes, relative to the test binary or test package path")
+
+	verbosity int
 )
 
+func init() {
+	// https://github.com/kubernetes-sigs/kind/blob/v0.10.0/pkg/log/types.go#L38-L45
+	flag.IntVar(&verbosity, "kind.verbosity", 0, "log verbosity level")
+}
+
 type kindLogAdapter struct {
 	*TestContext
 }
@@ -61,7 +68,10 @@ func (kl kindLogAdapter) Errorf(format string, args ...interface{}) {
 	kl.Logf(format, args...)
 }
 
-func (kl kindLogAdapter) V(log.Level) log.InfoLogger {
+func (kl kindLogAdapter) V(level log.Level) log.InfoLogger {
+	if level > log.Level(verbosity) {
+		return log.NoopInfoLogger{}
+	}
 	return kl
 }
 

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,15 @@ import (`
`22`	`22`
`23`	`23`	`var (`
`24`	`24`	`images = flag.String("kind.images", "", "comma-separated list of image archives to load on cluster nodes, relative to the test binary or test package path")`
	`25`	`+`
	`26`	`+ verbosity int`
`25`	`27`	`)`
`26`	`28`
	`29`	`+func init() {`
	`30`	`+ // https://github.com/kubernetes-sigs/kind/blob/v0.10.0/pkg/log/types.go#L38-L45`
	`31`	`+ flag.IntVar(&verbosity, "kind.verbosity", 0, "log verbosity level")`
	`32`	`+}`
	`33`	`+`
`27`	`34`	`type kindLogAdapter struct {`
`28`	`35`	`*TestContext`
`29`	`36`	`}`
`@@ -61,7 +68,10 @@ func (kl kindLogAdapter) Errorf(format string, args ...interface{}) {`
`61`	`68`	`kl.Logf(format, args...)`
`62`	`69`	`}`
`63`	`70`
`64`		`-func (kl kindLogAdapter) V(log.Level) log.InfoLogger {`
	`71`	`+func (kl kindLogAdapter) V(level log.Level) log.InfoLogger {`
	`72`	`+ if level > log.Level(verbosity) {`
	`73`	`+ return log.NoopInfoLogger{}`
	`74`	`+ }`
`65`	`75`	`return kl`
`66`	`76`	`}`
`67`	`77`