From 80f9c0ada6b7c78f98b5bd29073bde97283740a3 Mon Sep 17 00:00:00 2001
From: Jan Chaloupka <jchaloup@redhat.com>
Date: Mon, 21 Oct 2024 22:38:25 +0200
Subject: [PATCH] Separate usage client into a new file

---
 .../nodeutilization/nodeutilization.go        | 56 -------------
 .../plugins/nodeutilization/usageclients.go   | 84 +++++++++++++++++++
 2 files changed, 84 insertions(+), 56 deletions(-)
 create mode 100644 pkg/framework/plugins/nodeutilization/usageclients.go

diff --git a/pkg/framework/plugins/nodeutilization/nodeutilization.go b/pkg/framework/plugins/nodeutilization/nodeutilization.go
index b3e3c8c82..2756da408 100644
--- a/pkg/framework/plugins/nodeutilization/nodeutilization.go
+++ b/pkg/framework/plugins/nodeutilization/nodeutilization.go
@@ -74,63 +74,7 @@ func normalizePercentage(percent api.Percentage) api.Percentage {
 	return percent
 }
 
-type requestedUsageClient struct {
-	resourceNames         []v1.ResourceName
-	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc
 
-	_nodes           []*v1.Node
-	_pods            map[string][]*v1.Pod
-	_nodeUtilization map[string]map[v1.ResourceName]*resource.Quantity
-}
-
-func newRequestedUsageSnapshot(
-	resourceNames []v1.ResourceName,
-	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
-) *requestedUsageClient {
-	return &requestedUsageClient{
-		resourceNames:         resourceNames,
-		getPodsAssignedToNode: getPodsAssignedToNode,
-	}
-}
-
-func (s *requestedUsageClient) nodeUtilization(node string) map[v1.ResourceName]*resource.Quantity {
-	return s._nodeUtilization[node]
-}
-
-func (s *requestedUsageClient) nodes() []*v1.Node {
-	return s._nodes
-}
-
-func (s *requestedUsageClient) pods(node string) []*v1.Pod {
-	return s._pods[node]
-}
-
-func (s *requestedUsageClient) capture(nodes []*v1.Node) error {
-	s._nodeUtilization = make(map[string]map[v1.ResourceName]*resource.Quantity)
-	s._pods = make(map[string][]*v1.Pod)
-
-	for _, node := range nodes {
-		pods, err := podutil.ListPodsOnANode(node.Name, s.getPodsAssignedToNode, nil)
-		if err != nil {
-			klog.V(2).InfoS("Node will not be processed, error accessing its pods", "node", klog.KObj(node), "err", err)
-			continue
-		}
-
-		nodeUsage, err := nodeutil.NodeUtilization(pods, s.resourceNames, func(pod *v1.Pod) (v1.ResourceList, error) {
-			req, _ := utils.PodRequestsAndLimits(pod)
-			return req, nil
-		})
-		if err != nil {
-			return err
-		}
-
-		// store the snapshot of pods from the same (or the closest) node utilization computation
-		s._pods[node.Name] = pods
-		s._nodeUtilization[node.Name] = nodeUsage
-	}
-
-	return nil
-}
 
 func getNodeThresholds(
 	nodes []*v1.Node,
diff --git a/pkg/framework/plugins/nodeutilization/usageclients.go b/pkg/framework/plugins/nodeutilization/usageclients.go
new file mode 100644
index 000000000..c6bedcfce
--- /dev/null
+++ b/pkg/framework/plugins/nodeutilization/usageclients.go
@@ -0,0 +1,84 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package nodeutilization
+
+import (
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/klog/v2"
+	nodeutil "sigs.k8s.io/descheduler/pkg/descheduler/node"
+	podutil "sigs.k8s.io/descheduler/pkg/descheduler/pod"
+	"sigs.k8s.io/descheduler/pkg/utils"
+)
+
+type requestedUsageClient struct {
+	resourceNames         []v1.ResourceName
+	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc
+
+	_nodes           []*v1.Node
+	_pods            map[string][]*v1.Pod
+	_nodeUtilization map[string]map[v1.ResourceName]*resource.Quantity
+}
+
+func newRequestedUsageSnapshot(
+	resourceNames []v1.ResourceName,
+	getPodsAssignedToNode podutil.GetPodsAssignedToNodeFunc,
+) *requestedUsageClient {
+	return &requestedUsageClient{
+		resourceNames:         resourceNames,
+		getPodsAssignedToNode: getPodsAssignedToNode,
+	}
+}
+
+func (s *requestedUsageClient) nodeUtilization(node string) map[v1.ResourceName]*resource.Quantity {
+	return s._nodeUtilization[node]
+}
+
+func (s *requestedUsageClient) nodes() []*v1.Node {
+	return s._nodes
+}
+
+func (s *requestedUsageClient) pods(node string) []*v1.Pod {
+	return s._pods[node]
+}
+
+func (s *requestedUsageClient) capture(nodes []*v1.Node) error {
+	s._nodeUtilization = make(map[string]map[v1.ResourceName]*resource.Quantity)
+	s._pods = make(map[string][]*v1.Pod)
+
+	for _, node := range nodes {
+		pods, err := podutil.ListPodsOnANode(node.Name, s.getPodsAssignedToNode, nil)
+		if err != nil {
+			klog.V(2).InfoS("Node will not be processed, error accessing its pods", "node", klog.KObj(node), "err", err)
+			continue
+		}
+
+		nodeUsage, err := nodeutil.NodeUtilization(pods, s.resourceNames, func(pod *v1.Pod) (v1.ResourceList, error) {
+			req, _ := utils.PodRequestsAndLimits(pod)
+			return req, nil
+		})
+		if err != nil {
+			return err
+		}
+
+		// store the snapshot of pods from the same (or the closest) node utilization computation
+		s._pods[node.Name] = pods
+		s._nodeUtilization[node.Name] = nodeUsage
+	}
+
+	return nil
+}