Merge pull request #63993 from appscode/fixadm-1.0

Automatic merge from submit-queue. Don't panic is admission options is nil Backport #63460 cc: @sttts @deads2k ```release-note nil admission options are now consistent with other nil options. ```
kubernetes · May 24, 2018 · ca8dea7 · ca8dea7
2 parents 93fa67f + 7b79ebd
commit ca8dea7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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(), ", ")+". "+