From 2b8bc85f7588ca1c834c06ee138d6e1fdcc15f46 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Thu, 17 Jan 2019 10:57:09 -0800 Subject: [PATCH] fix panic in NodeAllocatable node e2e test --- pkg/kubelet/cm/cgroup_manager_linux.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index 977fb5b29f7..3e8b60d9d16 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -435,7 +435,7 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error { libcontainerCgroupConfig.Path = cgroupConfig.Name.ToCgroupfs() } - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) && cgroupConfig.ResourceParameters.PodPidsLimit != nil { + if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) && cgroupConfig.ResourceParameters != nil && cgroupConfig.ResourceParameters.PodPidsLimit != nil { libcontainerCgroupConfig.PidsLimit = *cgroupConfig.ResourceParameters.PodPidsLimit } @@ -465,7 +465,7 @@ func (m *cgroupManagerImpl) Create(cgroupConfig *CgroupConfig) error { libcontainerCgroupConfig.Path = cgroupConfig.Name.ToCgroupfs() } - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) && cgroupConfig.ResourceParameters.PodPidsLimit != nil { + if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.SupportPodPidsLimit) && cgroupConfig.ResourceParameters != nil && cgroupConfig.ResourceParameters.PodPidsLimit != nil { libcontainerCgroupConfig.PidsLimit = *cgroupConfig.ResourceParameters.PodPidsLimit }