github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 02:41:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #91102 from chendave/capacity_ratio

Browse Source 
Move `RequestedToCapacityRatio` Args defaults to versioned packages
This commit is contained in:
Kubernetes Prow Robot 2020-05-19 20:35:20 -07:00 committed by GitHub
commit 4310732c55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/scheduler/apis/config/scheme/scheme_test.go
View File

@ -98,7 +98,8 @@ profiles:
{
Name: "RequestedToCapacityRatio",
Args: &config.RequestedToCapacityRatioArgs{
Shape: []config.UtilizationShapePoint{{Utilization: 1}},
Shape: []config.UtilizationShapePoint{{Utilization: 1}},
Resources: []config.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
},
},
{

7
pkg/scheduler/apis/config/v1alpha2/defaults.go
View File

@ -185,3 +185,10 @@ func SetDefaults_NodeResourcesMostAllocatedArgs(obj *v1alpha2.NodeResourcesMostA
obj.Resources = append(obj.Resources, defaultResourceSpec...)
}
}
func SetDefaults_RequestedToCapacityRatioArgs(obj *v1alpha2.RequestedToCapacityRatioArgs) {
if len(obj.Resources) == 0 {
// If no resources specified, used the default set.
obj.Resources = append(obj.Resources, defaultResourceSpec...)
}
}

23
pkg/scheduler/apis/config/v1alpha2/defaults_test.go
View File

@ -345,6 +345,29 @@ func TestPluginArgsDefaults(t *testing.T) {
},
},
},
{
name: "NodeResourcesMostAllocatedArgs resources empty",
in: &v1alpha2.NodeResourcesMostAllocatedArgs{},
want: &v1alpha2.NodeResourcesMostAllocatedArgs{
Resources: []v1alpha2.ResourceSpec{
{Name: "cpu", Weight: 1},
{Name: "memory", Weight: 1},
},
},
},
{
name: "NodeResourcesMostAllocatedArgs resources with value",
in: &v1alpha2.NodeResourcesMostAllocatedArgs{
Resources: []v1alpha2.ResourceSpec{
{Name: "resource", Weight: 2},
},
},
want: &v1alpha2.NodeResourcesMostAllocatedArgs{
Resources: []v1alpha2.ResourceSpec{
{Name: "resource", Weight: 2},
},
},
},
}
for _, tc := range tests {
scheme := runtime.NewScheme()

7
pkg/scheduler/apis/config/v1alpha2/zz_generated.defaults.go generated
View File

@ -39,6 +39,9 @@ func RegisterDefaults(scheme *runtime.Scheme) error {
scheme.AddTypeDefaultingFunc(&v1alpha2.NodeResourcesMostAllocatedArgs{}, func(obj interface{}) {
SetObjectDefaults_NodeResourcesMostAllocatedArgs(obj.(*v1alpha2.NodeResourcesMostAllocatedArgs))
})
scheme.AddTypeDefaultingFunc(&v1alpha2.RequestedToCapacityRatioArgs{}, func(obj interface{}) {
SetObjectDefaults_RequestedToCapacityRatioArgs(obj.(*v1alpha2.RequestedToCapacityRatioArgs))
})
return nil
}
@ -57,3 +60,7 @@ func SetObjectDefaults_NodeResourcesLeastAllocatedArgs(in *v1alpha2.NodeResource
func SetObjectDefaults_NodeResourcesMostAllocatedArgs(in *v1alpha2.NodeResourcesMostAllocatedArgs) {
SetDefaults_NodeResourcesMostAllocatedArgs(in)
}
func SetObjectDefaults_RequestedToCapacityRatioArgs(in *v1alpha2.RequestedToCapacityRatioArgs) {
SetDefaults_RequestedToCapacityRatioArgs(in)
}

4
pkg/scheduler/framework/plugins/noderesources/requested_to_capacity_ratio.go
View File

@ -76,10 +76,6 @@ func NewRequestedToCapacityRatio(plArgs runtime.Object, handle framework.Framewo
resourceToWeightMap[v1.ResourceName(resource.Name)] = 1
}
}
if len(args.Resources) == 0 {
// If no resources specified, used the default set.
resourceToWeightMap = defaultRequestedRatioResources
}
return &RequestedToCapacityRatio{
handle: handle,

16
pkg/scheduler/framework/v1alpha1/framework_test.go
View File

@ -496,10 +496,12 @@ func TestNewFrameworkPluginDefaults(t *testing.T) {
"InterPodAffinity": &config.InterPodAffinityArgs{
HardPodAffinityWeight: 1,
},
"NodeLabel": &config.NodeLabelArgs{},
"NodeResourcesFit": &config.NodeResourcesFitArgs{},
"RequestedToCapacityRatio": &config.RequestedToCapacityRatioArgs{},
"PodTopologySpread": &config.PodTopologySpreadArgs{},
"NodeLabel": &config.NodeLabelArgs{},
"NodeResourcesFit": &config.NodeResourcesFitArgs{},
"RequestedToCapacityRatio": &config.RequestedToCapacityRatioArgs{
Resources: []config.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
},
"PodTopologySpread": &config.PodTopologySpreadArgs{},
},
},
{
@ -526,8 +528,10 @@ func TestNewFrameworkPluginDefaults(t *testing.T) {
"NodeResourcesFit": &config.NodeResourcesFitArgs{
IgnoredResources: []string{"example.com/foo"},
},
"RequestedToCapacityRatio": &config.RequestedToCapacityRatioArgs{},
"PodTopologySpread": &config.PodTopologySpreadArgs{},
"RequestedToCapacityRatio": &config.RequestedToCapacityRatioArgs{
Resources: []config.ResourceSpec{{Name: "cpu", Weight: 1}, {Name: "memory", Weight: 1}},
},
"PodTopologySpread": &config.PodTopologySpreadArgs{},
},
},
}