Switch to external informers

Author: sttts

pkg/admission/custominitializer/interfaces.go

@@ -18,11 +18,12 @@ package custominitializer
 
 import (
 	"k8s.io/apiserver/pkg/admission"
-	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/internalversion"
+
+	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/externalversions"
 )
 
-// WantsInternalRestaurantInformerFactory defines a function which sets InformerFactory for admission plugins that need it
-type WantsInternalRestaurantInformerFactory interface {
-	SetInternalRestaurantInformerFactory(informers.SharedInformerFactory)
+// WantsRestaurantInformerFactory defines a function which sets InformerFactory for admission plugins that need it
+type WantsRestaurantInformerFactory interface {
+	SetRestaurantInformerFactory(informers.SharedInformerFactory)
 	admission.InitializationValidator
 }

pkg/admission/custominitializer/restaurantinformer.go

@@ -18,7 +18,8 @@ package custominitializer
 
 import (
 	"k8s.io/apiserver/pkg/admission"
-	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/internalversion"
+
+	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/externalversions"
 )
 
 type restaurantInformerPluginInitializer struct {
@@ -37,7 +38,7 @@ func New(informers informers.SharedInformerFactory) restaurantInformerPluginInit
 // Initialize checks the initialization interfaces implemented by a plugin
 // and provide the appropriate initialization data
 func (i restaurantInformerPluginInitializer) Initialize(plugin admission.Interface) {
-	if wants, ok := plugin.(WantsInternalRestaurantInformerFactory); ok {
-		wants.SetInternalRestaurantInformerFactory(i.informers)
+	if wants, ok := plugin.(WantsRestaurantInformerFactory); ok {
+		wants.SetRestaurantInformerFactory(i.informers)
 	}
 }

pkg/admission/custominitializer/restaurantinformer_test.go

@@ -21,36 +21,37 @@ import (
 	"time"
 
 	"k8s.io/apiserver/pkg/admission"
+
 	"github.com/programming-kubernetes/custom-apiserver/pkg/admission/custominitializer"
-	"github.com/programming-kubernetes/custom-apiserver/pkg/generated/clientset/internalversion/fake"
-	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/internalversion"
+	"github.com/programming-kubernetes/custom-apiserver/pkg/generated/clientset/versioned/fake"
+	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/externalversions"
 )
 
 // TestWantsInternalRestaurantInformerFactory ensures that the informer factory is injected
-// when the WantsInternalRestaurantInformerFactory interface is implemented by a plugin.
+// when the WantsRestaurantInformerFactory interface is implemented by a plugin.
 func TestWantsInternalRestaurantInformerFactory(t *testing.T) {
 	cs := &fake.Clientset{}
 	sf := informers.NewSharedInformerFactory(cs, time.Duration(1)*time.Second)
 	target := custominitializer.New(sf)
 
-	wantRestaurantInformerFactory := &wantInternalRestaurantInformerFactory{}
+	wantRestaurantInformerFactory := &wantRestaurantInformerFactory{}
 	target.Initialize(wantRestaurantInformerFactory)
 	if wantRestaurantInformerFactory.sf != sf {
 		t.Errorf("expected informer factory to be initialized")
 	}
 }
 
-// wantInternalRestaurantInformerFactory is a test stub that fulfills the WantsInternalRestaurantInformerFactory interface
-type wantInternalRestaurantInformerFactory struct {
+// wantRestaurantInformerFactory is a test stub that fulfills the WantsRestaurantInformerFactory interface
+type wantRestaurantInformerFactory struct {
 	sf informers.SharedInformerFactory
 }
 
-func (self *wantInternalRestaurantInformerFactory) SetInternalRestaurantInformerFactory(sf informers.SharedInformerFactory) {
+func (self *wantRestaurantInformerFactory) SetRestaurantInformerFactory(sf informers.SharedInformerFactory) {
 	self.sf = sf
 }
-func (self *wantInternalRestaurantInformerFactory) Admit(a admission.Attributes) error { return nil }
-func (self *wantInternalRestaurantInformerFactory) Handles(o admission.Operation) bool { return false }
-func (self *wantInternalRestaurantInformerFactory) ValidateInitialization() error      { return nil }
+func (self *wantRestaurantInformerFactory) Admit(a admission.Attributes) error { return nil }
+func (self *wantRestaurantInformerFactory) Handles(o admission.Operation) bool { return false }
+func (self *wantRestaurantInformerFactory) ValidateInitialization() error      { return nil }
 
-var _ admission.Interface = &wantInternalRestaurantInformerFactory{}
-var _ custominitializer.WantsInternalRestaurantInformerFactory = &wantInternalRestaurantInformerFactory{}
+var _ admission.Interface = &wantRestaurantInformerFactory{}
+var _ custominitializer.WantsRestaurantInformerFactory = &wantRestaurantInformerFactory{}

pkg/admission/plugin/pizzatoppings/admission.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/programming-kubernetes/custom-apiserver/pkg/admission/custominitializer"
 	"github.com/programming-kubernetes/custom-apiserver/pkg/apis/restaurant"
-	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/internalversion"
-	listers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/listers/restaurant/internalversion"
+	informers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/informers/externalversions"
+	listers "github.com/programming-kubernetes/custom-apiserver/pkg/generated/listers/restaurant/v1alpha1"
 )
 
 // Register registers a plugin
@@ -41,7 +41,7 @@ type PizzaToppingsPlugin struct {
 	toppingLister listers.ToppingLister
 }
 
-var _ = custominitializer.WantsInternalRestaurantInformerFactory(&PizzaToppingsPlugin{})
+var _ = custominitializer.WantsRestaurantInformerFactory(&PizzaToppingsPlugin{})
 
 // Admit ensures that the object in-flight is of kind Pizza.
 // In addition checks that the toppings are known.
@@ -69,11 +69,11 @@ func (d *PizzaToppingsPlugin) Validate(a admission.Attributes) error {
 	return nil
 }
 
-// SetInternalRestaurantInformerFactory gets Lister from SharedInformerFactory.
+// SetRestaurantInformerFactory gets Lister from SharedInformerFactory.
 // The lister knows how to lists Toppings.
-func (d *PizzaToppingsPlugin) SetInternalRestaurantInformerFactory(f informers.SharedInformerFactory) {
-	d.toppingLister = f.Restaurant().InternalVersion().Toppings().Lister()
-	d.SetReadyFunc(f.Restaurant().InternalVersion().Toppings().Informer().HasSynced)
+func (d *PizzaToppingsPlugin) SetRestaurantInformerFactory(f informers.SharedInformerFactory) {
+	d.toppingLister = f.Restaurant().V1alpha1().Toppings().Lister()
+	d.SetReadyFunc(f.Restaurant().V1alpha1().Toppings().Informer().HasSynced)
 }
 
 // ValidaValidateInitializationte checks whether the plugin was correctly initialized.