From 0ea6b4469364397ad5ce4eef9f480a7826eb0f02 Mon Sep 17 00:00:00 2001 From: PeterSzegedi Date: Tue, 21 Nov 2023 16:37:44 +0000 Subject: [PATCH 1/3] Make percentages human-readable --- pkg/framework/plugins/nodeutilization/nodeutilization.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/framework/plugins/nodeutilization/nodeutilization.go b/pkg/framework/plugins/nodeutilization/nodeutilization.go index d1fe8daf62..a1a56e2ed9 100644 --- a/pkg/framework/plugins/nodeutilization/nodeutilization.go +++ b/pkg/framework/plugins/nodeutilization/nodeutilization.go @@ -18,6 +18,7 @@ package nodeutilization import ( "context" + "math" "sort" "sigs.k8s.io/descheduler/pkg/api" @@ -163,6 +164,10 @@ func resourceThreshold(nodeCapacity v1.ResourceList, resourceName v1.ResourceNam return resource.NewQuantity(resourceCapacityFraction(resourceCapacityQuantity.Value()), defaultFormat) } +func roundTo2Digits(percentage float64) float64 { + return math.Round(percentage*100) / 100 +} + func resourceUsagePercentages(nodeUsage NodeUsage) map[v1.ResourceName]float64 { nodeCapacity := nodeUsage.node.Status.Capacity if len(nodeUsage.node.Status.Allocatable) > 0 { @@ -174,6 +179,7 @@ func resourceUsagePercentages(nodeUsage NodeUsage) map[v1.ResourceName]float64 { cap := nodeCapacity[resourceName] if !cap.IsZero() { resourceUsagePercentage[resourceName] = 100 * float64(resourceUsage.MilliValue()) / float64(cap.MilliValue()) + resourceUsagePercentage[resourceName] = roundTo2Digits(resourceUsagePercentage[resourceName]) } } From bd0cbd5dfb6f04f7967f28acabeb8ae613a92132 Mon Sep 17 00:00:00 2001 From: PeterSzegedi Date: Tue, 21 Nov 2023 16:48:44 +0000 Subject: [PATCH 2/3] Rename the rounding function --- pkg/framework/plugins/nodeutilization/nodeutilization.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/framework/plugins/nodeutilization/nodeutilization.go b/pkg/framework/plugins/nodeutilization/nodeutilization.go index a1a56e2ed9..911bc2f23f 100644 --- a/pkg/framework/plugins/nodeutilization/nodeutilization.go +++ b/pkg/framework/plugins/nodeutilization/nodeutilization.go @@ -164,7 +164,7 @@ func resourceThreshold(nodeCapacity v1.ResourceList, resourceName v1.ResourceNam return resource.NewQuantity(resourceCapacityFraction(resourceCapacityQuantity.Value()), defaultFormat) } -func roundTo2Digits(percentage float64) float64 { +func roundTo2Decimals(percentage float64) float64 { return math.Round(percentage*100) / 100 } @@ -179,7 +179,7 @@ func resourceUsagePercentages(nodeUsage NodeUsage) map[v1.ResourceName]float64 { cap := nodeCapacity[resourceName] if !cap.IsZero() { resourceUsagePercentage[resourceName] = 100 * float64(resourceUsage.MilliValue()) / float64(cap.MilliValue()) - resourceUsagePercentage[resourceName] = roundTo2Digits(resourceUsagePercentage[resourceName]) + resourceUsagePercentage[resourceName] = roundTo2Decimals(resourceUsagePercentage[resourceName]) } } From f220589e3e14f2758e6885d6cfce4965ec1c2ead Mon Sep 17 00:00:00 2001 From: PeterSzegedi Date: Tue, 21 Nov 2023 17:07:14 +0000 Subject: [PATCH 3/3] bump easycla