Merge pull request kubernetes#90113 from claudiubelu/windows-tests/gmsa-nanoserver

k8s-ci-robot · web-flow · commit 548124828c94 · 2020-04-14T12:34:26.000-07:00
Windows tests: Makes gMSA test more nanoserver friendly
diff --git a/test/e2e/windows/gmsa_full.go b/test/e2e/windows/gmsa_full.go
@@ -208,9 +208,7 @@ func retrieveCRDManifestFileContents(f *framework.Framework, node v1.Node) strin
 	}
 	f.PodClient().CreateSync(pod)
 
-	// using powershell and using forward slashes avoids the nightmare of having to properly
-	// escape quotes and backward slashes
-	output, err := runKubectlExecInNamespace(f.Namespace.Name, podName, "powershell", "Get-Content", strings.ReplaceAll(gmsaCrdManifestPath, `\`, "/"))
+	output, err := runKubectlExecInNamespace(f.Namespace.Name, podName, "cmd", "/S", "/C", fmt.Sprintf("type %s", gmsaCrdManifestPath))
 	if err != nil {
 		framework.Failf("failed to retrieve the contents of %q on node %q: %v", gmsaCrdManifestPath, node.Name, err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -208,9 +208,7 @@ func retrieveCRDManifestFileContents(f *framework.Framework, node v1.Node) strin`
`208`	`208`	`}`
`209`	`209`	`f.PodClient().CreateSync(pod)`
`210`	`210`
`211`		`- // using powershell and using forward slashes avoids the nightmare of having to properly`
`212`		`- // escape quotes and backward slashes`
`213`		- output, err := runKubectlExecInNamespace(f.Namespace.Name, podName, "powershell", "Get-Content", strings.ReplaceAll(gmsaCrdManifestPath, `\`, "/"))
	`211`	`+ output, err := runKubectlExecInNamespace(f.Namespace.Name, podName, "cmd", "/S", "/C", fmt.Sprintf("type %s", gmsaCrdManifestPath))`
`214`	`212`	`if err != nil {`
`215`	`213`	`framework.Failf("failed to retrieve the contents of %q on node %q: %v", gmsaCrdManifestPath, node.Name, err)`
`216`	`214`	`}`