github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-29 14:16:26 +00:00
Code Issues Projects Releases Wiki Activity

Do not log unchanged message if a format other than 'name' is specified

Browse Source
This commit is contained in:
David Hao
2018-01-25 20:49:06 -05:00
parent 6e856480c0
commit b112d19b70
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/kubectl/cmd/apply.go
View File

@@ -274,6 +274,9 @@ func RunApply(f cmdutil.Factory, cmd *cobra.Command, out, errOut io.Writer, opti
return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving modified configuration from:\n%v\nfor:", info), info.Source, err) return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving modified configuration from:\n%v\nfor:", info), info.Source, err)
} }
// Print object only if output format other than "name" is specified
printObject := len(output) > 0 && !shortOutput
if err := info.Get(); err != nil { if err := info.Get(); err != nil {
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving current configuration of:\n%v\nfrom server for:", info), info.Source, err) return cmdutil.AddSourceToErr(fmt.Sprintf("retrieving current configuration of:\n%v\nfrom server for:", info), info.Source, err)
@@ -297,7 +300,7 @@ func RunApply(f cmdutil.Factory, cmd *cobra.Command, out, errOut io.Writer, opti
} }
count++ count++
if len(output) > 0 && !shortOutput { if printObject {
return cmdutil.PrintObject(cmd, info.Object, out) return cmdutil.PrintObject(cmd, info.Object, out)
} }
cmdutil.PrintSuccess(shortOutput, out, info.Object, dryRun, "created") cmdutil.PrintSuccess(shortOutput, out, info.Object, dryRun, "created")
@@ -343,14 +346,14 @@ func RunApply(f cmdutil.Factory, cmd *cobra.Command, out, errOut io.Writer, opti
visitedUids.Insert(string(uid)) visitedUids.Insert(string(uid))
} }
if string(patchBytes) == "{}" { if string(patchBytes) == "{}" && !printObject {
count++ count++
cmdutil.PrintSuccess(shortOutput, out, info.Object, false, "unchanged") cmdutil.PrintSuccess(shortOutput, out, info.Object, false, "unchanged")
return nil return nil
} }
} }
count++ count++
if len(output) > 0 && !shortOutput { if printObject {
return cmdutil.PrintObject(cmd, info.Object, out) return cmdutil.PrintObject(cmd, info.Object, out)
} }
cmdutil.PrintSuccess(shortOutput, out, info.Object, dryRun, "configured") cmdutil.PrintSuccess(shortOutput, out, info.Object, dryRun, "configured")