Merge pull request #34434 from asalkeld/set_image_err

Automatic merge from submit-queue

Assign options.Err in "set image"

**What this PR does / why we need it**:
There is a usage of options.Err in a Printf, but this option is never set.
This patch passes the stderr into the command and assigns the option correctly.

**Which issue this PR fixes**
fixes #34433 

**Special notes for your reviewer**:
None

**Release note**:
```release-note
```
This commit is contained in:
Kubernetes Submit Queue
2016-10-14 00:29:36 -07:00
committed by GitHub
3 changed files with 5 additions and 4 deletions

View File

@@ -249,7 +249,7 @@ Find more information at https://github.com/kubernetes/kubernetes.`,
NewCmdCreate(f, out), NewCmdCreate(f, out),
NewCmdExposeService(f, out), NewCmdExposeService(f, out),
NewCmdRun(f, in, out, err), NewCmdRun(f, in, out, err),
set.NewCmdSet(f, out), set.NewCmdSet(f, out, err),
}, },
}, },
{ {

View File

@@ -32,7 +32,7 @@ var (
set_example = dedent.Dedent(``) set_example = dedent.Dedent(``)
) )
func NewCmdSet(f cmdutil.Factory, out io.Writer) *cobra.Command { func NewCmdSet(f cmdutil.Factory, out, err io.Writer) *cobra.Command {
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "set SUBCOMMAND", Use: "set SUBCOMMAND",
@@ -45,7 +45,7 @@ func NewCmdSet(f cmdutil.Factory, out io.Writer) *cobra.Command {
} }
// add subcommands // add subcommands
cmd.AddCommand(NewCmdImage(f, out)) cmd.AddCommand(NewCmdImage(f, out, err))
return cmd return cmd
} }

View File

@@ -78,9 +78,10 @@ var (
kubectl set image -f path/to/file.yaml nginx=nginx:1.9.1 --local -o yaml`) kubectl set image -f path/to/file.yaml nginx=nginx:1.9.1 --local -o yaml`)
) )
func NewCmdImage(f cmdutil.Factory, out io.Writer) *cobra.Command { func NewCmdImage(f cmdutil.Factory, out, err io.Writer) *cobra.Command {
options := &ImageOptions{ options := &ImageOptions{
Out: out, Out: out,
Err: err,
} }
cmd := &cobra.Command{ cmd := &cobra.Command{