UPSTREAM: 45349: Fix daemonsets to have correct tolerations for TaintNodeNotReady and TaintNodeUnreachable.#14653
Merged
openshift-bot merged 1 commit intoopenshift:masterfrom Jun 19, 2017
Conversation
Contributor
Author
|
[test] |
…NodeNotReady and TaintNodeUnreachable.
aveshagarwal
force-pushed
the
master-rhbz-1459745
branch
from
052459b to
31631e6
Compare
aveshagarwal
changed the title
Contributor
Author
|
[test] |
Contributor
|
Evaluated for origin test up to 31631e6 |
Contributor
|
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2242/) (Base Commit: 9db846c) |
Contributor
Author
|
[merge][severity:blocker] |
Contributor
Author
|
@derekwaynecarr @eparis it needs merge tag, mine doesn't work. |
Member
|
LGTM |
Contributor
|
Evaluated for origin merge up to 31631e6 |
Contributor
|
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/1044/) (Base Commit: b9d68cb) (PR Branch Commit: 31631e6) (Extended Tests: blocker) (Image: devenv-rhel7_6377) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
@derekwaynecarr
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1459745
I tested this issue in kube upstream and found that it is already fixed in there but the upstream changes can not be directly applied in origin, so had to modify them to fit in origin. Also to keep pkg/api/helpers.go and pkg/api/v1/helpers.go in sync, I made changes in both files, something not done upstream.