Merge pull request #63993 from appscode/fixadm-1.0

Automatic merge from submit-queue. Don't panic is admission options is nil Backport https://github.com/kubernetes/kubernetes/pull/63460 cc: @sttts @deads2k ```release-note nil admission options are now consistent with other nil options. ```

Merge pull request #63993 from appscode/fixadm-1.0
ca8dea7f · Kubernetes Submit Queue · GitHub · 93fa67f1 · 7b79ebdc · ca8dea7f
Unverified Commit ca8dea7f authored May 24, 2018 by Kubernetes Submit Queue Committed by GitHub May 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

admission.go staging/src/k8s.io/apiserver/pkg/server/options/admission.go +4 -0

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go
@@ -87,6 +87,10 @@ func NewAdmissionOptions() *AdmissionOptions {

 // AddFlags adds flags related to admission for a specific APIServer to the specified FlagSet
 func (a *AdmissionOptions) AddFlags(fs *pflag.FlagSet) {
+	if a == nil {
+		return
+	}
+
 	fs.StringSliceVar(&a.EnablePlugins, "enable-admission-plugins", a.EnablePlugins, ""+
 		"admission plugins that should be enabled in addition to default enabled ones. "+
 		"Comma-delimited list of admission plugins: "+strings.Join(a.Plugins.Registered(), ", ")+". "+