Merge pull request #107 from adrianludwin/headers-master

k8s-ci-robot · web-flow · commit 2d9dade91202 · 2021-10-19T12:16:25.000-07:00
Work around kubectl bug in 1.22 (trunk)
diff --git a/pkg/testutils/testutils.go b/pkg/testutils/testutils.go
@@ -235,6 +235,8 @@ func RunCommand(cmdln ...string) (string, error) {
 	prefix := fmt.Sprintf("[%d] Running: ", time.Now().Unix())
 	GinkgoT().Log(prefix, args)
 	cmd := exec.Command(args[0], args[1:]...)
+	// Work around https://github.com/kubernetes/kubectl/issues/1098#issuecomment-929743957:
+	cmd.Env = append(os.Environ(), "KUBECTL_COMMAND_HEADERS=false")
 	stdout, err := cmd.CombinedOutput()
 	return string(stdout), err
 }

Original file line number	Diff line number	Diff line change
`@@ -235,6 +235,8 @@ func RunCommand(cmdln ...string) (string, error) {`
`235`	`235`	`prefix := fmt.Sprintf("[%d] Running: ", time.Now().Unix())`
`236`	`236`	`GinkgoT().Log(prefix, args)`
`237`	`237`	`cmd := exec.Command(args[0], args[1:]...)`
	`238`	`+ // Work around https://github.com/kubernetes/kubectl/issues/1098#issuecomment-929743957:`
	`239`	`+ cmd.Env = append(os.Environ(), "KUBECTL_COMMAND_HEADERS=false")`
`238`	`240`	`stdout, err := cmd.CombinedOutput()`
`239`	`241`	`return string(stdout), err`
`240`	`242`	`}`