From 8187c2da9e5bb9cce6198d677e58a6126225d6f0 Mon Sep 17 00:00:00 2001 From: xiaomudk Date: Mon, 13 Jun 2022 23:09:08 +0800 Subject: [PATCH] Optimize code for SetDefaults_NodeResourcesBalancedAllocationArgs --- pkg/scheduler/apis/config/v1beta2/defaults.go | 6 ++---- pkg/scheduler/apis/config/v1beta3/defaults.go | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/scheduler/apis/config/v1beta2/defaults.go b/pkg/scheduler/apis/config/v1beta2/defaults.go index 9e92a323412..c58c69ce2e3 100644 --- a/pkg/scheduler/apis/config/v1beta2/defaults.go +++ b/pkg/scheduler/apis/config/v1beta2/defaults.go @@ -213,10 +213,8 @@ func SetDefaults_VolumeBindingArgs(obj *v1beta2.VolumeBindingArgs) { func SetDefaults_NodeResourcesBalancedAllocationArgs(obj *v1beta2.NodeResourcesBalancedAllocationArgs) { if len(obj.Resources) == 0 { - obj.Resources = append(obj.Resources, - v1beta2.ResourceSpec{Name: string(v1.ResourceCPU), Weight: 1}, - v1beta2.ResourceSpec{Name: string(v1.ResourceMemory), Weight: 1}, - ) + obj.Resources = defaultResourceSpec + return } // If the weight is not set or it is explicitly set to 0, then apply the default weight(1) instead. for i := range obj.Resources { diff --git a/pkg/scheduler/apis/config/v1beta3/defaults.go b/pkg/scheduler/apis/config/v1beta3/defaults.go index cc785a92b49..48819665e12 100644 --- a/pkg/scheduler/apis/config/v1beta3/defaults.go +++ b/pkg/scheduler/apis/config/v1beta3/defaults.go @@ -213,10 +213,8 @@ func SetDefaults_VolumeBindingArgs(obj *v1beta3.VolumeBindingArgs) { func SetDefaults_NodeResourcesBalancedAllocationArgs(obj *v1beta3.NodeResourcesBalancedAllocationArgs) { if len(obj.Resources) == 0 { - obj.Resources = append(obj.Resources, - v1beta3.ResourceSpec{Name: string(v1.ResourceCPU), Weight: 1}, - v1beta3.ResourceSpec{Name: string(v1.ResourceMemory), Weight: 1}, - ) + obj.Resources = defaultResourceSpec + return } // If the weight is not set or it is explicitly set to 0, then apply the default weight(1) instead. for i := range obj.Resources {