Merge pull request kubernetes#84815 from alculquicondor/fix/config-validation

k8s-ci-robot · web-flow · commit 6f08d42dec2f · 2019-11-05T22:19:18.000-08:00
Validate scheduler configuration from config file
diff --git a/cmd/kube-scheduler/app/options/options.go b/cmd/kube-scheduler/app/options/options.go
@@ -174,6 +174,9 @@ func (o *Options) ApplyTo(c *schedulerappconfig.Config) error {
 		if err != nil {
 			return err
 		}
+		if err := validation.ValidateKubeSchedulerConfiguration(cfg).ToAggregate(); err != nil {
+			return err
+		}
 
 		// use the loaded config file only, with the exception of --address and --port. This means that
 		// none of the deprecated flags in o.Deprecated are taken into consideration. This is the old

Original file line number	Diff line number	Diff line change
`@@ -174,6 +174,9 @@ func (o Options) ApplyTo(c schedulerappconfig.Config) error {`
`174`	`174`	`if err != nil {`
`175`	`175`	`return err`
`176`	`176`	`}`
	`177`	`+ if err := validation.ValidateKubeSchedulerConfiguration(cfg).ToAggregate(); err != nil {`
	`178`	`+ return err`
	`179`	`+ }`
`177`	`180`
`178`	`181`	`// use the loaded config file only, with the exception of --address and --port. This means that`
`179`	`182`	`// none of the deprecated flags in o.Deprecated are taken into consideration. This is the old`