diff --git a/pkg/controller/informers/core.go b/pkg/controller/informers/core.go index 89ddb6149e5..c035cfacdd4 100644 --- a/pkg/controller/informers/core.go +++ b/pkg/controller/informers/core.go @@ -23,6 +23,7 @@ import ( "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/client/cache" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" + coreinternallisters "k8s.io/kubernetes/pkg/client/listers/core/internalversion" "k8s.io/kubernetes/pkg/runtime" "k8s.io/kubernetes/pkg/watch" ) @@ -211,7 +212,7 @@ func (f *pvInformer) Lister() *cache.StoreToPVFetcher { // Interface provides constructor for informer and lister for limit ranges. type LimitRangeInformer interface { Informer() cache.SharedIndexInformer - Lister() *cache.StoreToLimitRangeLister + Lister() coreinternallisters.LimitRangeLister } type limitRangeInformer struct { @@ -236,9 +237,9 @@ func (f *limitRangeInformer) Informer() cache.SharedIndexInformer { } // Lister returns lister for limitRangeInformer -func (f *limitRangeInformer) Lister() *cache.StoreToLimitRangeLister { +func (f *limitRangeInformer) Lister() coreinternallisters.LimitRangeLister { informer := f.Informer() - return &cache.StoreToLimitRangeLister{Indexer: informer.GetIndexer()} + return coreinternallisters.NewLimitRangeLister(informer.GetIndexer()) } // NewPodInformer returns a SharedIndexInformer that lists and watches all pods diff --git a/plugin/pkg/admission/limitranger/admission.go b/plugin/pkg/admission/limitranger/admission.go index ab7ffd20c54..7a8487c23c2 100644 --- a/plugin/pkg/admission/limitranger/admission.go +++ b/plugin/pkg/admission/limitranger/admission.go @@ -26,13 +26,13 @@ import ( lru "github.com/hashicorp/golang-lru" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" + coreinternallisters "k8s.io/kubernetes/pkg/client/listers/core/internalversion" "k8s.io/kubernetes/pkg/controller/informers" "k8s.io/kubernetes/pkg/admission" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/meta" "k8s.io/kubernetes/pkg/api/resource" - "k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/runtime" utilerrors "k8s.io/kubernetes/pkg/util/errors" @@ -53,7 +53,7 @@ type limitRanger struct { *admission.Handler client clientset.Interface actions LimitRangerActions - lister *cache.StoreToLimitRangeLister + lister coreinternallisters.LimitRangeLister // liveLookups holds the last few live lookups we've done to help ammortize cost on repeated lookup failures. // This let's us handle the case of latent caches, by looking up actual results for a namespace on cache miss/no results.