Skip to content

Commit 11479ac

Browse files
authored
Merge pull request kubernetes#110542 from xiaomudk/patch-1
Optimize code for SetDefaults_NodeResourcesBalancedAllocationArgs
2 parents 0348821 + 8187c2d commit 11479ac

2 files changed

Lines changed: 4 additions & 8 deletions

File tree

pkg/scheduler/apis/config/v1beta2/defaults.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,8 @@ func SetDefaults_VolumeBindingArgs(obj *v1beta2.VolumeBindingArgs) {
213213

214214
func SetDefaults_NodeResourcesBalancedAllocationArgs(obj *v1beta2.NodeResourcesBalancedAllocationArgs) {
215215
if len(obj.Resources) == 0 {
216-
obj.Resources = append(obj.Resources,
217-
v1beta2.ResourceSpec{Name: string(v1.ResourceCPU), Weight: 1},
218-
v1beta2.ResourceSpec{Name: string(v1.ResourceMemory), Weight: 1},
219-
)
216+
obj.Resources = defaultResourceSpec
217+
return
220218
}
221219
// If the weight is not set or it is explicitly set to 0, then apply the default weight(1) instead.
222220
for i := range obj.Resources {

pkg/scheduler/apis/config/v1beta3/defaults.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,8 @@ func SetDefaults_VolumeBindingArgs(obj *v1beta3.VolumeBindingArgs) {
213213

214214
func SetDefaults_NodeResourcesBalancedAllocationArgs(obj *v1beta3.NodeResourcesBalancedAllocationArgs) {
215215
if len(obj.Resources) == 0 {
216-
obj.Resources = append(obj.Resources,
217-
v1beta3.ResourceSpec{Name: string(v1.ResourceCPU), Weight: 1},
218-
v1beta3.ResourceSpec{Name: string(v1.ResourceMemory), Weight: 1},
219-
)
216+
obj.Resources = defaultResourceSpec
217+
return
220218
}
221219
// If the weight is not set or it is explicitly set to 0, then apply the default weight(1) instead.
222220
for i := range obj.Resources {

0 commit comments

Comments
 (0)