github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 23:37:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84639 from SataQiu/clean-scheduler-20191101

Browse Source 
scheduler: improve some comments and validation messages
This commit is contained in:
Kubernetes Prow Robot 2019-11-11 12:56:04 -08:00 committed by GitHub
commit bff9a7774c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/scheduler/apis/config/types.go
View File

@ -52,7 +52,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.
@ -96,7 +96,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
@ -142,7 +142,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
}

4
pkg/scheduler/apis/config/validation/validation.go
View File

@ -45,11 +45,11 @@ 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.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 <= 0 {
allErrs = append(allErrs, field.Invalid(field.NewPath("podInitialBackoffSeconds"),

2
pkg/scheduler/factory.go
View File

@ -147,7 +147,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

4
pkg/scheduler/factory_test.go
View File

@ -512,12 +512,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]",
},
}

6
pkg/scheduler/framework/plugins/examples/multipoint/multipoint.go
View File

@ -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
}