Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #37263 upstream release 1.5 #37709

Merged
merged 1 commit into from
Nov 30, 2016
Merged

Automated cherry pick of #37263 upstream release 1.5 #37709

merged 1 commit into from
Nov 30, 2016

Conversation

saad-ali
Copy link
Member

Automated cherry pick of #37263 from master to release-1.5 branch to unblock automated upgrade tests

@smarterclayton @saad-ali
When --grace-period=0 is provided, wait for deletion
4d914da 
The grace-period is automatically set to 1 unless --force is provided,
and the client waits until the object is deleted.

This preserves backwards compatibility with 1.4 and earlier. It does not
handle scenarios where the object is deleted and a new object is created
with the same name.
@saad-ali saad-ali added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. release-note-none Denotes a PR that doesn't merit a release note. labels Nov 30, 2016
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Nov 30, 2016
@k8s-oncall
Copy link

This change is Reviewable

@saad-ali saad-ali added this to the v1.5 milestone Nov 30, 2016
@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 30, 2016
@smarterclayton
Copy link
Contributor

You beat me by 10 minutes.

@smarterclayton smarterclayton added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 30, 2016
@saad-ali
Copy link
Member Author

All tests are green except for Jenkins kops AWS e2e which won't start due to infrastructure issues.

Jenkins CRI GCE Node e2e — Build succeeded.
Jenkins GCE Node e2e — Build succeeded.
Jenkins GCE etcd3 e2e — Build succeeded.
Jenkins GCI GCE e2e — Build succeeded.
Jenkins GCI GKE smoke e2e — Build succeeded.
Jenkins GKE smoke e2e — Build succeeded.
Jenkins Kubemark GCE e2e — Build succeeded.
Jenkins unit/integration — Build succeeded.
Jenkins verification — Build succeeded.
Jenkins kops AWS e2e — Error starting build.

Manually merging to unblock automated upgrade testing. @krousey @roberthbailey

@dims
Copy link
Member

dims commented Nov 30, 2016

@k8s-bot kops aws e2e test this

@saad-ali saad-ali merged commit 01dd9a7 into kubernetes:release-1.5 Nov 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@smarterclayton smarterclayton

Labels
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@saad-ali @k8s-oncall @smarterclayton @dims @k8s-github-robot @k8s-ci-robot