From fd930e3995957b0093ecc4b9fd8b0525d94d3b4e Mon Sep 17 00:00:00 2001 From: zhouya0 Date: Fri, 25 Sep 2020 11:38:28 +0800 Subject: [PATCH] Clean up nits in delete cascade Kubernetes-commit: f5a035a7e66b25c932a82fc8bc7cde195dd05884 --- pkg/cmd/delete/delete_flags.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkg/cmd/delete/delete_flags.go b/pkg/cmd/delete/delete_flags.go index 863ca1cb..dbf79e51 100644 --- a/pkg/cmd/delete/delete_flags.go +++ b/pkg/cmd/delete/delete_flags.go @@ -26,7 +26,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" "k8s.io/client-go/dynamic" - "k8s.io/klog/v2" ) // DeleteFlags composes common printer flag structs @@ -79,7 +78,7 @@ func (f *DeleteFlags) ToOptions(dynamicClient dynamic.Interface, streams generic } if f.CascadingStrategy != nil { var err error - options.CascadingStrategy, err = getCascadingStrategy(*f.CascadingStrategy) + options.CascadingStrategy, err = parseCascadingFlag(streams, *f.CascadingStrategy) if err != nil { return nil, err } @@ -226,8 +225,8 @@ func NewDeleteFlags(usage string) *DeleteFlags { } } -func getCascadingStrategy(cascadingFlag string) (metav1.DeletionPropagation, error) { - b, err := strconv.ParseBool(cascadingFlag) +func parseCascadingFlag(streams genericclioptions.IOStreams, cascadingFlag string) (metav1.DeletionPropagation, error) { + boolValue, err := strconv.ParseBool(cascadingFlag) // The flag is not a boolean if err != nil { switch cascadingFlag { @@ -238,14 +237,14 @@ func getCascadingStrategy(cascadingFlag string) (metav1.DeletionPropagation, err case "background": return metav1.DeletePropagationBackground, nil default: - return metav1.DeletePropagationBackground, fmt.Errorf(`Invalid cascade value (%v). Must be "background", "foreground", or "orphan".`, cascadingFlag) + return metav1.DeletePropagationBackground, fmt.Errorf(`invalid cascade value (%v). Must be "background", "foreground", or "orphan"`, cascadingFlag) } } // The flag was a boolean - if b { - klog.Warningf(`--cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.`, cascadingFlag, "background") + if boolValue { + fmt.Fprintf(streams.ErrOut, "warning: --cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.\n", cascadingFlag, "background") return metav1.DeletePropagationBackground, nil } - klog.Warningf(`--cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.`, cascadingFlag, "orphan") + fmt.Fprintf(streams.ErrOut, "warning: --cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.\n", cascadingFlag, "orphan") return metav1.DeletePropagationOrphan, nil }