github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88857 from nolancon/test-fix

Browse Source 
Check for nil cpuManager in container manager
This commit is contained in:
Kubernetes Prow Robot 2020-03-05 20:05:14 -08:00 committed by GitHub
commit ce01a9bad0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/container_manager_linux.go
View File

@ -706,6 +706,7 @@ func (m *resourceAllocator) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle
} }
} }
if m.cpuManager != nil {
err = m.cpuManager.Allocate(pod, &container) err = m.cpuManager.Allocate(pod, &container)
if err != nil { if err != nil {
return lifecycle.PodAdmitResult{ return lifecycle.PodAdmitResult{
@ -715,6 +716,7 @@ func (m *resourceAllocator) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle
} }
} }
} }
}
return lifecycle.PodAdmitResult{Admit: true} return lifecycle.PodAdmitResult{Admit: true}
} }

6
pkg/kubelet/cm/internal_container_lifecycle.go
View File

@ -38,7 +38,7 @@ type internalContainerLifecycleImpl struct {
} }
func (i *internalContainerLifecycleImpl) PreStartContainer(pod *v1.Pod, container *v1.Container, containerID string) error { func (i *internalContainerLifecycleImpl) PreStartContainer(pod *v1.Pod, container *v1.Container, containerID string) error {
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CPUManager) { if i.cpuManager != nil {
err := i.cpuManager.AddContainer(pod, container, containerID) err := i.cpuManager.AddContainer(pod, container, containerID)
if err != nil { if err != nil {
return err return err
@ -54,14 +54,14 @@ func (i *internalContainerLifecycleImpl) PreStartContainer(pod *v1.Pod, containe
} }
func (i *internalContainerLifecycleImpl) PreStopContainer(containerID string) error { func (i *internalContainerLifecycleImpl) PreStopContainer(containerID string) error {
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CPUManager) { if i.cpuManager != nil {
return i.cpuManager.RemoveContainer(containerID) return i.cpuManager.RemoveContainer(containerID)
} }
return nil return nil
} }
func (i *internalContainerLifecycleImpl) PostStopContainer(containerID string) error { func (i *internalContainerLifecycleImpl) PostStopContainer(containerID string) error {
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.CPUManager) { if i.cpuManager != nil {
err := i.cpuManager.RemoveContainer(containerID) err := i.cpuManager.RemoveContainer(containerID)
if err != nil { if err != nil {
return err return err