mark ingress as failed when cant find gateway

* marking as not ready was overwriting the failed status
knative-extensions · Apr 23, 2024 · f690d35 · f690d35
1 parent b522864
commit f690d35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/reconciler/ingress/ingress.go b/pkg/reconciler/ingress/ingress.go
@@ -158,12 +158,12 @@ func (c *Reconciler) reconcileIngress(ctx context.Context, ing *v1alpha1.Ingress
 	if routesReady {
 		externalLBs, internalLBs, err := c.lookUpLoadBalancers(ing, pluginConfig)
 		if err != nil {
-			ing.Status.MarkLoadBalancerNotReady()
 			if _, ok := err.(*GatewayNotFoundError); ok {
 				// if we can't find a Gateway, we mark it as failed, and
 				// return no error, since there is no point in retrying
 				return nil
 			} else {
+				ing.Status.MarkLoadBalancerNotReady()
 				return err
 			}
 		}

diff --git a/pkg/reconciler/ingress/ingress_test.go b/pkg/reconciler/ingress/ingress_test.go
@@ -2315,7 +2315,7 @@ func TestReconcileProbingOffClusterGateway(t *testing.T) {
 			withFinalizer,
 			func(i *v1alpha1.Ingress) {
 				i.Status.InitializeConditions()
-				i.Status.MarkLoadBalancerNotReady()
+				i.Status.MarkLoadBalancerFailed("GatewayDoesNotExist", "could not find Gateway istio-system/istio-gateway")
 				i.Status.MarkNetworkConfigured()
 			})}},
 	}}