github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #95059 from zhouya0/clean_up_nits_delete_cascade

Browse Source 
Clean up nits in delete cascade flag parsing
This commit is contained in:
Kubernetes Prow Robot 2020-10-07 12:38:16 -07:00 committed by GitHub
commit c1ce63ab73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
staging/src/k8s.io/kubectl/pkg/cmd/delete/delete_flags.go
View File

@ -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
}