koord-descheduler: balance prod pods between nodes in LowNodeLoad (ko…

…ordinator-sh#2066)

Signed-off-by: zwForrest <[email protected]>

pkg/descheduler/apis/config/types_loadaware.go

@@ -37,6 +37,7 @@ type LowNodeLoadArgs struct {
 
 	// NumberOfNodes can be configured to activate the strategy only when the number of under utilized nodes are above the configured value.
 	// This could be helpful in large clusters where a few nodes could go under utilized frequently or for a short period of time.
+	// This parameter includes the sum of nodes with low node utilization, low prod utilization, and both.
 	// By default, NumberOfNodes is set to zero.
 	NumberOfNodes int32
 
@@ -65,12 +66,18 @@ type LowNodeLoadArgs struct {
 	// A resource consumption above (resp. below) this window is considered as overutilization (resp. underutilization).
 	UseDeviationThresholds bool
 
-	// HighThresholds defines the target usage threshold of resources
+	// HighThresholds defines the target usage threshold of node resources
 	HighThresholds ResourceThresholds
 
-	// LowThresholds defines the low usage threshold of resources
+	// LowThresholds defines the low usage threshold of node resources
 	LowThresholds ResourceThresholds
 
+	// ProdHighThresholds defines the target usage threshold of Prod resources
+	ProdHighThresholds ResourceThresholds
+
+	// ProdLowThresholds defines the low usage threshold of Prod resources
+	ProdLowThresholds ResourceThresholds
+
 	// ResourceWeights indicates the weights of resources.
 	// The weights of resources are both 1 by default.
 	ResourceWeights map[corev1.ResourceName]int64
@@ -97,12 +104,18 @@ type LowNodeLoadNodePool struct {
 	// A resource consumption above (resp. below) this window is considered as overutilization (resp. underutilization).
 	UseDeviationThresholds bool
 
-	// HighThresholds defines the target usage threshold of resources
+	// HighThresholds defines the target usage threshold of node resources
 	HighThresholds ResourceThresholds
 
-	// LowThresholds defines the low usage threshold of resources
+	// LowThresholds defines the low usage threshold of node resources
 	LowThresholds ResourceThresholds
 
+	// ProdHighThresholds defines the target usage threshold of Prod resources
+	ProdHighThresholds ResourceThresholds `json:"prodHighThresholds,omitempty"`
+
+	// ProdLowThresholds defines the low usage threshold of Prod resources
+	ProdLowThresholds ResourceThresholds `json:"prodLowThresholds,omitempty"`
+
 	// ResourceWeights indicates the weights of resources.
 	// The weights of resources are both 1 by default.
 	ResourceWeights map[corev1.ResourceName]int64

pkg/descheduler/apis/config/v1alpha2/conversion_plugins.go

@@ -33,6 +33,8 @@ func Convert_v1alpha2_LowNodeLoadArgs_To_config_LowNodeLoadArgs(in *LowNodeLoadA
 		UseDeviationThresholds: out.UseDeviationThresholds,
 		HighThresholds:         out.HighThresholds,
 		LowThresholds:          out.LowThresholds,
+		ProdHighThresholds:     out.ProdHighThresholds,
+		ProdLowThresholds:      out.ProdLowThresholds,
 		ResourceWeights:        out.ResourceWeights,
 		AnomalyCondition:       out.AnomalyCondition,
 	}

pkg/descheduler/apis/config/v1alpha2/types_loadaware.go

@@ -36,6 +36,7 @@ type LowNodeLoadArgs struct {
 
 	// NumberOfNodes can be configured to activate the strategy only when the number of under utilized nodes are above the configured value.
 	// This could be helpful in large clusters where a few nodes could go under utilized frequently or for a short period of time.
+	// This parameter includes the sum of nodes with low node utilization, low prod utilization, and both.
 	// By default, NumberOfNodes is set to zero.
 	NumberOfNodes *int32 `json:"numberOfNodes,omitempty"`
 
@@ -64,12 +65,18 @@ type LowNodeLoadArgs struct {
 	// A resource consumption above (resp. below) this window is considered as overutilization (resp. underutilization).
 	UseDeviationThresholds *bool `json:"useDeviationThresholds,omitempty"`
 
-	// HighThresholds defines the target usage threshold of resources
+	// HighThresholds defines the target usage threshold of node resources
 	HighThresholds ResourceThresholds `json:"highThresholds,omitempty"`
 
-	// LowThresholds defines the low usage threshold of resources
+	// LowThresholds defines the low usage threshold of node resources
 	LowThresholds ResourceThresholds `json:"lowThresholds,omitempty"`
 
+	// ProdHighThresholds defines the target usage threshold of Prod resources
+	ProdHighThresholds ResourceThresholds `json:"prodHighThresholds,omitempty"`
+
+	// ProdLowThresholds defines the low usage threshold of Prod resources
+	ProdLowThresholds ResourceThresholds `json:"prodLowThresholds,omitempty"`
+
 	// ResourceWeights indicates the weights of resources.
 	// The weights of CPU and Memory are both 1 by default.
 	ResourceWeights map[corev1.ResourceName]int64 `json:"resourceWeights,omitempty"`
@@ -96,12 +103,18 @@ type LowNodeLoadNodePool struct {
 	// A resource consumption above (resp. below) this window is considered as overutilization (resp. underutilization).
 	UseDeviationThresholds bool `json:"useDeviationThresholds,omitempty"`
 
-	// HighThresholds defines the target usage threshold of resources
+	// HighThresholds defines the target usage threshold of node resources
 	HighThresholds ResourceThresholds `json:"highThresholds,omitempty"`
 
-	// LowThresholds defines the low usage threshold of resources
+	// LowThresholds defines the low usage threshold of node resources
 	LowThresholds ResourceThresholds `json:"lowThresholds,omitempty"`
 
+	// ProdHighThresholds defines the target usage threshold of Prod resources
+	ProdHighThresholds ResourceThresholds `json:"prodHighThresholds,omitempty"`
+
+	// ProdLowThresholds defines the low usage threshold of Prod resources
+	ProdLowThresholds ResourceThresholds `json:"prodLowThresholds,omitempty"`
+
 	// ResourceWeights indicates the weights of resources.
 	// The weights of resources are both 1 by default.
 	ResourceWeights map[corev1.ResourceName]int64 `json:"resourceWeights,omitempty"`

pkg/descheduler/apis/config/validation/validation_loadaware.go

@@ -68,6 +68,23 @@ func ValidateLowLoadUtilizationArgs(path *field.Path, args *deschedulerconfig.Lo
 			}
 		}
 
+		for resourceName, percentage := range nodePool.ProdHighThresholds {
+			if percentage < 0 {
+				allErrs = append(allErrs, field.Invalid(nodePoolPath.Child("ProdHighThresholds").Key(string(resourceName)), percentage, "percentage must be greater than or equal to 0"))
+			}
+			if nodeHighPercentage, ok := nodePool.HighThresholds[resourceName]; ok && percentage > nodeHighPercentage {
+				allErrs = append(allErrs, field.Invalid(nodePoolPath.Child("ProdHighThresholds").Key(string(resourceName)), percentage, "node percentage must be greater than or equal to prodHighThresholds"))
+			}
+		}
+		for resourceName, percentage := range nodePool.ProdLowThresholds {
+			if percentage < 0 {
+				allErrs = append(allErrs, field.Invalid(nodePoolPath.Child("ProdLowThresholds").Key(string(resourceName)), percentage, "percentage must be greater than or equal to 0"))
+			}
+			if highProdPercentage, ok := nodePool.ProdHighThresholds[resourceName]; ok && percentage > highProdPercentage {
+				allErrs = append(allErrs, field.Invalid(nodePoolPath.Child("ProdLowThresholds").Key(string(resourceName)), percentage, "low percentage must be less than or equal to prodHighThresholds"))
+			}
+		}
+
 		if nodePool.AnomalyCondition.ConsecutiveAbnormalities <= 0 {
 			fieldPath := nodePoolPath.Child("anomalyDetectionThresholds").Child("consecutiveAbnormalities")
 			allErrs = append(allErrs, field.Invalid(fieldPath, nodePool.AnomalyCondition.ConsecutiveAbnormalities, "consecutiveAbnormalities must be greater than 0"))