Merge pull request #130426 from jsturtevant/automated-cherry-pick-of-#128097-upstream-release-1.31

Automated cherry pick of #128097: [sig-windows] Update kubectl exec to use correct format
This commit is contained in:
Kubernetes Prow Robot 2025-03-06 04:53:52 -08:00 committed by GitHub
commit ed53c53422
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -142,7 +142,7 @@ var _ = sigDescribe(feature.Windows, "GMSA Full", framework.WithSerial(), framew
ginkgo.By("checking that nltest /QUERY returns successfully")
var output string
gomega.Eventually(ctx, func() bool {
output, err = runKubectlExecInNamespace(f.Namespace.Name, podName, "nltest", "/QUERY")
output, err = runKubectlExecInNamespace(f.Namespace.Name, podName, "--", "nltest", "/QUERY")
if err != nil {
framework.Logf("unable to run command in container via exec: %s", err)
return false
@ -151,7 +151,7 @@ var _ = sigDescribe(feature.Windows, "GMSA Full", framework.WithSerial(), framew
if !isValidOutput(output) {
// try repairing the secure channel by running reset command
// https://kubernetes.io/docs/tasks/configure-pod-container/configure-gmsa/#troubleshooting
output, err = runKubectlExecInNamespace(f.Namespace.Name, podName, "nltest", fmt.Sprintf("/sc_reset:%s", gmsaDomain))
output, err = runKubectlExecInNamespace(f.Namespace.Name, podName, "--", "nltest", fmt.Sprintf("/sc_reset:%s", gmsaDomain))
if err != nil {
framework.Logf("unable to run command in container via exec: %s", err)
return false
@ -286,7 +286,7 @@ func retrieveCRDManifestFileContents(ctx context.Context, f *framework.Framework
}
e2epod.NewPodClient(f).CreateSync(ctx, pod)
output, err := runKubectlExecInNamespace(f.Namespace.Name, podName, "cmd", "/S", "/C", fmt.Sprintf("type %s", 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)
}