rebase + review comments

Signed-off-by: Steve Sloka <slokas@vmware.com>

cmd/contour/serve.go

@@ -372,7 +372,7 @@ func doServe(log logrus.FieldLogger, ctx *serveContext) error {
 	// Setup a Manager
 	mgr, err := manager.New(controller_config.GetConfigOrDie(), manager.Options{})
 	if err != nil {
-		log.Fatal(err, "unable to set up overall controller manager")
+		log.Fatal(err, "unable to set up controller manager")
 	}
 
 	// Build the core Kubernetes event handler.

internal/dag/cache.go

@@ -38,7 +38,6 @@ import (
 // A KubernetesCache holds Kubernetes objects and associated configuration and produces
 // DAG values.
 type KubernetesCache struct {
-
 	// RootNamespaces specifies the namespaces where root
 	// HTTPProxies can be defined. If empty, roots can be defined in any
 	// namespace.

internal/k8s/cache/backendpolicy.go

@@ -55,21 +55,21 @@ func NewBackendPolicyController(mgr manager.Manager, eventHandler cache.Resource
 func (r *backendPolicyReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 
 	// Fetch the BackendPolicy from the cache.
-	gateway := &gatewayapi_v1alpha1.BackendPolicy{}
-	err := r.client.Get(ctx, request.NamespacedName, gateway)
+	policy := &gatewayapi_v1alpha1.BackendPolicy{}
+	err := r.client.Get(ctx, request.NamespacedName, policy)
 	if errors.IsNotFound(err) {
 		r.Error(nil, "Could not find BackendPolicy %q in Namespace %q", request.Name, request.Namespace)
 		return reconcile.Result{}, nil
 	}
 
 	// Check if object is deleted.
-	if !gateway.ObjectMeta.DeletionTimestamp.IsZero() {
-		r.eventHandler.OnDelete(gateway)
+	if !policy.ObjectMeta.DeletionTimestamp.IsZero() {
+		r.eventHandler.OnDelete(policy)
 		return reconcile.Result{}, nil
 	}
 
 	// Pass the new changed object off to the eventHandler.
-	r.eventHandler.OnAdd(gateway)
+	r.eventHandler.OnAdd(policy)
 
 	return reconcile.Result{}, nil
 }

internal/k8s/cache/endpoint.go

@@ -55,21 +55,21 @@ func NewEndpointController(mgr manager.Manager, eventHandler cache.ResourceEvent
 func (r *endpointReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 
 	// Fetch the Service from the cache.
-	svc := &corev1.Endpoints{}
-	err := r.client.Get(ctx, request.NamespacedName, svc)
+	endpoint := &corev1.Endpoints{}
+	err := r.client.Get(ctx, request.NamespacedName, endpoint)
 	if errors.IsNotFound(err) {
 		r.Error(nil, "Could not find Endpoints %q in Namespace %q", request.Name, request.Namespace)
 		return reconcile.Result{}, nil
 	}
 
 	// Check if object is deleted.
-	if !svc.ObjectMeta.DeletionTimestamp.IsZero() {
-		r.eventHandler.OnDelete(svc)
+	if !endpoint.ObjectMeta.DeletionTimestamp.IsZero() {
+		r.eventHandler.OnDelete(endpoint)
 		return reconcile.Result{}, nil
 	}
 
 	// Pass the new changed object off to the eventHandler.
-	r.eventHandler.OnAdd(svc)
+	r.eventHandler.OnAdd(endpoint)
 
 	return reconcile.Result{}, nil
 }

internal/k8s/cache/namespace.go

@@ -55,21 +55,21 @@ func NewNamespaceController(mgr manager.Manager, eventHandler cache.ResourceEven
 func (r *namespaceReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 
 	// Fetch the Namespace from the cache.
-	ingress := &core_v1.Namespace{}
-	err := r.client.Get(ctx, request.NamespacedName, ingress)
+	namespace := &core_v1.Namespace{}
+	err := r.client.Get(ctx, request.NamespacedName, namespace)
 	if errors.IsNotFound(err) {
 		r.Error(nil, "Could not find Namespace %q in Namespace %q", request.Name, request.Namespace)
 		return reconcile.Result{}, nil
 	}
 
 	// Check if object is deleted.
-	if !ingress.ObjectMeta.DeletionTimestamp.IsZero() {
-		r.eventHandler.OnDelete(ingress)
+	if !namespace.ObjectMeta.DeletionTimestamp.IsZero() {
+		r.eventHandler.OnDelete(namespace)
 		return reconcile.Result{}, nil
 	}
 
 	// Pass the new changed object off to the eventHandler.
-	r.eventHandler.OnAdd(ingress)
+	r.eventHandler.OnAdd(namespace)
 
 	return reconcile.Result{}, nil
 }

internal/k8s/cache/tlsroute.go

@@ -55,21 +55,21 @@ func NewTLSRouteController(mgr manager.Manager, eventHandler cache.ResourceEvent
 func (r *tlsRouteReconciler) Reconcile(ctx context.Context, request reconcile.Request) (reconcile.Result, error) {
 
 	// Fetch the TLSRoute from the cache.
-	gateway := &gatewayapi_v1alpha1.TLSRoute{}
-	err := r.client.Get(ctx, request.NamespacedName, gateway)
+	tlsroute := &gatewayapi_v1alpha1.TLSRoute{}
+	err := r.client.Get(ctx, request.NamespacedName, tlsroute)
 	if errors.IsNotFound(err) {
 		r.Error(nil, "Could not find TLSRoute %q in Namespace %q", request.Name, request.Namespace)
 		return reconcile.Result{}, nil
 	}
 
 	// Check if object is deleted.
-	if !gateway.ObjectMeta.DeletionTimestamp.IsZero() {
-		r.eventHandler.OnDelete(gateway)
+	if !tlsroute.ObjectMeta.DeletionTimestamp.IsZero() {
+		r.eventHandler.OnDelete(tlsroute)
 		return reconcile.Result{}, nil
 	}
 
 	// Pass the new changed object off to the eventHandler.
-	r.eventHandler.OnAdd(gateway)
+	r.eventHandler.OnAdd(tlsroute)
 
 	return reconcile.Result{}, nil
 }