github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2018-05-30 08:42:20 -07:00 committed by GitHub
commit 1e0973db3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubectl/cmd/delete.go
View File

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