github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Pass RecommendedConfig into ExtraAdmissionInitializers

Browse Source
This commit is contained in:
Dr. Stefan Schimanski 2018-01-02 09:32:04 +01:00 committed by hzxuzhonghu
parent a8127df3bb
commit 5a3cfd27ed
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/server/options/recommended.go
View File

@ -39,7 +39,7 @@ type RecommendedOptions struct {
// ExtraAdmissionInitializers is called once after all ApplyTo from the options above, to pass the returned // ExtraAdmissionInitializers is called once after all ApplyTo from the options above, to pass the returned
// admission plugin initializers to Admission.ApplyTo. // admission plugin initializers to Admission.ApplyTo.
ExtraAdmissionInitializers func() ([]admission.PluginInitializer, error) ExtraAdmissionInitializers func(c *server.RecommendedConfig) ([]admission.PluginInitializer, error)
Admission *AdmissionOptions Admission *AdmissionOptions
} }
@ -52,7 +52,7 @@ func NewRecommendedOptions(prefix string, codec runtime.Codec) *RecommendedOptio
Audit: NewAuditOptions(), Audit: NewAuditOptions(),
Features: NewFeatureOptions(), Features: NewFeatureOptions(),
CoreAPI: NewCoreAPIOptions(), CoreAPI: NewCoreAPIOptions(),
ExtraAdmissionInitializers: func() ([]admission.PluginInitializer, error) { return nil, nil }, ExtraAdmissionInitializers: func(c *server.RecommendedConfig) ([]admission.PluginInitializer, error) { return nil, nil },
Admission: NewAdmissionOptions(), Admission: NewAdmissionOptions(),
} }
} }
@ -93,7 +93,7 @@ func (o *RecommendedOptions) ApplyTo(config *server.RecommendedConfig, scheme *r
if err := o.CoreAPI.ApplyTo(config); err != nil { if err := o.CoreAPI.ApplyTo(config); err != nil {
return err return err
} }
if initializers, err := o.ExtraAdmissionInitializers(); err != nil { if initializers, err := o.ExtraAdmissionInitializers(config); err != nil {
return err return err
} else if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, config.ClientConfig, scheme, initializers...); err != nil { } else if err := o.Admission.ApplyTo(&config.Config, config.SharedInformerFactory, config.ClientConfig, scheme, initializers...); err != nil {
return err return err

10
staging/src/k8s.io/sample-apiserver/pkg/cmd/server/start.go
View File

@ -102,17 +102,17 @@ func (o *WardleServerOptions) Config() (*apiserver.Config, error) {
return nil, fmt.Errorf("error creating self-signed certificates: %v", err) return nil, fmt.Errorf("error creating self-signed certificates: %v", err)
} }
serverConfig := genericapiserver.NewRecommendedConfig(apiserver.Codecs) o.RecommendedOptions.ExtraAdmissionInitializers = func(c *genericapiserver.RecommendedConfig) ([]admission.PluginInitializer, error) {
client, err := clientset.NewForConfig(c.LoopbackClientConfig)
o.RecommendedOptions.ExtraAdmissionInitializers = func() ([]admission.PluginInitializer, error) {
client, err := clientset.NewForConfig(serverConfig.LoopbackClientConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
informerFactory := informers.NewSharedInformerFactory(client, serverConfig.LoopbackClientConfig.Timeout) informerFactory := informers.NewSharedInformerFactory(client, c.LoopbackClientConfig.Timeout)
o.SharedInformerFactory = informerFactory o.SharedInformerFactory = informerFactory
return []admission.PluginInitializer{wardleinitializer.New(informerFactory)}, nil return []admission.PluginInitializer{wardleinitializer.New(informerFactory)}, nil
} }
serverConfig := genericapiserver.NewRecommendedConfig(apiserver.Codecs)
if err := o.RecommendedOptions.ApplyTo(serverConfig, apiserver.Scheme); err != nil { if err := o.RecommendedOptions.ApplyTo(serverConfig, apiserver.Scheme); err != nil {
return nil, err return nil, err
} }