github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-11 04:52:08 +00:00
Code Issues Projects Releases Wiki Activity

Refactor: remove no longer needed resourceName parameter

Browse Source 
Signed-off-by: Itamar Holder <iholder@redhat.com>
This commit is contained in:
Itamar Holder 2024-09-01 15:14:17 +03:00
parent 7207ce20f0
commit c792c30b6a
7 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/cm/cgroup_manager_linux.go
View File

@ -33,7 +33,6 @@ import (
"k8s.io/klog/v2" "k8s.io/klog/v2"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
v1 "k8s.io/api/core/v1"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/pkg/kubelet/metrics"
@ -255,7 +254,7 @@ func (m *cgroupCommon) Destroy(cgroupConfig *CgroupConfig) error {
return nil return nil
} }
func (m *cgroupCommon) SetCgroupConfig(name CgroupName, resource v1.ResourceName, resourceConfig *ResourceConfig) error { func (m *cgroupCommon) SetCgroupConfig(name CgroupName, resourceConfig *ResourceConfig) error {
containerConfig := &CgroupConfig{ containerConfig := &CgroupConfig{
Name: name, Name: name,
ResourceParameters: resourceConfig, ResourceParameters: resourceConfig,

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

@ -89,7 +89,7 @@ func (m *unsupportedCgroupManager) GetCgroupConfig(name CgroupName, resource v1.
return nil, errNotSupported return nil, errNotSupported
} }
func (m *unsupportedCgroupManager) SetCgroupConfig(name CgroupName, resource v1.ResourceName, resourceConfig *ResourceConfig) error { func (m *unsupportedCgroupManager) SetCgroupConfig(name CgroupName, resourceConfig *ResourceConfig) error {
return errNotSupported return errNotSupported
} }

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

@ -103,7 +103,7 @@ func (m *podContainerManagerStub) GetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceNam
return nil, fmt.Errorf("not implemented") return nil, fmt.Errorf("not implemented")
} }
func (m *podContainerManagerStub) SetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error { func (m *podContainerManagerStub) SetPodCgroupConfig(pod *v1.Pod, resourceConfig *ResourceConfig) error {
return fmt.Errorf("not implemented") return fmt.Errorf("not implemented")
} }

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

@ -119,7 +119,7 @@ func (cm *FakePodContainerManager) GetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceNa
return nil, nil return nil, nil
} }
func (cm *FakePodContainerManager) SetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error { func (cm *FakePodContainerManager) SetPodCgroupConfig(pod *v1.Pod, resourceConfig *ResourceConfig) error {
cm.Lock() cm.Lock()
defer cm.Unlock() defer cm.Unlock()
cm.CalledFunctions = append(cm.CalledFunctions, "SetPodCgroupConfig") cm.CalledFunctions = append(cm.CalledFunctions, "SetPodCgroupConfig")

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

@ -134,9 +134,9 @@ func (m *podContainerManagerImpl) GetPodCgroupConfig(pod *v1.Pod, resource v1.Re
return m.cgroupManager.GetCgroupConfig(podCgroupName, resource) return m.cgroupManager.GetCgroupConfig(podCgroupName, resource)
} }
func (m *podContainerManagerImpl) SetPodCgroupConfig(pod *v1.Pod, resource v1.ResourceName, resourceConfig *ResourceConfig) error { func (m *podContainerManagerImpl) SetPodCgroupConfig(pod *v1.Pod, resourceConfig *ResourceConfig) error {
podCgroupName, _ := m.GetPodContainerName(pod) podCgroupName, _ := m.GetPodContainerName(pod)
return m.cgroupManager.SetCgroupConfig(podCgroupName, resource, resourceConfig) return m.cgroupManager.SetCgroupConfig(podCgroupName, resourceConfig)
} }
// Kill one process ID // Kill one process ID
@ -350,6 +350,6 @@ func (m *podContainerManagerNoop) GetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceNam
return nil, nil return nil, nil
} }
func (m *podContainerManagerNoop) SetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error { func (m *podContainerManagerNoop) SetPodCgroupConfig(_ *v1.Pod, _ *ResourceConfig) error {
return nil return nil
} }

4
pkg/kubelet/cm/types.go
View File

@ -90,7 +90,7 @@ type CgroupManager interface {
// Get the resource config values applied to the cgroup for specified resource type // Get the resource config values applied to the cgroup for specified resource type
GetCgroupConfig(name CgroupName, resource v1.ResourceName) (*ResourceConfig, error) GetCgroupConfig(name CgroupName, resource v1.ResourceName) (*ResourceConfig, error)
// Set resource config for the specified resource type on the cgroup // Set resource config for the specified resource type on the cgroup
SetCgroupConfig(name CgroupName, resource v1.ResourceName, resourceConfig *ResourceConfig) error SetCgroupConfig(name CgroupName, resourceConfig *ResourceConfig) error
// Version of the cgroup implementation on the host // Version of the cgroup implementation on the host
Version() int Version() int
} }
@ -136,5 +136,5 @@ type PodContainerManager interface {
GetPodCgroupConfig(pod *v1.Pod, resource v1.ResourceName) (*ResourceConfig, error) GetPodCgroupConfig(pod *v1.Pod, resource v1.ResourceName) (*ResourceConfig, error)
// Set resource config values for the specified resource type on the pod cgroup // Set resource config values for the specified resource type on the pod cgroup
SetPodCgroupConfig(pod *v1.Pod, resource v1.ResourceName, resourceConfig *ResourceConfig) error SetPodCgroupConfig(pod *v1.Pod, resourceConfig *ResourceConfig) error
} }

4
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View File

@ -669,9 +669,9 @@ func (m *kubeGenericRuntimeManager) doPodResizeAction(pod *v1.Pod, podStatus *ku
} else { } else {
podCpuResources.CPUShares = podResources.CPUShares podCpuResources.CPUShares = podResources.CPUShares
} }
err = pcm.SetPodCgroupConfig(pod, rName, podCpuResources) err = pcm.SetPodCgroupConfig(pod, podCpuResources)
case v1.ResourceMemory: case v1.ResourceMemory:
err = pcm.SetPodCgroupConfig(pod, rName, podResources) err = pcm.SetPodCgroupConfig(pod, podResources)
} }
if err != nil { if err != nil {
klog.ErrorS(err, "Failed to set cgroup config", "resource", rName, "pod", pod.Name) klog.ErrorS(err, "Failed to set cgroup config", "resource", rName, "pod", pod.Name)