Skip to content

K
k3s
Commit 47d06dd9 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28606 from dims/fix-issues-19636

Automatic merge from submit-queue Fix kubectl run to print object on dry run Originally Authored By tnachen in PR: https://github.com/kubernetes/kubernetes/pull/25842 Fixes #19636
parents 23f0edb8 8b0868b7
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
pkg/kubectl/cmd/run.go
View file @ 47d06dd9
...@@ -280,7 +280,7 @@ func Run(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cob ...@@ -280,7 +280,7 @@ func Run(f *cmdutil.Factory, cmdIn io.Reader, cmdOut, cmdErr io.Writer, cmd *cob
} }
outputFormat := cmdutil.GetFlagString(cmd, "output") outputFormat := cmdutil.GetFlagString(cmd, "output")
if outputFormat != "" { if outputFormat != "" || cmdutil.GetDryRunFlag(cmd) {
return f.PrintObject(cmd, mapper, obj, cmdOut) return f.PrintObject(cmd, mapper, obj, cmdOut)
} }
cmdutil.PrintSuccess(mapper, false, cmdOut, mapping.Resource, args[0], "created") cmdutil.PrintSuccess(mapper, false, cmdOut, mapping.Resource, args[0], "created")
...@@ -436,7 +436,7 @@ func generateService(f *cmdutil.Factory, cmd *cobra.Command, args []string, serv ...@@ -436,7 +436,7 @@ func generateService(f *cmdutil.Factory, cmd *cobra.Command, args []string, serv
return err return err
} }
if cmdutil.GetFlagString(cmd, "output") != "" { if cmdutil.GetFlagString(cmd, "output") != "" || cmdutil.GetDryRunFlag(cmd) {
return f.PrintObject(cmd, mapper, obj, out) return f.PrintObject(cmd, mapper, obj, out)
} }
cmdutil.PrintSuccess(mapper, false, out, mapping.Resource, args[0], "created") cmdutil.PrintSuccess(mapper, false, out, mapping.Resource, args[0], "created")
......
pkg/kubectl/cmd/run_test.go
View file @ 47d06dd9
...@@ -266,6 +266,7 @@ func TestGenerateService(t *testing.T) { ...@@ -266,6 +266,7 @@ func TestGenerateService(t *testing.T) {
sawPOST := false sawPOST := false
f, tf, codec, ns := NewAPIFactory() f, tf, codec, ns := NewAPIFactory()
tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Default.GroupVersion()}} tf.ClientConfig = &restclient.Config{ContentConfig: restclient.ContentConfig{GroupVersion: testapi.Default.GroupVersion()}}
tf.Printer = &testPrinter{}
tf.Client = &fake.RESTClient{ tf.Client = &fake.RESTClient{
NegotiatedSerializer: ns, NegotiatedSerializer: ns,
Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) { Client: fake.CreateHTTPClient(func(req *http.Request) (*http.Response, error) {
...@@ -299,9 +300,9 @@ func TestGenerateService(t *testing.T) { ...@@ -299,9 +300,9 @@ func TestGenerateService(t *testing.T) {
}), }),
} }
cmd := &cobra.Command{} cmd := &cobra.Command{}
cmd.Flags().String("output", "", "")
cmd.Flags().Bool(cmdutil.ApplyAnnotationsFlag, false, "") cmd.Flags().Bool(cmdutil.ApplyAnnotationsFlag, false, "")
cmd.Flags().Bool("record", false, "Record current kubectl command in the resource annotation.") cmd.Flags().Bool("record", false, "Record current kubectl command in the resource annotation.")
cmdutil.AddPrinterFlags(cmd)
cmdutil.AddInclude3rdPartyFlags(cmd) cmdutil.AddInclude3rdPartyFlags(cmd)
addRunFlags(cmd) addRunFlags(cmd)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment