Refactor: remove no longer needed resourceName parameter

iholder101 · iholder101 · commit c792c30b6ad0 · 2024-10-30T13:58:38.000+02:00
Signed-off-by: Itamar Holder &lt;iholder@redhat.com&gt;
diff --git a/pkg/kubelet/cm/cgroup_manager_linux.go b/pkg/kubelet/cm/cgroup_manager_linux.go
@@ -33,7 +33,6 @@ import (
 	"k8s.io/klog/v2"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 
-	v1 "k8s.io/api/core/v1"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/kubernetes/pkg/kubelet/metrics"
@@ -255,7 +254,7 @@ func (m *cgroupCommon) Destroy(cgroupConfig *CgroupConfig) error {
 	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{
 		Name:               name,
 		ResourceParameters: resourceConfig,
diff --git a/pkg/kubelet/cm/cgroup_manager_unsupported.go b/pkg/kubelet/cm/cgroup_manager_unsupported.go
@@ -89,7 +89,7 @@ func (m *unsupportedCgroupManager) GetCgroupConfig(name CgroupName, resource v1.
 	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
 }
 
diff --git a/pkg/kubelet/cm/container_manager_stub.go b/pkg/kubelet/cm/container_manager_stub.go
@@ -103,7 +103,7 @@ func (m *podContainerManagerStub) GetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceNam
 	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")
 }
 
diff --git a/pkg/kubelet/cm/fake_pod_container_manager.go b/pkg/kubelet/cm/fake_pod_container_manager.go
@@ -119,7 +119,7 @@ func (cm *FakePodContainerManager) GetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceNa
 	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()
 	defer cm.Unlock()
 	cm.CalledFunctions = append(cm.CalledFunctions, "SetPodCgroupConfig")
diff --git a/pkg/kubelet/cm/pod_container_manager_linux.go b/pkg/kubelet/cm/pod_container_manager_linux.go
@@ -134,9 +134,9 @@ func (m *podContainerManagerImpl) GetPodCgroupConfig(pod *v1.Pod, resource v1.Re
 	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)
-	return m.cgroupManager.SetCgroupConfig(podCgroupName, resource, resourceConfig)
+	return m.cgroupManager.SetCgroupConfig(podCgroupName, resourceConfig)
 }
 
 // Kill one process ID
@@ -350,6 +350,6 @@ func (m *podContainerManagerNoop) GetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceNam
 	return nil, nil
 }
 
