From b00d19608a18e90bb3e649a3b52ce1cf2063bb7a Mon Sep 17 00:00:00 2001 From: deads2k Date: Tue, 18 Jul 2017 13:30:06 -0400 Subject: [PATCH] expose RegisterAllAdmissionPlugins so that admission chains can be built reused --- cmd/kube-apiserver/app/plugins.go | 4 ++-- cmd/kube-apiserver/app/server.go | 2 +- federation/cmd/federation-apiserver/app/plugins.go | 4 ++-- federation/cmd/federation-apiserver/app/server.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cmd/kube-apiserver/app/plugins.go b/cmd/kube-apiserver/app/plugins.go index 1eb710036ba..8677d35f592 100644 --- a/cmd/kube-apiserver/app/plugins.go +++ b/cmd/kube-apiserver/app/plugins.go @@ -51,8 +51,8 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/webhook" ) -// registerAllAdmissionPlugins registers all admission plugins -func registerAllAdmissionPlugins(plugins *admission.Plugins) { +// RegisterAllAdmissionPlugins registers all admission plugins +func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { admit.Register(plugins) alwayspullimages.Register(plugins) antiaffinity.Register(plugins) diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index b24338a0d15..a8e8356b4c9 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -247,7 +247,7 @@ func CreateNodeDialer(s *options.ServerRunOptions) (tunneler.Tunneler, *http.Tra // CreateKubeAPIServerConfig creates all the resources for running the API server, but runs none of them func CreateKubeAPIServerConfig(s *options.ServerRunOptions, nodeTunneler tunneler.Tunneler, proxyTransport http.RoundTripper) (*master.Config, informers.SharedInformerFactory, clientgoinformers.SharedInformerFactory, *kubeserver.InsecureServingInfo, aggregatorapiserver.ServiceResolver, error) { // register all admission plugins - registerAllAdmissionPlugins(s.Admission.Plugins) + RegisterAllAdmissionPlugins(s.Admission.Plugins) // set defaults in the options before trying to create the generic config if err := defaultOptions(s); err != nil { diff --git a/federation/cmd/federation-apiserver/app/plugins.go b/federation/cmd/federation-apiserver/app/plugins.go index 31dbf31ccbf..f8891540354 100644 --- a/federation/cmd/federation-apiserver/app/plugins.go +++ b/federation/cmd/federation-apiserver/app/plugins.go @@ -32,8 +32,8 @@ import ( "k8s.io/kubernetes/plugin/pkg/admission/initialization" ) -// registerAllAdmissionPlugins registers all admission plugins -func registerAllAdmissionPlugins(plugins *admission.Plugins) { +// RegisterAllAdmissionPlugins registers all admission plugins +func RegisterAllAdmissionPlugins(plugins *admission.Plugins) { admit.Register(plugins) deny.Register(plugins) gc.Register(plugins) diff --git a/federation/cmd/federation-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go index bcbf955296d..b7d503a9fb7 100644 --- a/federation/cmd/federation-apiserver/app/server.go +++ b/federation/cmd/federation-apiserver/app/server.go @@ -87,7 +87,7 @@ func Run(s *options.ServerRunOptions, stopCh <-chan struct{}) error { // stop with the given channel. func NonBlockingRun(s *options.ServerRunOptions, stopCh <-chan struct{}) error { // register all admission plugins - registerAllAdmissionPlugins(s.Admission.Plugins) + RegisterAllAdmissionPlugins(s.Admission.Plugins) // set defaults if err := s.GenericServerRunOptions.DefaultAdvertiseAddress(s.SecureServing); err != nil {