diff --git a/pkg/scheduler/apis/config/types.go b/pkg/scheduler/apis/config/types.go index 7b8c0a33047..9c057ec07b6 100644 --- a/pkg/scheduler/apis/config/types.go +++ b/pkg/scheduler/apis/config/types.go @@ -50,7 +50,7 @@ type KubeSchedulerConfiguration struct { AlgorithmSource SchedulerAlgorithmSource // RequiredDuringScheduling affinity is not symmetric, but there is an implicit PreferredDuringScheduling affinity rule // corresponding to every RequiredDuringScheduling affinity rule. - // HardPodAffinitySymmetricWeight represents the weight of implicit PreferredDuringScheduling affinity rule, in the range 0-100. + // HardPodAffinitySymmetricWeight represents the weight of implicit PreferredDuringScheduling affinity rule, in the range [0-100]. HardPodAffinitySymmetricWeight int32 // LeaderElection defines the configuration of leader election client. @@ -94,7 +94,7 @@ type KubeSchedulerConfiguration struct { PodInitialBackoffSeconds *int64 // PodMaxBackoffSeconds is the max backoff for unschedulable pods. - // If specified, it must be greater than podInitialBackoffSeconds. If this value is null, + // If specified, it must be greater than or equal to podInitialBackoffSeconds. If this value is null, // the default value (10s) will be used. PodMaxBackoffSeconds *int64 @@ -140,7 +140,7 @@ type SchedulerPolicyFileSource struct { type SchedulerPolicyConfigMapSource struct { // Namespace is the namespace of the policy config map. Namespace string - // Name is the name of hte policy config map. + // Name is the name of the policy config map. Name string } diff --git a/pkg/scheduler/apis/config/validation/validation.go b/pkg/scheduler/apis/config/validation/validation.go index 3ef80bb8bfd..0c8e144d957 100644 --- a/pkg/scheduler/apis/config/validation/validation.go +++ b/pkg/scheduler/apis/config/validation/validation.go @@ -38,14 +38,14 @@ func ValidateKubeSchedulerConfiguration(cc *config.KubeSchedulerConfiguration) f allErrs = append(allErrs, field.Invalid(field.NewPath("metricsBindAddress"), cc.MetricsBindAddress, msg)) } if cc.HardPodAffinitySymmetricWeight < 0 || cc.HardPodAffinitySymmetricWeight > 100 { - allErrs = append(allErrs, field.Invalid(field.NewPath("hardPodAffinitySymmetricWeight"), cc.HardPodAffinitySymmetricWeight, "not in valid range 0-100")) + allErrs = append(allErrs, field.Invalid(field.NewPath("hardPodAffinitySymmetricWeight"), cc.HardPodAffinitySymmetricWeight, "not in valid range [0-100]")) } if cc.BindTimeoutSeconds == nil { allErrs = append(allErrs, field.Required(field.NewPath("bindTimeoutSeconds"), "")) } if cc.PercentageOfNodesToScore < 0 || cc.PercentageOfNodesToScore > 100 { allErrs = append(allErrs, field.Invalid(field.NewPath("percentageOfNodesToScore"), - cc.PercentageOfNodesToScore, "not in valid range 0-100")) + cc.PercentageOfNodesToScore, "not in valid range [0-100]")) } if cc.PodInitialBackoffSeconds == nil { allErrs = append(allErrs, field.Required(field.NewPath("podInitialBackoffSeconds"), "")) diff --git a/pkg/scheduler/factory.go b/pkg/scheduler/factory.go index 623d4a57de6..69d3a5fb564 100644 --- a/pkg/scheduler/factory.go +++ b/pkg/scheduler/factory.go @@ -148,7 +148,7 @@ type Configurator struct { // RequiredDuringScheduling affinity is not symmetric, but there is an implicit PreferredDuringScheduling affinity rule // corresponding to every RequiredDuringScheduling affinity rule. - // HardPodAffinitySymmetricWeight represents the weight of implicit PreferredDuringScheduling affinity rule, in the range 0-100. + // HardPodAffinitySymmetricWeight represents the weight of implicit PreferredDuringScheduling affinity rule, in the range [0-100]. hardPodAffinitySymmetricWeight int32 // Handles volume binding decisions diff --git a/pkg/scheduler/factory_test.go b/pkg/scheduler/factory_test.go index 74400da20c6..a21f7bbdd7f 100644 --- a/pkg/scheduler/factory_test.go +++ b/pkg/scheduler/factory_test.go @@ -493,12 +493,12 @@ func TestInvalidFactoryArgs(t *testing.T) { { name: "symmetric weight below range", hardPodAffinitySymmetricWeight: -1, - expectErr: "invalid hardPodAffinitySymmetricWeight: -1, must be in the range 0-100", + expectErr: "invalid hardPodAffinitySymmetricWeight: -1, must be in the range [0-100]", }, { name: "symmetric weight above range", hardPodAffinitySymmetricWeight: 101, - expectErr: "invalid hardPodAffinitySymmetricWeight: 101, must be in the range 0-100", + expectErr: "invalid hardPodAffinitySymmetricWeight: 101, must be in the range [0-100]", }, } diff --git a/pkg/scheduler/framework/plugins/examples/multipoint/multipoint.go b/pkg/scheduler/framework/plugins/examples/multipoint/multipoint.go index 2dcce2a515c..e89889afaa0 100644 --- a/pkg/scheduler/framework/plugins/examples/multipoint/multipoint.go +++ b/pkg/scheduler/framework/plugins/examples/multipoint/multipoint.go @@ -31,7 +31,7 @@ type CommunicatingPlugin struct{} var _ framework.ReservePlugin = CommunicatingPlugin{} var _ framework.PreBindPlugin = CommunicatingPlugin{} -// Name is the name of the plug used in Registry and configurations. +// Name is the name of the plugin used in Registry and configurations. const Name = "multipoint-communicating-plugin" // Name returns name of the plugin. It is used in logs, etc. @@ -43,9 +43,9 @@ type stateData struct { data string } -func (f *stateData) Clone() framework.StateData { +func (s *stateData) Clone() framework.StateData { copy := &stateData{ - data: f.data, + data: s.data, } return copy }