diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 4dd27a08bf0..d0cec28b778 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -748,7 +748,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy, ExperimentalMemoryManagerReservedMemory: s.ReservedMemory, - ExperimentalPodPidsLimit: s.PodPidsLimit, + PodPidsLimit: s.PodPidsLimit, EnforceCPULimits: s.CPUCFSQuota, CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration, ExperimentalTopologyManagerPolicy: s.TopologyManagerPolicy, diff --git a/pkg/kubelet/cm/container_manager.go b/pkg/kubelet/cm/container_manager.go index aae7d3231cf..6e7d3f72246 100644 --- a/pkg/kubelet/cm/container_manager.go +++ b/pkg/kubelet/cm/container_manager.go @@ -152,7 +152,7 @@ type NodeConfig struct { CPUManagerReconcilePeriod time.Duration ExperimentalMemoryManagerPolicy string ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation - ExperimentalPodPidsLimit int64 + PodPidsLimit int64 EnforceCPULimits bool CPUCFSQuotaPeriod time.Duration ExperimentalTopologyManagerPolicy string diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 7d735e8bfd7..c2a3945228b 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -366,7 +366,7 @@ func (cm *containerManagerImpl) NewPodContainerManager() PodContainerManager { qosContainersInfo: cm.GetQOSContainersInfo(), subsystems: cm.subsystems, cgroupManager: cm.cgroupManager, - podPidsLimit: cm.ExperimentalPodPidsLimit, + podPidsLimit: cm.PodPidsLimit, enforceCPULimits: cm.EnforceCPULimits, // cpuCFSQuotaPeriod is in microseconds. NodeConfig.CPUCFSQuotaPeriod is time.Duration (measured in nano seconds). // Convert (cm.CPUCFSQuotaPeriod) [nanoseconds] / time.Microsecond (1000) to get cpuCFSQuotaPeriod in microseconds.