github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42572 from deads2k/api-08-initializer

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 31783, 41988, 42535, 42572, 41870)

update names for kube plugin initializer to avoid conflicts

Fixes #42581

Other API servers are likely to create admission plugin initializers and so the names we choose for our interfaces matter (they may want to run multiple initializers in the chain).  This updates the names for the plugin initializers to be more specific.  No other changes.

@ncdc
This commit is contained in:
Kubernetes Submit Queue 2017-03-06 11:30:18 -08:00 committed by GitHub
commit cbfbf090c5
17 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/kubeapiserver/admission/initializer.go
View File

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

4
plugin/pkg/admission/exec/admission.go
View File

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

8
plugin/pkg/admission/limitranger/admission.go
View File

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

8
plugin/pkg/admission/namespace/autoprovision/admission.go
View File

@ -45,8 +45,8 @@ type provision struct {
namespaceLister corelisters.NamespaceLister namespaceLister corelisters.NamespaceLister
} }
var _ = kubeapiserveradmission.WantsInformerFactory(&provision{}) var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&provision{})
var _ = kubeapiserveradmission.WantsInternalClientSet(&provision{}) var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&provision{})
func (p *provision) Admit(a admission.Attributes) error { 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 // 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 p.client = client
} }
func (p *provision) SetInformerFactory(f informers.SharedInformerFactory) { func (p *provision) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
namespaceInformer := f.Core().InternalVersion().Namespaces() namespaceInformer := f.Core().InternalVersion().Namespaces()
p.namespaceLister = namespaceInformer.Lister() p.namespaceLister = namespaceInformer.Lister()
p.SetReadyFunc(namespaceInformer.Informer().HasSynced) p.SetReadyFunc(namespaceInformer.Informer().HasSynced)

8
plugin/pkg/admission/namespace/exists/admission.go
View File

@ -45,8 +45,8 @@ type exists struct {
namespaceLister corelisters.NamespaceLister namespaceLister corelisters.NamespaceLister
} }
var _ = kubeapiserveradmission.WantsInformerFactory(&exists{}) var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&exists{})
var _ = kubeapiserveradmission.WantsInternalClientSet(&exists{}) var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&exists{})
func (e *exists) Admit(a admission.Attributes) error { 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 // 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 e.client = client
} }
func (e *exists) SetInformerFactory(f informers.SharedInformerFactory) { func (e *exists) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
namespaceInformer := f.Core().InternalVersion().Namespaces() namespaceInformer := f.Core().InternalVersion().Namespaces()
e.namespaceLister = namespaceInformer.Lister() e.namespaceLister = namespaceInformer.Lister()
e.SetReadyFunc(namespaceInformer.Informer().HasSynced) e.SetReadyFunc(namespaceInformer.Informer().HasSynced)

8
plugin/pkg/admission/namespace/lifecycle/admission.go
View File

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

8
plugin/pkg/admission/podnodeselector/admission.go
View File

@ -57,8 +57,8 @@ type podNodeSelector struct {
clusterNodeSelectors map[string]string clusterNodeSelectors map[string]string
} }
var _ = kubeapiserveradmission.WantsInternalClientSet(&podNodeSelector{}) var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&podNodeSelector{})
var _ = kubeapiserveradmission.WantsInformerFactory(&podNodeSelector{}) var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&podNodeSelector{})
type pluginConfig struct { type pluginConfig struct {
PodNodeSelectorPluginConfig map[string]string 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 a.client = client
} }
func (p *podNodeSelector) SetInformerFactory(f informers.SharedInformerFactory) { func (p *podNodeSelector) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
namespaceInformer := f.Core().InternalVersion().Namespaces() namespaceInformer := f.Core().InternalVersion().Namespaces()
p.namespaceLister = namespaceInformer.Lister() p.namespaceLister = namespaceInformer.Lister()
p.SetReadyFunc(namespaceInformer.Informer().HasSynced) p.SetReadyFunc(namespaceInformer.Informer().HasSynced)

8
plugin/pkg/admission/podpreset/admission.go
View File

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

6
plugin/pkg/admission/resourcequota/admission.go
View File

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

2
plugin/pkg/admission/resourcequota/resource_access.go
View File

@ -69,7 +69,7 @@ func newQuotaAccessor() (*quotaAccessor, error) {
return nil, err 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{ return &quotaAccessor{
liveLookupCache: liveLookupCache, liveLookupCache: liveLookupCache,
liveTTL: time.Duration(30 * time.Second), liveTTL: time.Duration(30 * time.Second),

4
plugin/pkg/admission/security/podsecuritypolicy/admission.go
View File

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

8
plugin/pkg/admission/serviceaccount/admission.go
View File

@ -79,8 +79,8 @@ type serviceAccount struct {
secretLister corelisters.SecretLister secretLister corelisters.SecretLister
} }
var _ = kubeapiserveradmission.WantsInternalClientSet(&serviceAccount{}) var _ = kubeapiserveradmission.WantsInternalKubeClientSet(&serviceAccount{})
var _ = kubeapiserveradmission.WantsInformerFactory(&serviceAccount{}) var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&serviceAccount{})
// NewServiceAccount returns an admission.Interface implementation which limits admission of Pod CREATE requests based on the pod's 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" // 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 a.client = cl
} }
func (a *serviceAccount) SetInformerFactory(f informers.SharedInformerFactory) { func (a *serviceAccount) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
serviceAccountInformer := f.Core().InternalVersion().ServiceAccounts() serviceAccountInformer := f.Core().InternalVersion().ServiceAccounts()
a.serviceAccountLister = serviceAccountInformer.Lister() a.serviceAccountLister = serviceAccountInformer.Lister()

30
plugin/pkg/admission/serviceaccount/admission_test.go
View File

@ -133,7 +133,7 @@ func TestAssignsDefaultServiceAccountAndToleratesMissingAPIToken(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.MountServiceAccountToken = true admit.MountServiceAccountToken = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -161,7 +161,7 @@ func TestAssignsDefaultServiceAccountAndRejectsMissingAPIToken(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.MountServiceAccountToken = true admit.MountServiceAccountToken = true
admit.RequireAPIToken = true admit.RequireAPIToken = true
@ -194,7 +194,7 @@ func TestFetchesUncachedServiceAccount(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.client = client admit.client = client
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -216,9 +216,9 @@ func TestDeniesInvalidServiceAccount(t *testing.T) {
client := fake.NewSimpleClientset() client := fake.NewSimpleClientset()
admit := NewServiceAccount() admit := NewServiceAccount()
admit.SetInternalClientSet(client) admit.SetInternalKubeClientSet(client)
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
pod := &api.Pod{} pod := &api.Pod{}
attrs := admission.NewAttributesRecord(pod, nil, api.Kind("Pod").WithVersion("version"), ns, "myname", api.Resource("pods").WithVersion("version"), "", admission.Create, nil) attrs := admission.NewAttributesRecord(pod, nil, api.Kind("Pod").WithVersion("version"), ns, "myname", api.Resource("pods").WithVersion("version"), "", admission.Create, nil)
@ -248,7 +248,7 @@ func TestAutomountsAPIToken(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.MountServiceAccountToken = true admit.MountServiceAccountToken = true
admit.RequireAPIToken = true admit.RequireAPIToken = true
@ -349,7 +349,7 @@ func TestRespectsExistingMount(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.MountServiceAccountToken = true admit.MountServiceAccountToken = true
admit.RequireAPIToken = true admit.RequireAPIToken = true
@ -447,7 +447,7 @@ func TestAllowsReferencedSecret(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = true admit.LimitSecretReferences = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -528,7 +528,7 @@ func TestRejectsUnreferencedSecretVolumes(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = true admit.LimitSecretReferences = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -606,7 +606,7 @@ func TestAllowUnreferencedSecretVolumesForPermissiveSAs(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = false admit.LimitSecretReferences = false
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -638,7 +638,7 @@ func TestAllowsReferencedImagePullSecrets(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = true admit.LimitSecretReferences = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -670,7 +670,7 @@ func TestRejectsUnreferencedImagePullSecrets(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = true admit.LimitSecretReferences = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -699,7 +699,7 @@ func TestDoNotAddImagePullSecrets(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = true admit.LimitSecretReferences = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -736,7 +736,7 @@ func TestAddImagePullSecrets(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.LimitSecretReferences = true admit.LimitSecretReferences = true
admit.RequireAPIToken = false admit.RequireAPIToken = false
@ -781,7 +781,7 @@ func TestMultipleReferencedSecrets(t *testing.T) {
admit := NewServiceAccount() admit := NewServiceAccount()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
admit.SetInformerFactory(informerFactory) admit.SetInternalKubeInformerFactory(informerFactory)
admit.MountServiceAccountToken = true admit.MountServiceAccountToken = true
admit.RequireAPIToken = true admit.RequireAPIToken = true

4
plugin/pkg/admission/storageclass/default/admission.go
View File

@ -52,7 +52,7 @@ type claimDefaulterPlugin struct {
} }
var _ admission.Interface = &claimDefaulterPlugin{} var _ admission.Interface = &claimDefaulterPlugin{}
var _ = kubeapiserveradmission.WantsInformerFactory(&claimDefaulterPlugin{}) var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&claimDefaulterPlugin{})
// newPlugin creates a new admission plugin. // newPlugin creates a new admission plugin.
func newPlugin() *claimDefaulterPlugin { func newPlugin() *claimDefaulterPlugin {
@ -61,7 +61,7 @@ func newPlugin() *claimDefaulterPlugin {
} }
} }
func (a *claimDefaulterPlugin) SetInformerFactory(f informers.SharedInformerFactory) { func (a *claimDefaulterPlugin) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) {
informer := f.Storage().InternalVersion().StorageClasses() informer := f.Storage().InternalVersion().StorageClasses()
a.lister = informer.Lister() a.lister = informer.Lister()
a.SetReadyFunc(informer.Informer().HasSynced) a.SetReadyFunc(informer.Informer().HasSynced)

2
plugin/pkg/admission/storageclass/default/admission_test.go
View File

@ -199,7 +199,7 @@ func TestAdmission(t *testing.T) {
ctrl := newPlugin() ctrl := newPlugin()
informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc())
ctrl.SetInformerFactory(informerFactory) ctrl.SetInternalKubeInformerFactory(informerFactory)
for _, c := range test.classes { for _, c := range test.classes {
informerFactory.Storage().InternalVersion().StorageClasses().Informer().GetStore().Add(c) informerFactory.Storage().InternalVersion().StorageClasses().Informer().GetStore().Add(c)
} }

8
test/integration/quota/quota_test.go
View File

@ -73,9 +73,9 @@ func TestQuota(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
admission.(kubeadmission.WantsInternalClientSet).SetInternalClientSet(internalClientset) admission.(kubeadmission.WantsInternalKubeClientSet).SetInternalKubeClientSet(internalClientset)
internalInformers := internalinformers.NewSharedInformerFactory(internalClientset, controller.NoResyncPeriodFunc()) internalInformers := internalinformers.NewSharedInformerFactory(internalClientset, controller.NoResyncPeriodFunc())
admission.(kubeadmission.WantsInformerFactory).SetInformerFactory(internalInformers) admission.(kubeadmission.WantsInternalKubeInformerFactory).SetInternalKubeInformerFactory(internalInformers)
defer close(admissionCh) defer close(admissionCh)
masterConfig := framework.NewIntegrationTestMasterConfig() masterConfig := framework.NewIntegrationTestMasterConfig()
@ -258,9 +258,9 @@ func TestQuotaLimitedResourceDenial(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
admission.(kubeadmission.WantsInternalClientSet).SetInternalClientSet(internalClientset) admission.(kubeadmission.WantsInternalKubeClientSet).SetInternalKubeClientSet(internalClientset)
internalInformers := internalinformers.NewSharedInformerFactory(internalClientset, controller.NoResyncPeriodFunc()) internalInformers := internalinformers.NewSharedInformerFactory(internalClientset, controller.NoResyncPeriodFunc())
admission.(kubeadmission.WantsInformerFactory).SetInformerFactory(internalInformers) admission.(kubeadmission.WantsInternalKubeInformerFactory).SetInternalKubeInformerFactory(internalInformers)
defer close(admissionCh) defer close(admissionCh)
masterConfig := framework.NewIntegrationTestMasterConfig() masterConfig := framework.NewIntegrationTestMasterConfig()

4
test/integration/serviceaccount/service_account_test.go
View File

@ -407,9 +407,9 @@ func startServiceAccountTestServer(t *testing.T) (*clientset.Clientset, restclie
// Set up admission plugin to auto-assign serviceaccounts to pods // Set up admission plugin to auto-assign serviceaccounts to pods
serviceAccountAdmission := serviceaccountadmission.NewServiceAccount() serviceAccountAdmission := serviceaccountadmission.NewServiceAccount()
serviceAccountAdmission.SetInternalClientSet(internalRootClientset) serviceAccountAdmission.SetInternalKubeClientSet(internalRootClientset)
internalInformers := internalinformers.NewSharedInformerFactory(internalRootClientset, controller.NoResyncPeriodFunc()) internalInformers := internalinformers.NewSharedInformerFactory(internalRootClientset, controller.NoResyncPeriodFunc())
serviceAccountAdmission.SetInformerFactory(internalInformers) serviceAccountAdmission.SetInternalKubeInformerFactory(internalInformers)
masterConfig := framework.NewMasterConfig() masterConfig := framework.NewMasterConfig()
masterConfig.GenericConfig.EnableIndex = true masterConfig.GenericConfig.EnableIndex = true