Skip to content

K
k3s
Unverified Commit 2630d09c authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #66596 from BSWANG/master

Automatic merge from submit-queue (batch tested with PRs 66665, 66707, 66596). 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>. fix kubelet npe panic on device plugin return zero container Signed-off-by: 's avatarbingshen.wbs <bingshen.wbs@alibaba-inc.com> **What this PR does / why we need it**: Fix kubelet panic when device plugin return zero containers. Panic logs like follows: ``` Jul 17 12:50:24 iZwz9bqgzuo4i8qu435zk8Z kubelet[25815]: /workspace/anago-v1.10.4-beta.0.68+5ca598b4/src/k8s.io/kubernetes/_output/dockerized/go/src/ k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go:51 Jul 17 12:50:24 iZwz9bqgzuo4i8qu435zk8Z kubelet[25815]: /workspace/anago-v1.10.4-beta.0.68+5ca598b4/src/k8s.io/kubernetes/_output/dockerized/go/src/ k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go:65 Jul 17 12:50:24 iZwz9bqgzuo4i8qu435zk8Z kubelet[25815]: /workspace/anago-v1.10.4-beta.0.68+5ca598b4/src/k8s.io/kubernetes/_output/dockerized/go/src/ k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go:72 Jul 17 12:50:24 iZwz9bqgzuo4i8qu435zk8Z kubelet[25815]: E0717 12:50:24.726856 25815 runtime.go:66] Observed a panic: "index out of range" (runtime error : index out of range) ``` **Release note**: ``` NONE ```
parents 1c067606 b1bdd043
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
pkg/kubelet/cm/devicemanager/manager.go
View file @ 2630d09c
...@@ -664,6 +664,10 @@ func (m *ManagerImpl) allocateContainerResources(pod *v1.Pod, container *v1.Cont ...@@ -664,6 +664,10 @@ func (m *ManagerImpl) allocateContainerResources(pod *v1.Pod, container *v1.Cont
return err return err
} }
if len(resp.ContainerResponses) == 0 {
return fmt.Errorf("No containers return in allocation response %v", resp)
}
// Update internal cached podDevices state. // Update internal cached podDevices state.
m.mutex.Lock() m.mutex.Lock()
m.podDevices.insert(podUID, contName, resource, allocDevices, resp.ContainerResponses[0]) m.podDevices.insert(podUID, contName, resource, allocDevices, resp.ContainerResponses[0])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment