Skip to content

Commit

Permalink
Merge pull request #16241 from ironcladlou/k8s-52092-pick
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

UPSTREAM: 52092: Fix resource quota controller panic (Drop in 1.8)

The pod evaluator used by the resource quota controller made direct
calls to an unsafe pod conversion function which mutates the pod
argument. With multiple resource quota controller workers, concurrent
processing of the same pod from a shared informer can result in a panic
when the conversion code attempts to write to a map field in the pod.

Swap out the direct conversion function call to Scheme.ConvertToVersion,
which copies the input before conversion.

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1486416
/xref kubernetes/kubernetes#52092
  • Loading branch information
openshift-merge-robot committed Sep 8, 2017
2 parents 8a47952 + 556fe48 commit d223c6a
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions vendor/k8s.io/kubernetes/pkg/quota/evaluator/core/pods.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit d223c6a

Please sign in to comment.