Merge pull request #89542 from julianvmodesto/diff-dry-run-conformance

Add kubectl diff and server-side dry-run to e2e tests
This commit is contained in:
Kubernetes Prow Robot
2020-04-15 19:50:45 -07:00
committed by GitHub
2 changed files with 66 additions and 1 deletions

View File

@@ -637,7 +637,7 @@ func (b KubectlBuilder) Exec() (string, error) {
rc = int(ee.Sys().(syscall.WaitStatus).ExitStatus())
Logf("rc: %d", rc)
}
return "", uexec.CodeExitError{
return stdout.String(), uexec.CodeExitError{
Err: fmt.Errorf("error running %v:\nCommand stdout:\n%v\nstderr:\n%v\nerror:\n%v", cmd, cmd.Stdout, cmd.Stderr, err),
Code: rc,
}