Globally reconcile conflicted Ingresses on deletion (#486)

Author: markusthoemmes

pkg/reconciler/ingress/controller.go

@@ -194,10 +194,21 @@ func NewController(ctx context.Context, cmw configmap.Watcher) *controller.Impl
 	})
 
 	// Make sure trackers are deleted once the observers are removed.
+	// Also reconcile all ingresses in conflict once another ingress is removed to
+	// unwedge them.
 	ingressInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 		FilterFunc: isKourierIngress,
 		Handler: cache.ResourceEventHandlerFuncs{
-			DeleteFunc: tracker.OnDeletedObserver,
+			DeleteFunc: func(obj interface{}) {
+				tracker.OnDeletedObserver(obj)
+
+				impl.FilteredGlobalResync(func(obj interface{}) bool {
+					lbReady := obj.(*v1alpha1.Ingress).Status.GetCondition(v1alpha1.IngressConditionLoadBalancerReady).GetReason()
+					// Force reconcile all Kourier ingresses that are either not reconciled yet
+					// (and thus might end up in a conflict) or already in conflict.
+					return isKourierIngress(obj) && (lbReady == "" || lbReady == conflictReason)
+				}, ingressInformer.Informer())
+			},
 		},
 	})
 

pkg/reconciler/ingress/ingress.go

@@ -31,6 +31,8 @@ import (
 	"knative.dev/pkg/reconciler"
 )
 
+const conflictReason = "DomainConflict"
+
 type Reconciler struct {
 	xdsServer         *envoy.XdsServer
 	caches            *generator.Caches
@@ -52,7 +54,7 @@ func (r *Reconciler) ReconcileKind(ctx context.Context, ing *v1alpha1.Ingress) r
 		// If we had an error due to a duplicated domain, we must mark the ingress as failed with a
 		// custom status. We don't want to return an error in this case as we want to update its status.
 		logging.FromContext(ctx).Info(err.Error())
-		ing.Status.MarkLoadBalancerFailed("DomainConflict", "Ingress rejected: "+err.Error())
+		ing.Status.MarkLoadBalancerFailed(conflictReason, "Ingress rejected: "+err.Error())
 		return nil
 	} else if err != nil {
 		return fmt.Errorf("failed to update ingress: %w", err)