From 551699fb67aa1c5366513adda9aa7bd5701979ed Mon Sep 17 00:00:00 2001 From: "Dr. Stefan Schimanski" Date: Tue, 2 Jan 2018 09:32:04 +0100 Subject: [PATCH] Pass RecommendedConfig into ExtraAdmissionInitializers Kubernetes-commit: 5a3cfd27ed818b971f36032d85e2de2db586a4e5 --- pkg/server/options/recommended.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/server/options/recommended.go b/pkg/server/options/recommended.go index 829647a24..148bfbdce 100644 --- a/pkg/server/options/recommended.go +++ b/pkg/server/options/recommended.go @@ -39,7 +39,7 @@ type RecommendedOptions struct { // ExtraAdmissionInitializers is called once after all ApplyTo from the options above, to pass the returned // admission plugin initializers to Admission.ApplyTo. - ExtraAdmissionInitializers func() ([]admission.PluginInitializer, error) + ExtraAdmissionInitializers func(c *server.RecommendedConfig) ([]admission.PluginInitializer, error) Admission *AdmissionOptions } @@ -52,7 +52,7 @@ func NewRecommendedOptions(prefix string, codec runtime.Codec) *RecommendedOptio Audit: NewAuditOptions(), Features: NewFeatureOptions(), CoreAPI: NewCoreAPIOptions(), - ExtraAdmissionInitializers: func() ([]admission.PluginInitializer, error) { return nil, nil }, + ExtraAdmissionInitializers: func(c *server.RecommendedConfig) ([]admission.PluginInitializer, error) { return nil, nil }, Admission: NewAdmissionOptions(), } } @@ -93,7 +93,7 @@ func (o *RecommendedOptions) ApplyTo(config *server.RecommendedConfig, scheme *r if err := o.CoreAPI.ApplyTo(config); err != nil { return err } - if initializers, err := o.ExtraAdmissionInitializers(); err != nil { + if initializers, err := o.ExtraAdmissionInitializers(config); err != nil { return err } else if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, config.ClientConfig, scheme, initializers...); err != nil { return err