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.

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

UPSTREAM: 45349: Fix daemonsets to have correct tolerations for TaintNodeNotReady and TaintNodeUnreachable. #14653

Merged
merged 1 commit into from
Jun 19, 2017

Conversation

aveshagarwal
Copy link
Contributor

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

@aveshagarwal
Copy link
Contributor Author

[test]

@aveshagarwal aveshagarwal force-pushed the master-rhbz-1459745 branch from 052459b to 31631e6 Compare June 14, 2017 20:33
@aveshagarwal aveshagarwal changed the title Fix daemonsets to have correct tolerations for TaintNodeNotReady and TaintNodeUnreachable. UPSTREAM: 45349: Fix daemonsets to have correct tolerations for TaintNodeNotReady and TaintNodeUnreachable. Jun 14, 2017
@aveshagarwal
Copy link
Contributor Author

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 31631e6

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/2242/) (Base Commit: 9db846c)

@aveshagarwal
Copy link
Contributor Author

[merge][severity:blocker]

@aveshagarwal
Copy link
Contributor Author

@derekwaynecarr @eparis it needs merge tag, mine doesn't work.

@derekwaynecarr
Copy link
Member

LGTM
[merge][severity:blocker]

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 31631e6

@openshift-bot
Copy link
Contributor

openshift-bot commented Jun 19, 2017

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)

@openshift-bot openshift-bot merged commit 795ba0a into openshift:master Jun 19, 2017
@aveshagarwal aveshagarwal deleted the master-rhbz-1459745 branch July 24, 2017 13:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants