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 possible panic in PodAffinityChecker #33086

Conversation

ivan4th
Copy link
Contributor

@ivan4th ivan4th commented Sep 20, 2016

In PodAffinityChecker.getMatchingAntiAffinityTerms() affinity.PodAntiAffinity can be nil in this place. This problem occurs e.g. when nil is passed as meta to PodAffinityChecker.InterPodAffinityMatches().

Stumbled upon it while working on #31136 (someone PTAL at that PR too, I've submitted it a month ago and seemingly no one noticed it), kube-controller-manager was crashing there.

Fix possible panic in PodAffinityChecker

This change is Reviewable

@lukaszo
Copy link
Contributor

lukaszo commented Sep 20, 2016

Reviewed 1 of 1 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@davidopp
Copy link
Member

LGTM

@davidopp
Copy link
Member

Oh and thanks for fixing!

@davidopp davidopp added lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels Sep 21, 2016
@davidopp davidopp added this to the v1.4 milestone Sep 21, 2016
@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit d17c6b9 into kubernetes:master Sep 21, 2016
@ivan4th
Copy link
Contributor Author

ivan4th commented Sep 21, 2016

@davidopp you're welcome. I've created cherrypick PR

@jessfraz jessfraz added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Oct 4, 2016
k8s-github-robot pushed a commit that referenced this pull request Oct 4, 2016
…6-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of #33086

Cherry pick of #33086 on release-1.4.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@jessfraz jessfraz added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Oct 20, 2016
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…k-of-#33086-upstream-release-1.4

Automatic merge from submit-queue

Automated cherry pick of kubernetes#33086

Cherry pick of kubernetes#33086 on release-1.4.
@davidopp davidopp mentioned this pull request Dec 6, 2016
@timothysc timothysc added the sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. label Dec 6, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants