From 8e7b6f3770bcf96d74986ad229f1dc12ca92d695 Mon Sep 17 00:00:00 2001 From: xiaomudk Date: Tue, 14 Jun 2022 22:36:00 +0800 Subject: [PATCH] Remove redundant variable definitions in scheduler apis defaults.go --- pkg/scheduler/apis/config/v1beta2/defaults.go | 15 +++++---------- pkg/scheduler/apis/config/v1beta3/defaults.go | 12 ++++-------- 2 files changed, 9 insertions(+), 18 deletions(-) diff --git a/pkg/scheduler/apis/config/v1beta2/defaults.go b/pkg/scheduler/apis/config/v1beta2/defaults.go index c58c69ce2e3..60ef8f065a8 100644 --- a/pkg/scheduler/apis/config/v1beta2/defaults.go +++ b/pkg/scheduler/apis/config/v1beta2/defaults.go @@ -121,8 +121,7 @@ func SetDefaults_KubeSchedulerConfiguration(obj *v1beta2.KubeSchedulerConfigurat } if obj.PercentageOfNodesToScore == nil { - percentageOfNodesToScore := int32(config.DefaultPercentageOfNodesToScore) - obj.PercentageOfNodesToScore = &percentageOfNodesToScore + obj.PercentageOfNodesToScore = pointer.Int32Ptr(config.DefaultPercentageOfNodesToScore) } if len(obj.LeaderElection.ResourceLock) == 0 { @@ -153,25 +152,21 @@ func SetDefaults_KubeSchedulerConfiguration(obj *v1beta2.KubeSchedulerConfigurat componentbaseconfigv1alpha1.RecommendedDefaultLeaderElectionConfiguration(&obj.LeaderElection) if obj.PodInitialBackoffSeconds == nil { - val := int64(1) - obj.PodInitialBackoffSeconds = &val + obj.PodInitialBackoffSeconds = pointer.Int64(1) } if obj.PodMaxBackoffSeconds == nil { - val := int64(10) - obj.PodMaxBackoffSeconds = &val + obj.PodMaxBackoffSeconds = pointer.Int64(10) } // Enable profiling by default in the scheduler if obj.EnableProfiling == nil { - enableProfiling := true - obj.EnableProfiling = &enableProfiling + obj.EnableProfiling = pointer.BoolPtr(true) } // Enable contention profiling by default if profiling is enabled if *obj.EnableProfiling && obj.EnableContentionProfiling == nil { - enableContentionProfiling := true - obj.EnableContentionProfiling = &enableContentionProfiling + obj.EnableContentionProfiling = pointer.BoolPtr(true) } } diff --git a/pkg/scheduler/apis/config/v1beta3/defaults.go b/pkg/scheduler/apis/config/v1beta3/defaults.go index 48819665e12..0ff3781a421 100644 --- a/pkg/scheduler/apis/config/v1beta3/defaults.go +++ b/pkg/scheduler/apis/config/v1beta3/defaults.go @@ -153,25 +153,21 @@ func SetDefaults_KubeSchedulerConfiguration(obj *v1beta3.KubeSchedulerConfigurat componentbaseconfigv1alpha1.RecommendedDefaultLeaderElectionConfiguration(&obj.LeaderElection) if obj.PodInitialBackoffSeconds == nil { - val := int64(1) - obj.PodInitialBackoffSeconds = &val + obj.PodInitialBackoffSeconds = pointer.Int64(1) } if obj.PodMaxBackoffSeconds == nil { - val := int64(10) - obj.PodMaxBackoffSeconds = &val + obj.PodMaxBackoffSeconds = pointer.Int64(10) } // Enable profiling by default in the scheduler if obj.EnableProfiling == nil { - enableProfiling := true - obj.EnableProfiling = &enableProfiling + obj.EnableProfiling = pointer.BoolPtr(true) } // Enable contention profiling by default if profiling is enabled if *obj.EnableProfiling && obj.EnableContentionProfiling == nil { - enableContentionProfiling := true - obj.EnableContentionProfiling = &enableContentionProfiling + obj.EnableContentionProfiling = pointer.BoolPtr(true) } }