github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90969 from zhouya0/kubectl_wait_add_ignore_not_found

Browse Source 
Ignore not found in `kubectl wait --for=delete`
This commit is contained in:
Kubernetes Prow Robot 2020-09-16 10:03:19 -07:00 committed by GitHub
commit 3d52b8b5d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/kubectl/pkg/cmd/wait/wait.go
View File

@ -165,6 +165,7 @@ func (flags *WaitFlags) ToOptions(args []string) (*WaitOptions, error) {
ResourceFinder: builder, ResourceFinder: builder,
DynamicClient: dynamicClient, DynamicClient: dynamicClient,
Timeout: effectiveTimeout, Timeout: effectiveTimeout,
ForCondition: flags.ForCondition,
Printer: printer, Printer: printer,
ConditionFn: conditionFn, ConditionFn: conditionFn,
@ -215,6 +216,7 @@ type WaitOptions struct {
UIDMap UIDMap UIDMap UIDMap
DynamicClient dynamic.Interface DynamicClient dynamic.Interface
Timeout time.Duration Timeout time.Duration
ForCondition string
Printer printers.ResourcePrinter Printer printers.ResourcePrinter
ConditionFn ConditionFunc ConditionFn ConditionFunc
@ -227,7 +229,7 @@ type ConditionFunc func(info *resource.Info, o *WaitOptions) (finalObject runtim
// RunWait runs the waiting logic // RunWait runs the waiting logic
func (o *WaitOptions) RunWait() error { func (o *WaitOptions) RunWait() error {
visitCount := 0 visitCount := 0
err := o.ResourceFinder.Do().Visit(func(info *resource.Info, err error) error { visitFunc := func(info *resource.Info, err error) error {
if err != nil { if err != nil {
return err return err
} }
@ -242,7 +244,13 @@ func (o *WaitOptions) RunWait() error {
return fmt.Errorf("%v unsatisified for unknown reason", finalObject) return fmt.Errorf("%v unsatisified for unknown reason", finalObject)
} }
return err return err
}) }
visitor := o.ResourceFinder.Do()
if visitor, ok := visitor.(*resource.Result); ok && strings.ToLower(o.ForCondition) == "delete" {
visitor.IgnoreErrors(apierrors.IsNotFound)
}
err := visitor.Visit(visitFunc)
if err != nil { if err != nil {
return err return err
} }

27
staging/src/k8s.io/kubectl/pkg/cmd/wait/wait_test.go
View File

@ -787,3 +787,30 @@ func TestWaitForCondition(t *testing.T) {
}) })
} }
} }
func TestWaitForDeletionIgnoreNotFound(t *testing.T) {
scheme := runtime.NewScheme()
infos := []*resource.Info{
{
Mapping: &meta.RESTMapping{
Resource: schema.GroupVersionResource{Group: "group", Version: "version", Resource: "theresource"},
},
Name: "name-foo",
Namespace: "ns-foo",
},
}
fakeClient := dynamicfakeclient.NewSimpleDynamicClient(scheme)
o := &WaitOptions{
ResourceFinder: genericclioptions.NewSimpleFakeResourceFinder(infos...),
DynamicClient: fakeClient,
Printer: printers.NewDiscardingPrinter(),
ConditionFn: IsDeleted,
IOStreams: genericclioptions.NewTestIOStreamsDiscard(),
ForCondition: "delete",
}
err := o.RunWait()
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
}