Add score plugin for NodeResourcesFit

kubernetes · Jun 29, 2021 · deb14b9 · deb14b9
1 parent 06dfe68
commit deb14b9
Show file tree

Hide file tree

Showing 32 changed files with 1,107 additions and 537 deletions.
diff --git a/cmd/kube-scheduler/app/options/options_test.go b/cmd/kube-scheduler/app/options/options_test.go
@@ -407,7 +407,7 @@ profiles:
 					{
 						SchedulerName: "default-scheduler",
 						Plugins:       defaults.PluginsV1beta2,
-						PluginConfig:  defaults.PluginConfigs,
+						PluginConfig:  defaults.PluginConfigsV1beta2,
 					},
 				},
 			},
@@ -480,7 +480,7 @@ profiles:
 					{
 						SchedulerName: "default-scheduler",
 						Plugins:       defaults.PluginsV1beta1,
-						PluginConfig:  defaults.PluginConfigs,
+						PluginConfig:  defaults.PluginConfigsV1beta1,
 					},
 				},
 			},
@@ -584,7 +584,7 @@ profiles:
 					{
 						SchedulerName: "default-scheduler",
 						Plugins:       defaults.PluginsV1beta2,
-						PluginConfig:  defaults.PluginConfigs,
+						PluginConfig:  defaults.PluginConfigsV1beta2,
 					},
 				},
 			},
@@ -656,7 +656,7 @@ profiles:
 					{
 						SchedulerName: "default-scheduler",
 						Plugins:       defaults.PluginsV1beta2,
-						PluginConfig:  defaults.PluginConfigs,
+						PluginConfig:  defaults.PluginConfigsV1beta2,
 					},
 				},
 			},
@@ -748,12 +748,11 @@ profiles:
 							},
 							{
 								Name: "NodeResourcesFit",
-								Args: &kubeschedulerconfig.NodeResourcesFitArgs{},
-							},
-							{
-								Name: "NodeResourcesLeastAllocated",
-								Args: &kubeschedulerconfig.NodeResourcesLeastAllocatedArgs{
-									Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
+								Args: &kubeschedulerconfig.NodeResourcesFitArgs{
+									ScoringStrategy: &kubeschedulerconfig.ScoringStrategy{
+										Type:      kubeschedulerconfig.LeastAllocated,
+										Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
+									},
 								},
 							},
 							{
@@ -866,7 +865,12 @@ profiles:
 							},
 							{
 								Name: "NodeResourcesFit",
-								Args: &kubeschedulerconfig.NodeResourcesFitArgs{},
+								Args: &kubeschedulerconfig.NodeResourcesFitArgs{
+									ScoringStrategy: &kubeschedulerconfig.ScoringStrategy{
+										Type:      kubeschedulerconfig.LeastAllocated,
+										Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
+									},
+								},
 							},
 							{
 								Name: "NodeResourcesLeastAllocated",
@@ -946,7 +950,7 @@ profiles:
 								},
 							},
 						},
-						PluginConfig: defaults.PluginConfigs,
+						PluginConfig: defaults.PluginConfigsV1beta2,
 					},
 					{
 						SchedulerName: "bar-profile",
@@ -983,12 +987,11 @@ profiles:
 							},
 							{
 								Name: "NodeResourcesFit",
-								Args: &kubeschedulerconfig.NodeResourcesFitArgs{},
-							},
-							{
-								Name: "NodeResourcesLeastAllocated",
-								Args: &kubeschedulerconfig.NodeResourcesLeastAllocatedArgs{
-									Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
+								Args: &kubeschedulerconfig.NodeResourcesFitArgs{
+									ScoringStrategy: &kubeschedulerconfig.ScoringStrategy{
+										Type:      kubeschedulerconfig.LeastAllocated,
+										Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
+									},
 								},
 							},
 							{
@@ -1063,7 +1066,7 @@ profiles:
 								},
 							},
 						},
-						PluginConfig: defaults.PluginConfigs,
+						PluginConfig: defaults.PluginConfigsV1beta1,
 					},
 					{
 						SchedulerName: "bar-profile",
@@ -1100,7 +1103,12 @@ profiles:
 							},
 							{
 								Name: "NodeResourcesFit",
-								Args: &kubeschedulerconfig.NodeResourcesFitArgs{},
+								Args: &kubeschedulerconfig.NodeResourcesFitArgs{
+									ScoringStrategy: &kubeschedulerconfig.ScoringStrategy{
+										Type:      kubeschedulerconfig.LeastAllocated,
+										Resources: []kubeschedulerconfig.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
+									},
+								},
 							},
 							{
 								Name: "NodeResourcesLeastAllocated",