Skip to content

Automated cherry pick of #65370: delete should tolerate a failed wait because of missing verbs - #66164

Merged
k8s-github-robot merged 2 commits into
kubernetes:release-1.11from
liggitt:automated-cherry-pick-of-#65370-#66136-upstream-release-1.11
Jul 19, 2018
Merged

k8s-github-robot merged 2 commits into
kubernetes:release-1.11from
liggitt:automated-cherry-pick-of-#65370-#66136-upstream-release-1.11

Conversation

@liggitt

@liggitt liggitt commented Jul 13, 2018 •

Copy link
Copy Markdown
Member

#66136: make delete waits match on UID

Cherry pick of #65370 #66136 on release-1.11.

#65370: delete should tolerate a failed wait because of missing verbs
#66136: make delete waits match on UID

fixes `kubectl delete` failures when the resource being deleted doesn't support get/watch, or when the resource is rapidly recreated with the same name

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jul 13, 2018
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 13, 2018
@k8s-ci-robot
k8s-ci-robot requested review from dshulyak and ghodss July 13, 2018 14:49
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jul 13, 2018
@liggitt

liggitt commented Jul 13, 2018

Copy link
Copy Markdown
Member Author

/milestone v1.11
/priority important-soon
/sig cli
/kind bug
/status approved-for-milestone
/assign @deads2k @foxish

@k8s-ci-robot k8s-ci-robot added this to the v1.11 milestone Jul 13, 2018
@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. sig/cli Categorizes an issue or PR as relevant to SIG CLI. kind/bug Categorizes issue or PR as related to a bug. labels Jul 13, 2018
@k8s-github-robot

Copy link
Copy Markdown

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@deads2k @foxish @liggitt

Pull Request Labels
  • sig/cli: Pull Request will be escalated to these SIGs if needed.
  • priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jul 13, 2018
@foxish

foxish commented Jul 16, 2018

Copy link
Copy Markdown
Contributor

This missed 1.11.1, targeting 1.11.2

@foxish foxish added lgtm "Looks good to me", indicates that a PR is ready to be merged. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Jul 19, 2018
@foxish

foxish commented Jul 19, 2018

Copy link
Copy Markdown
Contributor

lgtm-ed and approved because the cherrypick looked like the exactly the sum of the two merged master PRs. @liggitt, please let me know if that's not the case.

@fejta-bot

Copy link
Copy Markdown

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel comment for consistent failures.

@k8s-github-robot

Copy link
Copy Markdown

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot

Copy link
Copy Markdown

Automatic merge from submit-queue.

@k8s-github-robot
k8s-github-robot merged commit 379491a into kubernetes:release-1.11 Jul 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cli Categorizes an issue or PR as relevant to SIG CLI. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants