github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-18 04:54:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #131060 from BenTheElder/kubectl-http-proxy

Browse Source 
improve kubectl e2e test debugging
This commit is contained in:
Kubernetes Prow Robot
2025-04-23 15:58:59 -07:00
committed by GitHub
parent 5a630b7289 4fa9639145
commit a63fd40447
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/e2e/framework/kubectl/builder.go
View File

@@ -37,8 +37,13 @@ import (
// KubectlBuilder is used to build, customize and execute a kubectl Command.
// Add more functions to customize the builder as needed.
type KubectlBuilder struct {
cmd *exec.Cmd
timeout <-chan time.Time
cmd *exec.Cmd
// appendEnv contains only AppendEnv(...) values and NOT os.Environ()
// logging os.Environ is ~redundant and noisy
// logging the env we modified is important to understand what we're running
// versus the defaults
appendedEnv []string
timeout <-chan time.Time
}
// NewKubectlCommand returns a KubectlBuilder for running kubectl.
@@ -55,6 +60,7 @@ func (b *KubectlBuilder) AppendEnv(env []string) *KubectlBuilder {
b.cmd.Env = os.Environ()
}
b.cmd.Env = append(b.cmd.Env, env...)
b.appendedEnv = append(b.appendedEnv, env...)
return b
}
@@ -118,7 +124,11 @@ func (b KubectlBuilder) ExecWithFullOutput() (string, string, error) {
cmd := b.cmd
cmd.Stdout, cmd.Stderr = &stdout, &stderr
framework.Logf("Running '%s %s'", cmd.Path, strings.Join(cmd.Args[1:], " ")) // skip arg[0] as it is printed separately
if len(b.appendedEnv) > 0 {
framework.Logf("Running '%s %s %s'", strings.Join(b.appendedEnv, " "), cmd.Path, strings.Join(cmd.Args[1:], " ")) // skip arg[0] as it is printed separately
} else {
framework.Logf("Running '%s %s'", cmd.Path, strings.Join(cmd.Args[1:], " ")) // skip arg[0] as it is printed separately
}
if err := cmd.Start(); err != nil {
return "", "", fmt.Errorf("error starting %v:\nCommand stdout:\n%v\nstderr:\n%v\nerror:\n%v", cmd, cmd.Stdout, cmd.Stderr, err)
}

2
test/e2e/kubectl/kubectl.go
View File

@@ -482,7 +482,7 @@ var _ = SIGDescribe("Kubectl client", func() {
proxyLogs.Reset()
ginkgo.By("Running kubectl via an HTTP proxy using " + proxyVar)
output := e2ekubectl.NewKubectlCommand(ns, "exec", podRunningTimeoutArg, simplePodName, "--", "echo", "running", "in", "container").
AppendEnv(append(os.Environ(), fmt.Sprintf("%s=%s", proxyVar, proxyAddr))).
AppendEnv([]string{fmt.Sprintf("%s=%s", proxyVar, proxyAddr)}).
ExecOrDie(ns)
// Verify we got the normal output captured by the exec server