diff --git a/plugin/pkg/admission/storage/storageobjectinuseprotection/BUILD b/plugin/pkg/admission/storage/storageobjectinuseprotection/BUILD index b09a399353c..1cccceca387 100644 --- a/plugin/pkg/admission/storage/storageobjectinuseprotection/BUILD +++ b/plugin/pkg/admission/storage/storageobjectinuseprotection/BUILD @@ -7,10 +7,7 @@ go_library( visibility = ["//visibility:public"], deps = [ "//pkg/apis/core:go_default_library", - "//pkg/client/informers/informers_generated/internalversion:go_default_library", - "//pkg/client/listers/core/internalversion:go_default_library", "//pkg/features:go_default_library", - "//pkg/kubeapiserver/admission:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/apiserver/pkg/admission:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", @@ -24,8 +21,6 @@ go_test( embed = [":go_default_library"], deps = [ "//pkg/apis/core:go_default_library", - "//pkg/client/informers/informers_generated/internalversion:go_default_library", - "//pkg/controller:go_default_library", "//pkg/volume/util:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library", diff --git a/plugin/pkg/admission/storage/storageobjectinuseprotection/admission.go b/plugin/pkg/admission/storage/storageobjectinuseprotection/admission.go index 5d7fca15d3b..2a8e24c6dfa 100644 --- a/plugin/pkg/admission/storage/storageobjectinuseprotection/admission.go +++ b/plugin/pkg/admission/storage/storageobjectinuseprotection/admission.go @@ -17,18 +17,14 @@ limitations under the License. package storageobjectinuseprotection import ( - "fmt" "io" "github.com/golang/glog" - admission "k8s.io/apiserver/pkg/admission" + "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/util/feature" api "k8s.io/kubernetes/pkg/apis/core" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion" - corelisters "k8s.io/kubernetes/pkg/client/listers/core/internalversion" "k8s.io/kubernetes/pkg/features" - kubeapiserveradmission "k8s.io/kubernetes/pkg/kubeapiserver/admission" volumeutil "k8s.io/kubernetes/pkg/volume/util" ) @@ -48,13 +44,9 @@ func Register(plugins *admission.Plugins) { // storageProtectionPlugin holds state for and implements the admission plugin. type storageProtectionPlugin struct { *admission.Handler - - pvcLister corelisters.PersistentVolumeClaimLister - pvLister corelisters.PersistentVolumeLister } var _ admission.Interface = &storageProtectionPlugin{} -var _ = kubeapiserveradmission.WantsInternalKubeInformerFactory(&storageProtectionPlugin{}) // newPlugin creates a new admission plugin. func newPlugin() *storageProtectionPlugin { @@ -63,27 +55,6 @@ func newPlugin() *storageProtectionPlugin { } } -func (c *storageProtectionPlugin) SetInternalKubeInformerFactory(f informers.SharedInformerFactory) { - pvcInformer := f.Core().InternalVersion().PersistentVolumeClaims() - c.pvcLister = pvcInformer.Lister() - pvInformer := f.Core().InternalVersion().PersistentVolumes() - c.pvLister = pvInformer.Lister() - c.SetReadyFunc(func() bool { - return pvcInformer.Informer().HasSynced() && pvInformer.Informer().HasSynced() - }) -} - -// ValidateInitialization ensures lister is set. -func (c *storageProtectionPlugin) ValidateInitialization() error { - if c.pvcLister == nil { - return fmt.Errorf("missing PVC lister") - } - if c.pvLister == nil { - return fmt.Errorf("missing PV lister") - } - return nil -} - var ( pvResource = api.Resource("persistentvolumes") pvcResource = api.Resource("persistentvolumeclaims") diff --git a/plugin/pkg/admission/storage/storageobjectinuseprotection/admission_test.go b/plugin/pkg/admission/storage/storageobjectinuseprotection/admission_test.go index 4a7c9ce7fc7..757a93749e6 100644 --- a/plugin/pkg/admission/storage/storageobjectinuseprotection/admission_test.go +++ b/plugin/pkg/admission/storage/storageobjectinuseprotection/admission_test.go @@ -29,8 +29,6 @@ import ( "k8s.io/apiserver/pkg/admission" "k8s.io/apiserver/pkg/util/feature" api "k8s.io/kubernetes/pkg/apis/core" - informers "k8s.io/kubernetes/pkg/client/informers/informers_generated/internalversion" - "k8s.io/kubernetes/pkg/controller" volumeutil "k8s.io/kubernetes/pkg/volume/util" ) @@ -118,8 +116,6 @@ func TestAdmit(t *testing.T) { } ctrl := newPlugin() - informerFactory := informers.NewSharedInformerFactory(nil, controller.NoResyncPeriodFunc()) - ctrl.SetInternalKubeInformerFactory(informerFactory) for _, test := range tests { feature.DefaultFeatureGate.Set(fmt.Sprintf("StorageObjectInUseProtection=%v", test.featureEnabled))