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

Fix besteffort pods for conflicting tolerations #75985

Merged

Conversation

@ravisantoshgudimetla
Copy link
Contributor

commented Apr 1, 2019

What type of PR is this?
/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:
As of now for best effort pods, we are allowing conflicting tolerations meaning, tolerations with same Key, Effect are being appended instead of overwritten. For example if a best effort pod is created with Key:abc, Effect: NoSchedule, Value: Test1 and Key:abc, Effect: NoSchedule. Value:Test2, we are seeing 2 tolerations but in case of pods with other QoS tiers, we are seeing a pod with Key:abc, Effect: NoSchedule. Value:Test2 because the Test2 overwrites the Test1 value. This PR fixes so that BE pods have consistent behaviour with other pods.
Does this PR introduce a user-facing change?:

Tolerations with the same key and effect will be merged into one which has the value of the latest toleration for best effort pods.
@ravisantoshgudimetla

This comment has been minimized.

Copy link
Contributor Author

commented Apr 1, 2019

/sig scheduling
/priority longterm
/cc @bsalamat @Huang-Wei @sjenning

@bsalamat
Copy link
Member

left a comment

/lgtm

I hope no body relies on the existing broken behavior. Please make sure that this is highlighted in our release notes.

@k8s-ci-robot k8s-ci-robot added the lgtm label Apr 1, 2019

@Huang-Wei
Copy link
Member

left a comment

Thanks for the catch @ravisantoshgudimetla .

Suggest to rephrase release-note to:

Tolerations with the same key and effect will be merged into one which has the value of the latest toleration.
Fix besteffort pods for conflicting tolerations
Signed-off-by: ravisantoshgudimetla <ravisantoshgudimetla@gmail.com>

@ravisantoshgudimetla ravisantoshgudimetla force-pushed the ravisantoshgudimetla:fix-pod-toleration branch from e721481 to 82ffd14 Apr 2, 2019

@k8s-ci-robot k8s-ci-robot added size/S and removed lgtm size/M labels Apr 2, 2019

@ravisantoshgudimetla

This comment has been minimized.

Copy link
Contributor Author

commented Apr 2, 2019

@bsalamat and @Huang-Wei, can one of you, re-lgtm this PR?

@Huang-Wei

This comment has been minimized.

Copy link
Member

commented Apr 2, 2019

/lgtm

@derekwaynecarr

This comment has been minimized.

Copy link
Member

commented Apr 4, 2019

/approve

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

commented Apr 4, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, ravisantoshgudimetla

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ravisantoshgudimetla

This comment has been minimized.

Copy link
Contributor Author

commented Apr 5, 2019

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug and removed needs-kind labels Apr 5, 2019

@k8s-ci-robot k8s-ci-robot merged commit 16db83b into kubernetes:master Apr 5, 2019

16 of 17 checks passed

pull-kubernetes-kubemark-e2e-gce-big Job triggered.
Details
cla/linuxfoundation ravisantoshgudimetla authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-conformance-image-test Skipped.
pull-kubernetes-cross Skipped.
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-100-performance Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-godeps Skipped.
pull-kubernetes-integration Job succeeded.
Details
pull-kubernetes-local-e2e Skipped.
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-typecheck Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
pull-publishing-bot-validate Skipped.
tide In merge pool.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.