Merge pull request #805 from mattcary/kubectl-parse

mattcary · web-flow · commit a4762c4b62e2 · 2021-07-22T12:59:39.000-07:00
Fix kubectl parsing
diff --git a/test/k8s-integration/cluster.go b/test/k8s-integration/cluster.go
@@ -352,9 +352,9 @@ func getNormalizedVersion(kubeVersion, gkeVersion string) (string, error) {
 }
 
 func getKubeClusterVersion() (string, error) {
-	out, err := exec.Command("kubectl", "version", "-o=json").CombinedOutput()
+	out, err := exec.Command("kubectl", "version", "-o=json").Output()
 	if err != nil {
-		return "", fmt.Errorf("failed to obtain cluster version, error: %v", err)
+		return "", fmt.Errorf("failed to obtain cluster version, error: %v; output was %s", err, out)
 	}
 	type version struct {
 		ClientVersion *apimachineryversion.Info `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"`

Original file line number	Diff line number	Diff line change
`@@ -352,9 +352,9 @@ func getNormalizedVersion(kubeVersion, gkeVersion string) (string, error) {`
`352`	`352`	`}`
`353`	`353`
`354`	`354`	`func getKubeClusterVersion() (string, error) {`
`355`		`- out, err := exec.Command("kubectl", "version", "-o=json").CombinedOutput()`
	`355`	`+ out, err := exec.Command("kubectl", "version", "-o=json").Output()`
`356`	`356`	`if err != nil {`
`357`		`- return "", fmt.Errorf("failed to obtain cluster version, error: %v", err)`
	`357`	`+ return "", fmt.Errorf("failed to obtain cluster version, error: %v; output was %s", err, out)`
`358`	`358`	`}`
`359`	`359`	`type version struct {`
`360`	`360`	ClientVersion *apimachineryversion.Info `json:"clientVersion,omitempty" yaml:"clientVersion,omitempty"`