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

Backport of #17401 to release-1.1 #17975

Merged
merged 3 commits into from
Dec 4, 2015
Merged

Backport of #17401 to release-1.1 #17975

merged 3 commits into from
Dec 4, 2015

Conversation

aaronlevy
Copy link
Contributor

Backport of #17401

@k8s-bot
Copy link

k8s-bot commented Nov 30, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

1 similar comment
@k8s-bot
Copy link

k8s-bot commented Nov 30, 2015

Can one of the admins verify that this patch is reasonable to test? (reply "ok to test", or if you trust the user, reply "add to whitelist")

If this message is too spammy, please complain to ixdy.

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Nov 30, 2015
@vishh vishh assigned dchen1107 and unassigned vishh Nov 30, 2015
@philips
Copy link
Contributor

philips commented Dec 1, 2015

@k8s-teamcity-mesosphere What does: "[20:13:08][Step 6/6] ERROR: Invalid interpolation format for "entrypoint" option in service "mesosslave" mean? This seems like a problem on the testing side.

@ixdy
Copy link
Member

ixdy commented Dec 1, 2015

ok to test

@karlkfi
Copy link
Contributor

karlkfi commented Dec 1, 2015

The Mesosphere smoke tests are not currently working on cherry-pick PRs. You can ignore it for now, @philips

It has to do with the master test script changes not having all been cherry-picked yet.

@k8s-bot
Copy link

k8s-bot commented Dec 1, 2015

GCE e2e build/test failed for commit 1a92b54ba31af7869cded60a5b7693d5bed5d294.

@k8s-bot
Copy link

k8s-bot commented Dec 1, 2015

GCE e2e test build/test passed for commit 0f56fc0f60b0dc3ce19611174cc03ef7cbc6f08b.

Aaron Levy added 3 commits December 1, 2015 13:54
kubelet: report NodeReady last in status list
4f509b4 
Addresses a version skew issue where the last condition status is always
evaluated as the NodeReady status. As a workaround force the NodeReady
condition to be the last in the list of node conditions.

ref: kubernetes#16961
explicitly check "Ready" condition in validate-cluster
7f7d05c
kubelet: check node condition by type rather than by index
8119ec3
@aaronlevy aaronlevy force-pushed the automated-cherry-pick-of-#17401-upstream-release-1.1 branch from 0f56fc0 to 8119ec3 Compare December 1, 2015 22:20
@aaronlevy
Copy link
Contributor Author

Rebased against release-1.1 to include fixes to unrelated unit-test failures.

@aaronlevy aaronlevy changed the title Automated cherry pick of #17401 upstream release 1.1 Backport of #17401 to release-1.1 Dec 1, 2015
@k8s-bot
Copy link

k8s-bot commented Dec 1, 2015

GCE e2e test build/test passed for commit 8119ec3.

@aaronlevy aaronlevy mentioned this pull request Dec 1, 2015
Merged
@dchen1107
Copy link
Member

LGTM.

@dchen1107 dchen1107 added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Dec 3, 2015
@k8s-github-robot
Copy link

Travis continuous integration appears to have missed, closing and re-opening to trigger it

@k8s-github-robot
Copy link

The author of this PR is not in the whitelist for merge, can one of the admins add the 'ok-to-merge' label?

@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-bot
Copy link

k8s-bot commented Dec 3, 2015

GCE e2e test build/test passed for commit 8119ec3.

@zmerlynn
Copy link
Member

zmerlynn commented Dec 4, 2015

Kermity, merging.

zmerlynn added a commit that referenced this pull request Dec 4, 2015
@zmerlynn
Merge pull request #17975 from aaronlevy/automated-cherry-pick-of-#17…
839080d 
…401-upstream-release-1.1

Backport of #17401 to release-1.1
@zmerlynn zmerlynn merged commit 839080d into kubernetes:release-1.1 Dec 4, 2015
@ikehz ikehz added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Dec 8, 2015
@aaronlevy aaronlevy mentioned this pull request Dec 9, 2015
Merged
@aaronlevy aaronlevy deleted the automated-cherry-pick-of-#17401-upstream-release-1.1 branch February 11, 2016 22:33
shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
@zmerlynn
Merge pull request kubernetes#17975 from aaronlevy/automated-cherry-p…
b2b45bf 
…ick-of-#17401-upstream-release-1.1

Backport of kubernetes#17401 to release-1.1
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
@zmerlynn
Merge pull request kubernetes#17975 from aaronlevy/automated-cherry-p…
a29a313 
…ick-of-#17401-upstream-release-1.1

Backport of kubernetes#17401 to release-1.1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dchen1107 dchen1107

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet