kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removes Authorizer and ExternalClientSet from kubeapiserver's admission initializer. 

Kubernetes-commit: 6b1f1d14148fe3962594d8f4c9ca15d1c6171819
This commit is contained in:
p0lyn0mial 2017-10-03 18:08:30 +02:00 committed by Kubernetes Publisher
parent c8b4156cd4
commit f189d35f0e
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/config.go
View File

@ -192,6 +192,11 @@ type RecommendedConfig struct {
// RecommendedOptions.CoreAPI.ApplyTo called by RecommendedOptions.ApplyTo. It uses an in-cluster client config // RecommendedOptions.CoreAPI.ApplyTo called by RecommendedOptions.ApplyTo. It uses an in-cluster client config
// by default, or the kubeconfig given with kubeconfig command line flag. // by default, or the kubeconfig given with kubeconfig command line flag.
SharedInformerFactory informers.SharedInformerFactory SharedInformerFactory informers.SharedInformerFactory
// ClientConfig holds the kubernetes client configuration.
// This value is set by RecommendedOptions.CoreAPI.ApplyTo called by RecommendedOptions.ApplyTo.
// By default in-cluster client config is used.
ClientConfig *restclient.Config
} }
type SecureServingInfo struct { type SecureServingInfo struct {

5
pkg/server/options/admission.go
View File

@ -27,6 +27,7 @@ import (
"k8s.io/apiserver/pkg/server" "k8s.io/apiserver/pkg/server"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes" "k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
) )
// AdmissionOptions holds the admission options // AdmissionOptions holds the admission options
@ -72,13 +73,13 @@ func (a *AdmissionOptions) AddFlags(fs *pflag.FlagSet) {
// In case admission plugin names were not provided by a custer-admin they will be prepared from the recommended/default values. // In case admission plugin names were not provided by a custer-admin they will be prepared from the recommended/default values.
// In addition the method lazily initializes a generic plugin that is appended to the list of pluginInitializers // In addition the method lazily initializes a generic plugin that is appended to the list of pluginInitializers
// note this method uses: // note this method uses:
// genericconfig.LoopbackClientConfig
// genericconfig.Authorizer // genericconfig.Authorizer
func (a *AdmissionOptions) ApplyTo( func (a *AdmissionOptions) ApplyTo(
c *server.Config, c *server.Config,
informers informers.SharedInformerFactory, informers informers.SharedInformerFactory,
serverIdentifyingClientCert []byte, serverIdentifyingClientCert []byte,
serverIdentifyingClientKey []byte, serverIdentifyingClientKey []byte,
clientConfig *rest.Config,
pluginInitializers ...admission.PluginInitializer, pluginInitializers ...admission.PluginInitializer,
) error { ) error {
pluginNames := a.PluginNames pluginNames := a.PluginNames
@ -91,7 +92,7 @@ func (a *AdmissionOptions) ApplyTo(
return fmt.Errorf("failed to read plugin config: %v", err) return fmt.Errorf("failed to read plugin config: %v", err)
} }
clientset, err := kubernetes.NewForConfig(c.LoopbackClientConfig) clientset, err := kubernetes.NewForConfig(clientConfig)
if err != nil { if err != nil {
return err return err
} }

1
pkg/server/options/coreapi.go
View File

@ -73,6 +73,7 @@ func (o *CoreAPIOptions) ApplyTo(config *server.RecommendedConfig) error {
if err != nil { if err != nil {
return fmt.Errorf("failed to create Kubernetes clientset: %v", err) return fmt.Errorf("failed to create Kubernetes clientset: %v", err)
} }
config.ClientConfig = kubeconfig
config.SharedInformerFactory = clientgoinformers.NewSharedInformerFactory(clientgoExternalClient, 10*time.Minute) config.SharedInformerFactory = clientgoinformers.NewSharedInformerFactory(clientgoExternalClient, 10*time.Minute)
return nil return nil