Merge pull request kubernetes-sigs#240 from ingvagabund/turn-strategy…

…-params-NodeResourceUtilizationThresholds-field-into-pointer Turn StrategyParameters.NodeResourceUtilizationThresholds field into a pointer
briend · Apr 28, 2020 · ca2bdcf · ca2bdcf
2 parents 1e9a160 + d8ab180
commit ca2bdcf
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 14 deletions.
diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -46,7 +46,7 @@ type DeschedulerStrategy struct {
 
 // Only one of its members may be specified
 type StrategyParameters struct {
-	NodeResourceUtilizationThresholds NodeResourceUtilizationThresholds
+	NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds
 	NodeAffinityType                  []string
 	PodsHavingTooManyRestarts         PodsHavingTooManyRestarts
 }

diff --git a/pkg/api/v1alpha1/types.go b/pkg/api/v1alpha1/types.go
@@ -46,9 +46,9 @@ type DeschedulerStrategy struct {
 
 // Only one of its members may be specified
 type StrategyParameters struct {
-	NodeResourceUtilizationThresholds NodeResourceUtilizationThresholds `json:"nodeResourceUtilizationThresholds,omitempty"`
-	NodeAffinityType                  []string                          `json:"nodeAffinityType,omitempty"`
-	PodsHavingTooManyRestarts         PodsHavingTooManyRestarts         `json:"podsHavingTooManyRestarts,omitempty"`
+	NodeResourceUtilizationThresholds *NodeResourceUtilizationThresholds `json:"nodeResourceUtilizationThresholds,omitempty"`
+	NodeAffinityType                  []string                           `json:"nodeAffinityType,omitempty"`
+	PodsHavingTooManyRestarts         PodsHavingTooManyRestarts          `json:"podsHavingTooManyRestarts,omitempty"`
 }
 
 type Percentage float64

diff --git a/pkg/api/v1alpha1/zz_generated.conversion.go b/pkg/api/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/api/v1alpha1/zz_generated.deepcopy.go b/pkg/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/api/zz_generated.deepcopy.go b/pkg/api/zz_generated.deepcopy.go
diff --git a/pkg/descheduler/strategies/lownodeutilization.go b/pkg/descheduler/strategies/lownodeutilization.go
@@ -46,6 +46,10 @@ func LowNodeUtilization(ds *options.DeschedulerServer, strategy api.DeschedulerS
 	}
 	// todo: move to config validation?
 	// TODO: May be create a struct for the strategy as well, so that we don't have to pass along the all the params?
+	if strategy.Params.NodeResourceUtilizationThresholds == nil {
+		klog.V(1).Infof("NodeResourceUtilizationThresholds not set")
+		return
+	}
 
 	thresholds := strategy.Params.NodeResourceUtilizationThresholds.Thresholds
 	if !validateThresholds(thresholds) {

diff --git a/pkg/descheduler/strategies/lownodeutilization_test.go b/pkg/descheduler/strategies/lownodeutilization_test.go
@@ -509,7 +509,7 @@ func TestWithTaints(t *testing.T) {
 	strategy := api.DeschedulerStrategy{
 		Enabled: true,
 		Params: api.StrategyParameters{
-			NodeResourceUtilizationThresholds: api.NodeResourceUtilizationThresholds{
+			NodeResourceUtilizationThresholds: &api.NodeResourceUtilizationThresholds{
 				Thresholds: api.ResourceThresholds{
 					v1.ResourcePods: 20,
 				},

diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go
@@ -118,7 +118,7 @@ func startEndToEndForLowNodeUtilization(clientset clientset.Interface, nodeInfor
 	lowNodeUtilizationStrategy := deschedulerapi.DeschedulerStrategy{
 		Enabled: true,
 		Params: deschedulerapi.StrategyParameters{
-			NodeResourceUtilizationThresholds: deschedulerapi.NodeResourceUtilizationThresholds{
+			NodeResourceUtilizationThresholds: &deschedulerapi.NodeResourceUtilizationThresholds{
 				Thresholds:       thresholds,
 				TargetThresholds: targetThresholds,
 			},