diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go index d557265617e..55606b508aa 100644 --- a/pkg/kubelet/cm/cgroup_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_manager_linux.go @@ -21,7 +21,6 @@ import ( "os" "path" "path/filepath" - "strconv" "strings" "sync" "time" @@ -485,12 +484,3 @@ func readCgroupMemoryConfig(cgroupPath string, memLimitFile string) (*ResourceCo return &ResourceConfig{Memory: &mLim}, nil } - -func writeCgroupMemoryLimit(memoryLimitFileLocation string, resourceConfig *ResourceConfig) error { - memLimit := strconv.FormatInt(*resourceConfig.Memory, 10) - if err := os.WriteFile(memoryLimitFileLocation, []byte(memLimit), 0700); err != nil { - return fmt.Errorf("failed to write %v to %v: %w", memLimit, memoryLimitFileLocation, err) - } - //TODO(vinaykul,InPlacePodVerticalScaling): Add memory request support - return nil -} diff --git a/pkg/kubelet/cm/cgroup_v1_manager_linux.go b/pkg/kubelet/cm/cgroup_v1_manager_linux.go index 0f9d1ee1896..afd02925833 100644 --- a/pkg/kubelet/cm/cgroup_v1_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_v1_manager_linux.go @@ -19,8 +19,6 @@ package cm import ( "errors" "fmt" - "os" - "path/filepath" "strconv" "strings" @@ -142,33 +140,6 @@ func (c *cgroupV1impl) getCgroupCPUConfig(cgroupPath string) (*ResourceConfig, e return &ResourceConfig{CPUShares: &cpuShares, CPUQuota: &cpuQuota, CPUPeriod: &cpuPeriod}, nil } -func (c *cgroupV1impl) setCgroupCPUConfig(cgroupPath string, resourceConfig *ResourceConfig) error { - var cpuQuotaStr, cpuPeriodStr, cpuSharesStr string - if resourceConfig.CPUQuota != nil { - cpuQuotaStr = strconv.FormatInt(*resourceConfig.CPUQuota, 10) - if err := os.WriteFile(filepath.Join(cgroupPath, "cpu.cfs_quota_us"), []byte(cpuQuotaStr), 0700); err != nil { - return fmt.Errorf("failed to write %v to %v: %w", cpuQuotaStr, cgroupPath, err) - } - } - if resourceConfig.CPUPeriod != nil { - cpuPeriodStr = strconv.FormatUint(*resourceConfig.CPUPeriod, 10) - if err := os.WriteFile(filepath.Join(cgroupPath, "cpu.cfs_period_us"), []byte(cpuPeriodStr), 0700); err != nil { - return fmt.Errorf("failed to write %v to %v: %w", cpuPeriodStr, cgroupPath, err) - } - } - if resourceConfig.CPUShares != nil { - cpuSharesStr = strconv.FormatUint(*resourceConfig.CPUShares, 10) - if err := os.WriteFile(filepath.Join(cgroupPath, "cpu.shares"), []byte(cpuSharesStr), 0700); err != nil { - return fmt.Errorf("failed to write %v to %v: %w", cpuSharesStr, cgroupPath, err) - } - } - return nil -} - -func (c *cgroupV1impl) setCgroupMemoryConfig(cgroupPath string, resourceConfig *ResourceConfig) error { - return writeCgroupMemoryLimit(filepath.Join(cgroupPath, cgroupv1MemLimitFile), resourceConfig) -} - func (c *cgroupV1impl) getCgroupMemoryConfig(cgroupPath string) (*ResourceConfig, error) { return readCgroupMemoryConfig(cgroupPath, cgroupv1MemLimitFile) } diff --git a/pkg/kubelet/cm/cgroup_v2_manager_linux.go b/pkg/kubelet/cm/cgroup_v2_manager_linux.go index 8cea1e2d0ac..ad93e971fef 100644 --- a/pkg/kubelet/cm/cgroup_v2_manager_linux.go +++ b/pkg/kubelet/cm/cgroup_v2_manager_linux.go @@ -128,35 +128,6 @@ func (c *cgroupV2impl) getCgroupCPUConfig(cgroupPath string) (*ResourceConfig, e return &ResourceConfig{CPUShares: &cpuShares, CPUQuota: &cpuLimit, CPUPeriod: &cpuPeriod}, nil } -func (c *cgroupV2impl) setCgroupCPUConfig(cgroupPath string, resourceConfig *ResourceConfig) error { - if resourceConfig.CPUQuota != nil { - if resourceConfig.CPUPeriod == nil { - return fmt.Errorf("CpuPeriod must be specified in order to set CpuLimit") - } - cpuLimitStr := Cgroup2MaxCpuLimit - if *resourceConfig.CPUQuota > -1 { - cpuLimitStr = strconv.FormatInt(*resourceConfig.CPUQuota, 10) - } - cpuPeriodStr := strconv.FormatUint(*resourceConfig.CPUPeriod, 10) - cpuMaxStr := fmt.Sprintf("%s %s", cpuLimitStr, cpuPeriodStr) - if err := os.WriteFile(filepath.Join(cgroupPath, "cpu.max"), []byte(cpuMaxStr), 0700); err != nil { - return fmt.Errorf("failed to write %v to %v: %w", cpuMaxStr, cgroupPath, err) - } - } - if resourceConfig.CPUShares != nil { - cpuWeight := cpuSharesToCPUWeight(*resourceConfig.CPUShares) - cpuWeightStr := strconv.FormatUint(cpuWeight, 10) - if err := os.WriteFile(filepath.Join(cgroupPath, "cpu.weight"), []byte(cpuWeightStr), 0700); err != nil { - return fmt.Errorf("failed to write %v to %v: %w", cpuWeightStr, cgroupPath, err) - } - } - return nil -} - -func (c *cgroupV2impl) setCgroupMemoryConfig(cgroupPath string, resourceConfig *ResourceConfig) error { - return writeCgroupMemoryLimit(filepath.Join(cgroupPath, cgroupv2MemLimitFile), resourceConfig) -} - func (c *cgroupV2impl) getCgroupMemoryConfig(cgroupPath string) (*ResourceConfig, error) { return readCgroupMemoryConfig(cgroupPath, cgroupv2MemLimitFile) }