mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-08 20:50:24 +00:00
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:
@@ -249,7 +249,7 @@ Find more information at https://github.com/kubernetes/kubernetes.`,
|
||||
NewCmdCreate(f, out),
|
||||
NewCmdExposeService(f, out),
|
||||
NewCmdRun(f, in, out, err),
|
||||
set.NewCmdSet(f, out),
|
||||
set.NewCmdSet(f, out, err),
|
||||
},
|
||||
},
|
||||
{
|
||||
|
@@ -32,7 +32,7 @@ var (
|
||||
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{
|
||||
Use: "set SUBCOMMAND",
|
||||
@@ -45,7 +45,7 @@ func NewCmdSet(f cmdutil.Factory, out io.Writer) *cobra.Command {
|
||||
}
|
||||
|
||||
// add subcommands
|
||||
cmd.AddCommand(NewCmdImage(f, out))
|
||||
cmd.AddCommand(NewCmdImage(f, out, err))
|
||||
|
||||
return cmd
|
||||
}
|
||||
|
@@ -78,9 +78,10 @@ var (
|
||||
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{
|
||||
Out: out,
|
||||
Err: err,
|
||||
}
|
||||
|
||||
cmd := &cobra.Command{
|
||||
|
Reference in New Issue
Block a user