-func (m *podContainerManagerNoop) SetPodCgroupConfig(_ *v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error {
+func (m *podContainerManagerNoop) SetPodCgroupConfig(_ *v1.Pod, _ *ResourceConfig) error {
 	return nil
 }
diff --git a/pkg/kubelet/cm/types.go b/pkg/kubelet/cm/types.go
@@ -90,7 +90,7 @@ type CgroupManager interface {
 	// Get the resource config values applied to the cgroup for specified resource type
 	GetCgroupConfig(name CgroupName, resource v1.ResourceName) (*ResourceConfig, error)
 	// 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() int
 }
@@ -136,5 +136,5 @@ type PodContainerManager interface {
 	GetPodCgroupConfig(pod *v1.Pod, resource v1.ResourceName) (*ResourceConfig, error)
 
 	// 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
 }
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -669,9 +669,9 @@ func (m *kubeGenericRuntimeManager) doPodResizeAction(pod *v1.Pod, podStatus *ku
 			} else {
 				podCpuResources.CPUShares = podResources.CPUShares
 			}
-			err = pcm.SetPodCgroupConfig(pod, rName, podCpuResources)
+			err = pcm.SetPodCgroupConfig(pod, podCpuResources)
 		case v1.ResourceMemory:
-			err = pcm.SetPodCgroupConfig(pod, rName, podResources)
+			err = pcm.SetPodCgroupConfig(pod, podResources)
 		}
 		if err != nil {
 			klog.ErrorS(err, "Failed to set cgroup config", "resource", rName, "pod", pod.Name)

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ func (m *unsupportedCgroupManager) GetCgroupConfig(name CgroupName, resource v1.`
`89`	`89`	`return nil, errNotSupported`
`90`	`90`	`}`
`91`	`91`
`92`		`-func (m unsupportedCgroupManager) SetCgroupConfig(name CgroupName, resource v1.ResourceName, resourceConfig ResourceConfig) error {`
	`92`	`+func (m unsupportedCgroupManager) SetCgroupConfig(name CgroupName, resourceConfig ResourceConfig) error {`
`93`	`93`	`return errNotSupported`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (m podContainerManagerStub) GetPodCgroupConfig(_ v1.Pod, _ v1.ResourceNam`
`103`	`103`	`return nil, fmt.Errorf("not implemented")`
`104`	`104`	`}`
`105`	`105`
`106`		`-func (m podContainerManagerStub) SetPodCgroupConfig(_ v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error {`
	`106`	`+func (m podContainerManagerStub) SetPodCgroupConfig(pod v1.Pod, resourceConfig *ResourceConfig) error {`
`107`	`107`	`return fmt.Errorf("not implemented")`
`108`	`108`	`}`
`109`	`109`
Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ func (cm FakePodContainerManager) GetPodCgroupConfig(_ v1.Pod, _ v1.ResourceNa`
`119`	`119`	`return nil, nil`
`120`	`120`	`}`
`121`	`121`
`122`		`-func (cm FakePodContainerManager) SetPodCgroupConfig(_ v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error {`
	`122`	`+func (cm FakePodContainerManager) SetPodCgroupConfig(pod v1.Pod, resourceConfig *ResourceConfig) error {`
`123`	`123`	`cm.Lock()`
`124`	`124`	`defer cm.Unlock()`
`125`	`125`	`cm.CalledFunctions = append(cm.CalledFunctions, "SetPodCgroupConfig")`
Original file line number	Diff line number	Diff line change
`@@ -134,9 +134,9 @@ func (m podContainerManagerImpl) GetPodCgroupConfig(pod v1.Pod, resource v1.Re`
`134`	`134`	`return m.cgroupManager.GetCgroupConfig(podCgroupName, resource)`
`135`	`135`	`}`
`136`	`136`
`137`		`-func (m podContainerManagerImpl) SetPodCgroupConfig(pod v1.Pod, resource v1.ResourceName, resourceConfig *ResourceConfig) error {`
	`137`	`+func (m podContainerManagerImpl) SetPodCgroupConfig(pod v1.Pod, resourceConfig *ResourceConfig) error {`
`138`	`138`	`podCgroupName, _ := m.GetPodContainerName(pod)`
`139`		`- return m.cgroupManager.SetCgroupConfig(podCgroupName, resource, resourceConfig)`
	`139`	`+ return m.cgroupManager.SetCgroupConfig(podCgroupName, resourceConfig)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// Kill one process ID`
`@@ -350,6 +350,6 @@ func (m podContainerManagerNoop) GetPodCgroupConfig(_ v1.Pod, _ v1.ResourceNam`
`350`	`350`	`return nil, nil`
`351`	`351`	`}`
`352`	`352`
`353`		`-func (m podContainerManagerNoop) SetPodCgroupConfig(_ v1.Pod, _ v1.ResourceName, _ *ResourceConfig) error {`
	`353`	`+func (m podContainerManagerNoop) SetPodCgroupConfig(_ v1.Pod, _ *ResourceConfig) error {`
`354`	`354`	`return nil`
`355`	`355`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ type CgroupManager interface {`
`90`	`90`	`// Get the resource config values applied to the cgroup for specified resource type`
`91`	`91`	`GetCgroupConfig(name CgroupName, resource v1.ResourceName) (*ResourceConfig, error)`
`92`	`92`	`// Set resource config for the specified resource type on the cgroup`
`93`		`- SetCgroupConfig(name CgroupName, resource v1.ResourceName, resourceConfig *ResourceConfig) error`
	`93`	`+ SetCgroupConfig(name CgroupName, resourceConfig *ResourceConfig) error`
`94`	`94`	`// Version of the cgroup implementation on the host`
`95`	`95`	`Version() int`
`96`	`96`	`}`
`@@ -136,5 +136,5 @@ type PodContainerManager interface {`
`136`	`136`	`GetPodCgroupConfig(pod v1.Pod, resource v1.ResourceName) (ResourceConfig, error)`
`137`	`137`
`138`	`138`	`// Set resource config values for the specified resource type on the pod cgroup`
`139`		`- SetPodCgroupConfig(pod v1.Pod, resource v1.ResourceName, resourceConfig ResourceConfig) error`
	`139`	`+ SetPodCgroupConfig(pod v1.Pod, resourceConfig ResourceConfig) error`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -669,9 +669,9 @@ func (m kubeGenericRuntimeManager) doPodResizeAction(pod v1.Pod, podStatus *ku`
`669`	`669`	`} else {`
`670`	`670`	`podCpuResources.CPUShares = podResources.CPUShares`
`671`	`671`	`}`
`672`		`- err = pcm.SetPodCgroupConfig(pod, rName, podCpuResources)`
	`672`	`+ err = pcm.SetPodCgroupConfig(pod, podCpuResources)`
`673`	`673`	`case v1.ResourceMemory:`
`674`		`- err = pcm.SetPodCgroupConfig(pod, rName, podResources)`
	`674`	`+ err = pcm.SetPodCgroupConfig(pod, podResources)`
`675`	`675`	`}`
`676`	`676`	`if err != nil {`
`677`	`677`	`klog.ErrorS(err, "Failed to set cgroup config", "resource", rName, "pod", pod.Name)`