From c9dd2a2a4542f54c26397d8d9b904270ac8af394 Mon Sep 17 00:00:00 2001 From: Adam Harrison Date: Thu, 24 Jan 2019 11:48:17 +0000 Subject: [PATCH] kubectl run --quiet suppresses deletion messages The `--quiet` option should prevent kubectl run from polluting the output from an attached container - make it apply to the resource deletion messages caused by `--rm`. --- pkg/kubectl/cmd/delete/delete.go | 5 ++++- pkg/kubectl/cmd/run/run.go | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/kubectl/cmd/delete/delete.go b/pkg/kubectl/cmd/delete/delete.go index eabc6c6df0..56b71e3115 100644 --- a/pkg/kubectl/cmd/delete/delete.go +++ b/pkg/kubectl/cmd/delete/delete.go @@ -102,6 +102,7 @@ type DeleteOptions struct { DeleteNow bool ForceDeletion bool WaitForDeletion bool + Quiet bool GracePeriod int Timeout time.Duration @@ -313,7 +314,9 @@ func (o *DeleteOptions) deleteResource(info *resource.Info, deleteOptions *metav return nil, cmdutil.AddSourceToErr("deleting", info.Source, err) } - o.PrintObj(info) + if !o.Quiet { + o.PrintObj(info) + } return deleteResponse, nil } diff --git a/pkg/kubectl/cmd/run/run.go b/pkg/kubectl/cmd/run/run.go index de0f0c2725..3b9f3431fc 100644 --- a/pkg/kubectl/cmd/run/run.go +++ b/pkg/kubectl/cmd/run/run.go @@ -241,6 +241,7 @@ func (o *RunOptions) Complete(f cmdutil.Factory, cmd *cobra.Command) error { deleteOpts.IgnoreNotFound = true deleteOpts.WaitForDeletion = false deleteOpts.GracePeriod = -1 + deleteOpts.Quiet = o.Quiet o.DeleteOptions = deleteOpts