kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95059 from zhouya0/clean_up_nits_delete_cascade 

Clean up nits in delete cascade flag parsing

Kubernetes-commit: c1ce63ab73c4d9fca2d872a772f3b884e452bba2
This commit is contained in:
Kubernetes Publisher 2020-10-07 12:38:16 -07:00
parent e3458f49bf fd930e3995
commit ade77d56eb
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -772,7 +772,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "becbabb36002"
"Rev": "5682372f3538"
},
{
"ImportPath": "k8s.io/code-generator",

4
go.mod
View File

@ -37,7 +37,7 @@ require (
k8s.io/api v0.0.0-20201005155906-2c3c141c931c
k8s.io/apimachinery v0.0.0-20201006035708-d4f471b82f0a
k8s.io/cli-runtime v0.0.0-20201004001941-bc95ff91653e
k8s.io/client-go v0.0.0-20201004200234-becbabb36002
k8s.io/client-go v0.0.0-20201007120136-5682372f3538
k8s.io/component-base v0.0.0-20201004000625-609bde980a40
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
@ -51,7 +51,7 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20201005155906-2c3c141c931c
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201006035708-d4f471b82f0a
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201004001941-bc95ff91653e
k8s.io/client-go => k8s.io/client-go v0.0.0-20201004200234-becbabb36002
k8s.io/client-go => k8s.io/client-go v0.0.0-20201007120136-5682372f3538
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201003235514-f6667ec3dafb
k8s.io/component-base => k8s.io/component-base v0.0.0-20201004000625-609bde980a40
k8s.io/metrics => k8s.io/metrics v0.0.0-20201004001828-029a41d5e49d

2
go.sum
View File

@ -506,7 +506,7 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt
k8s.io/api v0.0.0-20201005155906-2c3c141c931c/go.mod h1:aE9OxkIvJAf55JfJy/0UlrF0nZT2ZDhmsWnNzhbAySI=
k8s.io/apimachinery v0.0.0-20201006035708-d4f471b82f0a/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
k8s.io/cli-runtime v0.0.0-20201004001941-bc95ff91653e/go.mod h1:6TfA4NjrL55kCpvC1ctcwvJx1NpamdfUqvfWrOr9ETc=
k8s.io/client-go v0.0.0-20201004200234-becbabb36002/go.mod h1:zltjMDhkwCKG2AvwcACaWC+fwiTEB0qElpbFMvxx+/g=
k8s.io/client-go v0.0.0-20201007120136-5682372f3538/go.mod h1:QvSrA3Tta0gMhxbrDVuu/Nf+5+qRalN2AXEQPQpgLPQ=
k8s.io/code-generator v0.0.0-20201003235514-f6667ec3dafb/go.mod h1:oioc17TXBB973K4R+ytm5k9jY1BktboxJc7qu3i29V0=
k8s.io/component-base v0.0.0-20201004000625-609bde980a40/go.mod h1:WUOeHeahPXuwTMTTZxsAJUyXuIRVbvgNTCVvlzwewJU=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

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