wip

Author: smarterclayton

pkg/cmd/server/bootstrappolicy/controller_policy.go

@@ -297,7 +297,7 @@ func init() {
 		},
 	})
 
-	// ingress-secretref-controller
+	// ingress-to-route-controller
 	addControllerRole(rbac.ClusterRole{
 		ObjectMeta: metav1.ObjectMeta{Name: saRolePrefix + InfraIngressToRouteControllerServiceAccountName},
 		Rules: []rbac.PolicyRule{

pkg/route/controller/ingress/ingress.go

@@ -46,9 +46,9 @@ import (
 // 2. For every TLS hostname that has a corresponding path rule and points to a secret
 //    that exists, a route should exist with a valid TLS config from that secret.
 // 3. For every service referenced by the ingress path rule, the route should have
-//    an update to date target port based on the service.
-// 4. A route owned by an ingress that no longer satisfies the first three invariants
-//    should be deleted.
+//    a target port based on the service.
+// 4. A route owned by an ingress that is not described by any of the three invariants
+//    above should be deleted.
 //
 // Unsupported attributes:
 //

pkg/router/controller/extended_validator.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"fmt"
-	"reflect"
 
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -22,19 +21,15 @@ type ExtendedValidator struct {
 
 	// recorder is an interface for indicating route rejections.
 	recorder RejectionRecorder
-
-	// invalidRoutes is a map of invalid routes previously encountered.
-	invalidRoutes map[string]routeapi.Route
 }
 
 // NewExtendedValidator creates a plugin wrapper that ensures only routes that
 // pass extended validation are relayed to the next plugin in the chain.
 // Recorder is an interface for indicating why a route was rejected.
 func NewExtendedValidator(plugin router.Plugin, recorder RejectionRecorder) *ExtendedValidator {
 	return &ExtendedValidator{
-		plugin:        plugin,
-		recorder:      recorder,
-		invalidRoutes: make(map[string]routeapi.Route),
+		plugin:   plugin,
+		recorder: recorder,
 	}
 }
 
@@ -52,17 +47,6 @@ func (p *ExtendedValidator) HandleEndpoints(eventType watch.EventType, endpoints
 func (p *ExtendedValidator) HandleRoute(eventType watch.EventType, route *routeapi.Route) error {
 	// Check if previously seen route and its Spec is unchanged.
 	routeName := routeNameKey(route)
-	old, ok := p.invalidRoutes[routeName]
-	if ok && reflect.DeepEqual(old.Spec, route.Spec) {
-		// Route spec was unchanged and it is already marked in
-		// error, we don't need to do anything more.
-		p.plugin.HandleRoute(watch.Deleted, route)
-		if eventType == watch.Deleted {
-			delete(p.invalidRoutes, routeName)
-		}
-		return fmt.Errorf("invalid route configuration")
-	}
-
 	if errs := validation.ExtendedValidateRoute(route); len(errs) > 0 {
 		errmsg := ""
 		for i := 0; i < len(errs); i++ {

test/extended/testdata/ingress.yaml

@@ -1,7 +1,7 @@
 kind: List
 apiVersion: v1
 items:
-# an ingress that should be captured as three routes
+# an ingress that should be captured as individual routes
 - apiVersion: extensions/v1beta1
   kind: Ingress
   metadata: