update names for kube plugin initializer to avoid conflicts

pkg/kubeapiserver/admission/initializer.go

@@ -25,15 +25,15 @@ import (
 
 // TODO add a `WantsToRun` which takes a stopCh.  Might make it generic.
 
-// WantsInformerFactory defines a function which sets InformerFactory for admission plugins that need it
-type WantsInternalClientSet interface {
-	SetInternalClientSet(internalclientset.Interface)
+// WantsInternalKubeClientSet defines a function which sets ClientSet for admission plugins that need it
+type WantsInternalKubeClientSet interface {
+	SetInternalKubeClientSet(internalclientset.Interface)
 	admission.Validator
 }
 
-// WantsInformerFactory defines a function which sets InformerFactory for admission plugins that need it
-type WantsInformerFactory interface {
-	SetInformerFactory(informers.SharedInformerFactory)
+// WantsInternalKubeInformerFactory defines a function which sets InformerFactory for admission plugins that need it
+type WantsInternalKubeInformerFactory interface {
+	SetInternalKubeInformerFactory(informers.SharedInformerFactory)
 	admission.Validator
 }
 
@@ -70,12 +70,12 @@ func NewPluginInitializer(internalClient internalclientset.Interface, sharedInfo
 // Initialize checks the initialization interfaces implemented by each plugin
 // and provide the appropriate initialization data
 func (i pluginInitializer) Initialize(plugin admission.Interface) {
-	if wants, ok := plugin.(WantsInternalClientSet); ok {
-		wants.SetInternalClientSet(i.internalClient)
+	if wants, ok := plugin.(WantsInternalKubeClientSet); ok {
+		wants.SetInternalKubeClientSet(i.internalClient)
 	}
 
-	if wants, ok := plugin.(WantsInformerFactory); ok {
-		wants.SetInformerFactory(i.informers)
+	if wants, ok := plugin.(WantsInternalKubeInformerFactory); ok {
+		wants.SetInternalKubeInformerFactory(i.informers)
 	}
 
 	if wants, ok := plugin.(WantsAuthorizer); ok {

plugin/pkg/admission/exec/admission.go

@@ -53,7 +53,7 @@ type denyExec struct {
 	privileged bool
 }
 
-var _ = kubeapiserveradmission.WantsInternalClientSet(&denyExec{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&denyExec{})
 
 // NewDenyEscalatingExec creates a new admission controller that denies an exec operation on a pod
 // using host based configurations.
@@ -128,7 +128,7 @@ func isPrivileged(pod *api.Pod) bool {
 	return false
 }
 
-func (d *denyExec) SetInternalClientSet(client internalclientset.Interface) {
+func (d *denyExec) SetInternalKubeClientSet(client internalclientset.Interface) {
 	d.client = client
 }
 

plugin/pkg/admission/limitranger/admission.go

@@ -68,7 +68,7 @@ type liveLookupEntry struct {
 	items  []*api.LimitRange
 }
 
-func (l *limitRanger) SetInformerFactory(f informers.SharedInformerFactory) {
+func (l *limitRanger) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	limitRangeInformer := f.Core().InternalVersion().LimitRanges()
 	l.SetReadyFunc(limitRangeInformer.Informer().HasSynced)
 	l.lister = limitRangeInformer.Lister()
@@ -167,10 +167,10 @@ func NewLimitRanger(actions LimitRangerActions) (admission.Interface, error) {
 	}, nil
 }
 
-var _ = kubeapiserveradmission.WantsInformerFactory(&limitRanger{})
-var _ = kubeapiserveradmission.WantsInternalClientSet(&limitRanger{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&limitRanger{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&limitRanger{})
 
-func (a *limitRanger) SetInternalClientSet(client internalclientset.Interface) {
+func (a *limitRanger) SetInternalKubeClientSet(client internalclientset.Interface) {
 	a.client = client
 }
 

plugin/pkg/admission/namespace/autoprovision/admission.go

@@ -45,8 +45,8 @@ type provision struct {
 	namespaceLister corelisters.NamespaceLister
 }
 
-var _ = kubeapiserveradmission.WantsInformerFactory(&provision{})
-var _ = kubeapiserveradmission.WantsInternalClientSet(&provision{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&provision{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&provision{})
 
 func (p *provision) Admit(a admission.Attributes) error {
 	// if we're here, then we've already passed authentication, so we're allowed to do what we're trying to do
@@ -92,11 +92,11 @@ func NewProvision() admission.Interface {
 	}
 }
 
-func (p *provision) SetInternalClientSet(client internalclientset.Interface) {
+func (p *provision) SetInternalKubeClientSet(client internalclientset.Interface) {
 	p.client = client
 }
 
-func (p *provision) SetInformerFactory(f informers.SharedInformerFactory) {
+func (p *provision) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	namespaceInformer := f.Core().InternalVersion().Namespaces()
 	p.namespaceLister = namespaceInformer.Lister()
 	p.SetReadyFunc(namespaceInformer.Informer().HasSynced)

plugin/pkg/admission/namespace/exists/admission.go

@@ -45,8 +45,8 @@ type exists struct {
 	namespaceLister corelisters.NamespaceLister
 }
 
-var _ = kubeapiserveradmission.WantsInformerFactory(&exists{})
-var _ = kubeapiserveradmission.WantsInternalClientSet(&exists{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&exists{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&exists{})
 
 func (e *exists) Admit(a admission.Attributes) error {
 	// if we're here, then we've already passed authentication, so we're allowed to do what we're trying to do
@@ -87,11 +87,11 @@ func NewExists() admission.Interface {
 	}
 }
 
-func (e *exists) SetInternalClientSet(client internalclientset.Interface) {
+func (e *exists) SetInternalKubeClientSet(client internalclientset.Interface) {
 	e.client = client
 }
 
-func (e *exists) SetInformerFactory(f informers.SharedInformerFactory) {
+func (e *exists) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	namespaceInformer := f.Core().InternalVersion().Namespaces()
 	e.namespaceLister = namespaceInformer.Lister()
 	e.SetReadyFunc(namespaceInformer.Informer().HasSynced)

plugin/pkg/admission/namespace/lifecycle/admission.go

@@ -72,8 +72,8 @@ type forceLiveLookupEntry struct {
 	expiry time.Time
 }
 
-var _ = kubeapiserveradmission.WantsInformerFactory(&lifecycle{})
-var _ = kubeapiserveradmission.WantsInternalClientSet(&lifecycle{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&lifecycle{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&lifecycle{})
 
 func makeNamespaceKey(namespace string) *api.Namespace {
 	return &api.Namespace{
@@ -193,13 +193,13 @@ func newLifecycleWithClock(immortalNamespaces sets.String, clock utilcache.Clock
 	}, nil
 }
 
-func (l *lifecycle) SetInformerFactory(f informers.SharedInformerFactory) {
+func (l *lifecycle) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	namespaceInformer := f.Core().InternalVersion().Namespaces()
 	l.namespaceLister = namespaceInformer.Lister()
 	l.SetReadyFunc(namespaceInformer.Informer().HasSynced)
 }
 
-func (l *lifecycle) SetInternalClientSet(client internalclientset.Interface) {
+func (l *lifecycle) SetInternalKubeClientSet(client internalclientset.Interface) {
 	l.client = client
 }
 

plugin/pkg/admission/podnodeselector/admission.go

@@ -57,8 +57,8 @@ type podNodeSelector struct {
 	clusterNodeSelectors map[string]string
 }
 
-var _ = kubeapiserveradmission.WantsInternalClientSet(&podNodeSelector{})
-var _ = kubeapiserveradmission.WantsInformerFactory(&podNodeSelector{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&podNodeSelector{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&podNodeSelector{})
 
 type pluginConfig struct {
 	PodNodeSelectorPluginConfig map[string]string
@@ -162,11 +162,11 @@ func NewPodNodeSelector(clusterNodeSelectors map[string]string) *podNodeSelector
 	}
 }
 
-func (a *podNodeSelector) SetInternalClientSet(client internalclientset.Interface) {
+func (a *podNodeSelector) SetInternalKubeClientSet(client internalclientset.Interface) {
 	a.client = client
 }
 
-func (p *podNodeSelector) SetInformerFactory(f informers.SharedInformerFactory) {
+func (p *podNodeSelector) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	namespaceInformer := f.Core().InternalVersion().Namespaces()
 	p.namespaceLister = namespaceInformer.Lister()
 	p.SetReadyFunc(namespaceInformer.Informer().HasSynced)

plugin/pkg/admission/podpreset/admission.go

@@ -54,8 +54,8 @@ type podPresetPlugin struct {
 	lister settingslisters.PodPresetLister
 }
 
-var _ = kubeapiserveradmission.WantsInformerFactory(&podPresetPlugin{})
-var _ = kubeapiserveradmission.WantsInternalClientSet(&podPresetPlugin{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&podPresetPlugin{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&podPresetPlugin{})
 
 // NewPlugin creates a new pod preset admission plugin.
 func NewPlugin() *podPresetPlugin {
@@ -74,11 +74,11 @@ func (plugin *podPresetPlugin) Validate() error {
 	return nil
 }
 
-func (a *podPresetPlugin) SetInternalClientSet(client internalclientset.Interface) {
+func (a *podPresetPlugin) SetInternalKubeClientSet(client internalclientset.Interface) {
 	a.client = client
 }
 
-func (a *podPresetPlugin) SetInformerFactory(f informers.SharedInformerFactory) {
+func (a *podPresetPlugin) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	podPresetInformer := f.Settings().InternalVersion().PodPresets()
 	a.lister = podPresetInformer.Lister()
 	a.SetReadyFunc(podPresetInformer.Informer().HasSynced)

plugin/pkg/admission/resourcequota/admission.go

@@ -64,7 +64,7 @@ type quotaAdmission struct {
 	evaluator     Evaluator
 }
 
-var _ = kubeapiserveradmission.WantsInternalClientSet(&quotaAdmission{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&quotaAdmission{})
 
 type liveLookupEntry struct {
 	expiry time.Time
@@ -91,11 +91,11 @@ func NewResourceQuota(registry quota.Registry, config *resourcequotaapi.Configur
 	}, nil
 }
 
-func (a *quotaAdmission) SetInternalClientSet(client internalclientset.Interface) {
+func (a *quotaAdmission) SetInternalKubeClientSet(client internalclientset.Interface) {
 	a.quotaAccessor.client = client
 }
 
-func (a *quotaAdmission) SetInformerFactory(f informers.SharedInformerFactory) {
+func (a *quotaAdmission) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	a.quotaAccessor.lister = f.Core().InternalVersion().ResourceQuotas().Lister()
 }
 

plugin/pkg/admission/resourcequota/resource_access.go

@@ -69,7 +69,7 @@ func newQuotaAccessor() (*quotaAccessor, error) {
 		return nil, err
 	}
 
-	// client and lister will be set when SetInternalClientSet and SetInformerFactory are invoked
+	// client and lister will be set when SetInternalKubeClientSet and SetInternalKubeInformerFactory are invoked
 	return &quotaAccessor{
 		liveLookupCache: liveLookupCache,
 		liveTTL:         time.Duration(30 * time.Second),

plugin/pkg/admission/security/podsecuritypolicy/admission.go

@@ -82,7 +82,7 @@ func (plugin *podSecurityPolicyPlugin) Validate() error {
 
 var _ admission.Interface = &podSecurityPolicyPlugin{}
 var _ kubeapiserveradmission.WantsAuthorizer = &podSecurityPolicyPlugin{}
-var _ kubeapiserveradmission.WantsInformerFactory = &podSecurityPolicyPlugin{}
+var _ kubeapiserveradmission.WantsInternalKubeInformerFactory = &podSecurityPolicyPlugin{}
 
 // NewPlugin creates a new PSP admission plugin.
 func NewPlugin(strategyFactory psp.StrategyFactory, pspMatcher PSPMatchFn, failOnNoPolicies bool) *podSecurityPolicyPlugin {
@@ -94,7 +94,7 @@ func NewPlugin(strategyFactory psp.StrategyFactory, pspMatcher PSPMatchFn, failO
 	}
 }
 
-func (a *podSecurityPolicyPlugin) SetInformerFactory(f informers.SharedInformerFactory) {
+func (a *podSecurityPolicyPlugin) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	podSecurityPolicyInformer := f.Extensions().InternalVersion().PodSecurityPolicies()
 	a.lister = podSecurityPolicyInformer.Lister()
 	a.SetReadyFunc(podSecurityPolicyInformer.Informer().HasSynced)

plugin/pkg/admission/serviceaccount/admission.go

@@ -79,8 +79,8 @@ type serviceAccount struct {
 	secretLister         corelisters.SecretLister
 }
 
-var _ = kubeapiserveradmission.WantsInternalClientSet(&serviceAccount{})
-var _ = kubeapiserveradmission.WantsInformerFactory(&serviceAccount{})
+var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&serviceAccount{})
+var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&serviceAccount{})
 
 // NewServiceAccount returns an admission.Interface implementation which limits admission of Pod CREATE requests based on the pod's ServiceAccount:
 // 1. If the pod does not specify a ServiceAccount, it sets the pod's ServiceAccount to "default"
@@ -100,11 +100,11 @@ func NewServiceAccount() *serviceAccount {
 	}
 }
 
-func (a *serviceAccount) SetInternalClientSet(cl internalclientset.Interface) {
+func (a *serviceAccount) SetInternalKubeClientSet(cl internalclientset.Interface) {
 	a.client = cl
 }
 
-func (a *serviceAccount) SetInformerFactory(f informers.SharedInformerFactory) {
+func (a *serviceAccount) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
 	serviceAccountInformer := f.Core().InternalVersion().ServiceAccounts()
 	a.serviceAccountLister = serviceAccountInformer.Lister()