github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #73266 from awh/kubectl-run-suppress-resource-deletion-messages-when-quiet 

kubectl run --quiet suppresses deletion messages
pull/564/head
Kubernetes Prow Robot 2019-02-26 11:05:21 -08:00 committed by GitHub
parent fc1e528c4a c9dd2a2a45
commit e9a8d27bd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/kubectl/cmd/delete/delete.go
View File

@ -102,6 +102,7 @@ type DeleteOptions struct {
DeleteNow bool DeleteNow bool
ForceDeletion bool ForceDeletion bool
WaitForDeletion bool WaitForDeletion bool
Quiet bool
GracePeriod int GracePeriod int
Timeout time.Duration Timeout time.Duration
@ -313,7 +314,9 @@ func (o *DeleteOptions) deleteResource(info *resource.Info, deleteOptions *metav
return nil, cmdutil.AddSourceToErr("deleting", info.Source, err) return nil, cmdutil.AddSourceToErr("deleting", info.Source, err)
} }
o.PrintObj(info) if !o.Quiet {
o.PrintObj(info)
}
return deleteResponse, nil return deleteResponse, nil
} }

1
pkg/kubectl/cmd/run/run.go
View File

@ -241,6 +241,7 @@ func (o *RunOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error {
deleteOpts.IgnoreNotFound = true deleteOpts.IgnoreNotFound = true
deleteOpts.WaitForDeletion = false deleteOpts.WaitForDeletion = false
deleteOpts.GracePeriod = -1 deleteOpts.GracePeriod = -1
deleteOpts.Quiet = o.Quiet
o.DeleteOptions = deleteOpts o.DeleteOptions = deleteOpts