Allow override of cluster level (default, whitelist) tolerations by namespace level empty (default, whitelist) tolerations.#17116
Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom Nov 2, 2017
Conversation
openshift-ci-robot
added
the
size/M
openshift-merge-robot
added
the
vendor-update
Contributor
|
/unassign |
Contributor
Author
|
/test unit |
… tolerations by namespace level empty (default, whitelist) tolerations.
aveshagarwal
force-pushed
the
master-pod-toleration-restrictions-issues
branch
from
d8afb6f to
83d3756
Compare
Contributor
Author
|
/kind bug |
openshift-ci-robot
added
the
kind/bug
Contributor
|
/lgtm |
Contributor
Author
|
@derekwaynecarr could you approve it? |
Member
|
/approve |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: aveshagarwal, derekwaynecarr, sjenning The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these OWNERS Files:
You can indicate your approval by writing |
openshift-merge-robot
added
the
approved
Contributor
|
Automatic merge from submit-queue. |
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
7 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.
Currently In PodTolerationRestriction admission plugin, if namespace level default and whitelist of tolerations are nil or empty, they do not override cluster level default and whitelist tolerations.
This PR fixes the plugin to not override cluster level tolerations only when namespace level toleration are nil. IOW, if namespace level toleration are empty, they override cluster level tolerations. To be more clear, if following annotations are set to empty, they override cluster level tolerations.
This behavior is inline with PodNodeSelector admission plugin too.
@sjenning
I think its important to get it fixed for 3.7 so creating this backport PR even though the upstream PR is not merged yet.