Unverified Commit 1e0973db authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub

Merge pull request #64444 from deads2k/cli-71-delete-change

Automatic merge from submit-queue (batch tested with PRs 63328, 64316, 64444, 64449, 64453). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. fix the delete result being used fixes https://github.com/kubernetes/kubernetes/issues/64401 @nilebox pretty sure this will fix you. Do you have an easy test to add to test-cmd? @kubernetes/sig-cli-bugs /kind bug /assign @nilebox /assign @soltysh ```release-note NONE ```
parents a2d86365 cb096075
...@@ -273,7 +273,7 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error { ...@@ -273,7 +273,7 @@ func (o *DeleteOptions) DeleteResult(r *resource.Result) error {
effectiveTimeout = 168 * time.Hour effectiveTimeout = 168 * time.Hour
} }
waitOptions := kubectlwait.WaitOptions{ waitOptions := kubectlwait.WaitOptions{
ResourceFinder: genericclioptions.ResourceFinderForResult(o.Result), ResourceFinder: genericclioptions.ResourceFinderForResult(r),
DynamicClient: o.DynamicClient, DynamicClient: o.DynamicClient,
Timeout: effectiveTimeout, Timeout: effectiveTimeout,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment