Skip to content

Commit f5a035a

Browse files
committed
Clean up nits in delete cascade
1 parent 9d3a8a0 commit f5a035a

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/cli-runtime/pkg/genericclioptions"
2828
"k8s.io/client-go/dynamic"
29-
"k8s.io/klog/v2"
3029
)
3130

3231
// DeleteFlags composes common printer flag structs
@@ -79,7 +78,7 @@ func (f *DeleteFlags) ToOptions(dynamicClient dynamic.Interface, streams generic
7978
}
8079
if f.CascadingStrategy != nil {
8180
var err error
82-
options.CascadingStrategy, err = getCascadingStrategy(*f.CascadingStrategy)
81+
options.CascadingStrategy, err = parseCascadingFlag(streams, *f.CascadingStrategy)
8382
if err != nil {
8483
return nil, err
8584
}
@@ -226,8 +225,8 @@ func NewDeleteFlags(usage string) *DeleteFlags {
226225
}
227226
}
228227

229-
func getCascadingStrategy(cascadingFlag string) (metav1.DeletionPropagation, error) {
230-
b, err := strconv.ParseBool(cascadingFlag)
228+
func parseCascadingFlag(streams genericclioptions.IOStreams, cascadingFlag string) (metav1.DeletionPropagation, error) {
229+
boolValue, err := strconv.ParseBool(cascadingFlag)
231230
// The flag is not a boolean
232231
if err != nil {
233232
switch cascadingFlag {
@@ -238,14 +237,14 @@ func getCascadingStrategy(cascadingFlag string) (metav1.DeletionPropagation, err
238237
case "background":
239238
return metav1.DeletePropagationBackground, nil
240239
default:
241-
return metav1.DeletePropagationBackground, fmt.Errorf(`Invalid cascade value (%v). Must be "background", "foreground", or "orphan".`, cascadingFlag)
240+
return metav1.DeletePropagationBackground, fmt.Errorf(`invalid cascade value (%v). Must be "background", "foreground", or "orphan"`, cascadingFlag)
242241
}
243242
}
244243
// The flag was a boolean
245-
if b {
246-
klog.Warningf(`--cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.`, cascadingFlag, "background")
244+
if boolValue {
245+
fmt.Fprintf(streams.ErrOut, "warning: --cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.\n", cascadingFlag, "background")
247246
return metav1.DeletePropagationBackground, nil
248247
}
249-
klog.Warningf(`--cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.`, cascadingFlag, "orphan")
248+
fmt.Fprintf(streams.ErrOut, "warning: --cascade=%v is deprecated (boolean value) and can be replaced with --cascade=%s.\n", cascadingFlag, "orphan")
250249
return metav1.DeletePropagationOrphan, nil
251250
}

0 commit comments

Comments
 (0)