From 172ab88ce848d2c2e6c344535d3011d4ac558a37 Mon Sep 17 00:00:00 2001 From: m1093782566 Date: Fri, 4 Aug 2017 15:07:43 +0800 Subject: [PATCH] add some checks for fedration-apiserver options --- .../app/options/validation.go | 23 +++++++++++++++++++ .../apiserver/pkg/server/options/admission.go | 5 ++++ .../apiserver/pkg/server/options/feature.go | 5 ++++ 3 files changed, 33 insertions(+) diff --git a/federation/cmd/federation-apiserver/app/options/validation.go b/federation/cmd/federation-apiserver/app/options/validation.go index a2044377e61..453372346ea 100644 --- a/federation/cmd/federation-apiserver/app/options/validation.go +++ b/federation/cmd/federation-apiserver/app/options/validation.go @@ -16,6 +16,8 @@ limitations under the License. package options +import "fmt" + func (options *ServerRunOptions) Validate() []error { var errors []error if errs := options.Etcd.Validate(); len(errs) > 0 { @@ -27,6 +29,27 @@ func (options *ServerRunOptions) Validate() []error { if errs := options.InsecureServing.Validate("insecure-port"); len(errs) > 0 { errors = append(errors, errs...) } + if errs := options.Audit.Validate(); len(errs) > 0 { + errors = append(errors, errs...) + } + if errs := options.Features.Validate(); len(errs) > 0 { + errors = append(errors, errs...) + } + if errs := options.Admission.Validate(); len(errs) > 0 { + errors = append(errors, errs...) + } + if errs := options.Authentication.Validate(); len(errs) > 0 { + errors = append(errors, errs...) + } + if errs := options.Authorization.Validate(); len(errs) > 0 { + errors = append(errors, errs...) + } + if errs := options.CloudProvider.Validate(); len(errs) > 0 { + errors = append(errors, errs...) + } + if options.EventTTL <= 0 { + errors = append(errors, fmt.Errorf("--event-ttl must be greater than 0")) + } // TODO: add more checks return errors } diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go index 760f4fc3da7..5604681825f 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go @@ -89,3 +89,8 @@ func (a *AdmissionOptions) ApplyTo(serverCfg *server.Config, pluginInitializers serverCfg.AdmissionControl = admissionChain return nil } + +func (a *AdmissionOptions) Validate() []error { + errs := []error{} + return errs +} diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/feature.go b/staging/src/k8s.io/apiserver/pkg/server/options/feature.go index d99a73495ff..cd62c7c67f7 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/options/feature.go +++ b/staging/src/k8s.io/apiserver/pkg/server/options/feature.go @@ -55,3 +55,8 @@ func (o *FeatureOptions) ApplyTo(c *server.Config) error { return nil } + +func (o *FeatureOptions) Validate() []error { + errs := []error{} + return errs +}