Fix more reportcard issues and compile errors

Author: pwittrock

pkg/controller/eventhandler/enqueue.go

@@ -36,15 +36,15 @@ func (e *EnqueueHandler) Create(q workqueue.RateLimitingInterface, evt event.Cre
 		enqueueLog.Error(nil, "CreateEvent received with no metadata", "CreateEvent", evt)
 		return
 	}
-	q.AddRateLimited(reconcile.ReconcileRequest{types.NamespacedName{
+	q.AddRateLimited(reconcile.ReconcileRequest{NamespacedName:types.NamespacedName{
 		Name:      evt.Meta.GetName(),
 		Namespace: evt.Meta.GetNamespace(),
 	}})
 }
 
 func (e *EnqueueHandler) Update(q workqueue.RateLimitingInterface, evt event.UpdateEvent) {
 	if evt.MetaOld != nil {
-		q.AddRateLimited(reconcile.ReconcileRequest{types.NamespacedName{
+		q.AddRateLimited(reconcile.ReconcileRequest{NamespacedName:types.NamespacedName{
 			Name:      evt.MetaOld.GetName(),
 			Namespace: evt.MetaOld.GetNamespace(),
 		}})
@@ -53,7 +53,7 @@ func (e *EnqueueHandler) Update(q workqueue.RateLimitingInterface, evt event.Upd
 	}
 
 	if evt.MetaNew != nil {
-		q.AddRateLimited(reconcile.ReconcileRequest{types.NamespacedName{
+		q.AddRateLimited(reconcile.ReconcileRequest{NamespacedName:types.NamespacedName{
 			Name:      evt.MetaNew.GetName(),
 			Namespace: evt.MetaNew.GetNamespace(),
 		}})
@@ -67,7 +67,7 @@ func (e *EnqueueHandler) Delete(q workqueue.RateLimitingInterface, evt event.Del
 		enqueueLog.Error(nil, "DeleteEvent received with no metadata", "DeleteEvent", evt)
 		return
 	}
-	q.AddRateLimited(reconcile.ReconcileRequest{types.NamespacedName{
+	q.AddRateLimited(reconcile.ReconcileRequest{NamespacedName:types.NamespacedName{
 		Name:      evt.Meta.GetName(),
 		Namespace: evt.Meta.GetNamespace(),
 	}})
@@ -78,7 +78,7 @@ func (e *EnqueueHandler) Generic(q workqueue.RateLimitingInterface, evt event.Ge
 		enqueueLog.Error(nil, "GenericEvent received with no metadata", "GenericEvent", evt)
 		return
 	}
-	q.AddRateLimited(reconcile.ReconcileRequest{types.NamespacedName{
+	q.AddRateLimited(reconcile.ReconcileRequest{NamespacedName:types.NamespacedName{
 		Name:      evt.Meta.GetName(),
 		Namespace: evt.Meta.GetNamespace(),
 	}})

pkg/controller/eventhandler/example_test.go

@@ -28,13 +28,13 @@ import (
 	"k8s.io/client-go/util/workqueue"
 )
 
-var controller controller.Controller
+var c controller.Controller
 
 // This example watches Pods and enqueues ReconcileRequests with the Name and Namespace of the Pod from
 // the Event (i.e. change caused by a Create, Update, Delete).
 func ExampleEnqueueHandler() {
 	// controller is a controller.controller
-	controller.Watch(
+	c.Watch(
 		&source.KindSource{Type: &corev1.Pod{}},
 		&eventhandler.EnqueueHandler{},
 	)
@@ -44,7 +44,7 @@ func ExampleEnqueueHandler() {
 // owning (direct) Deployment responsible for the creation of the ReplicaSet.
 func ExampleEnqueueOwnerHandler() {
 	// controller is a controller.controller
-	controller.Watch(
+	c.Watch(
 		&source.KindSource{Type: &appsv1.ReplicaSet{}},
 		&eventhandler.EnqueueOwnerHandler{
 			OwnerType:    &appsv1.Deployment{},
@@ -57,7 +57,7 @@ func ExampleEnqueueOwnerHandler() {
 // objects (of Type: MyKind) using a mapping function defined by the user.
 func ExampleEnqueueMappedHandler() {
 	// controller is a controller.controller
-	controller.Watch(
+	c.Watch(
 		&source.KindSource{Type: &appsv1.Deployment{}},
 		&eventhandler.EnqueueMappedHandler{
 			ToRequests: eventhandler.ToRequestsFunc(func(a eventhandler.MapObject) []reconcile.ReconcileRequest {
@@ -76,9 +76,9 @@ func ExampleEnqueueMappedHandler() {
 }
 
 // This example implements eventhandler.EnqueueHandler.
-func ExampleEventHandlerFunc() {
+func ExampleEventHandlerFuncs() {
 	// controller is a controller.controller
-	controller.Watch(
+	c.Watch(
 		&source.KindSource{Type: &corev1.Pod{}},
 		eventhandler.EventHandlerFuncs{
 			CreateFunc: func(q workqueue.RateLimitingInterface, e event.CreateEvent) {

pkg/controller/predicate/example_test.go

@@ -24,7 +24,7 @@ import (
 var p predicate.Predicate
 
 // This example creates a new Predicate to drop Update Events where the Generation has not changed.
-func ExamplePredicateFunc() {
+func ExamplePredicateFuncs() {
 	p = predicate.PredicateFuncs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
 			return e.MetaOld.GetGeneration() != e.MetaNew.GetGeneration()

pkg/controller/source/example_test.go

@@ -24,12 +24,12 @@ import (
 	"k8s.io/api/core/v1"
 )
 
-var controller controller.Controller
+var ctrl controller.Controller
 
 // This example Watches for Pod Events (e.g. Create / Update / Delete) and enqueues a ReconcileRequest
 // with the Name and Namespace of the Pod.
 func ExampleKindSource() {
-	controller.Watch(
+	ctrl.Watch(
 		&source.KindSource{Type: &v1.Pod{}},
 		&eventhandler.EnqueueHandler{},
 	)
@@ -40,7 +40,7 @@ func ExampleKindSource() {
 func ExampleChannelSource() {
 	events := make(chan event.GenericEvent)
 
-	controller.Watch(
+	ctrl.Watch(
 		source.ChannelSource(events),
 		&eventhandler.EnqueueHandler{},
 	)