mirror of https://github.com/k3s-io/k3s
Merge pull request #53547 from jiayingz/deviceplugin-fix
Automatic merge from submit-queue (batch tested with PRs 52662, 53547, 53588, 53573, 53599). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. In DevicePluginHandlerImpl.Allocate(), skips untracked extended resou… …rces. Otherwise, we would fail a Pod allocation request that has an extended resource not managed by any device plugin. **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # https://github.com/kubernetes/kubernetes/issues/53548 **Special notes for your reviewer**: **Release note**: ```release-note Ignore extended resources that are not registered with kubelet ```pull/6/head
commit
c12dab37e7
|
@ -166,7 +166,8 @@ func (h *DevicePluginHandlerImpl) Allocate(pod *v1.Pod, container *v1.Container,
|
|||
resource := string(k)
|
||||
needed := int(v.Value())
|
||||
glog.V(3).Infof("needs %d %s", needed, resource)
|
||||
if !deviceplugin.IsDeviceName(k) || needed == 0 {
|
||||
_, registeredResource := h.allDevices[resource]
|
||||
if !registeredResource || needed == 0 {
|
||||
continue
|
||||
}
|
||||
h.Lock()
|
||||
|
|
Loading…
Reference in New Issue