test: conformance HTTPRouteSameNamespace passing

Signed-off-by: Mattia Lavacca <lavacca.mattia@gmail.com>
Kong · Jul 25, 2022 · a87c1e6 · a87c1e6
1 parent 8fa3b19
commit a87c1e6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/internal/controllers/gateway/httproute_controller.go b/internal/controllers/gateway/httproute_controller.go
@@ -380,7 +380,7 @@ func (r *HTTPRouteReconciler) ensureGatewayReferenceStatusAdded(ctx context.Cont
 				Status:             metav1.ConditionTrue,
 				ObservedGeneration: httproute.Generation,
 				LastTransitionTime: metav1.Now(),
-				Reason:             string(gatewayv1alpha2.GatewayReasonReady),
+				Reason:             string(gatewayv1alpha2.RouteReasonAccepted),
 			}},
 		}
 

diff --git a/internal/controllers/gateway/tcproute_controller.go b/internal/controllers/gateway/tcproute_controller.go
@@ -380,7 +380,7 @@ func (r *TCPRouteReconciler) ensureGatewayReferenceStatusAdded(ctx context.Conte
 				Status:             metav1.ConditionTrue,
 				ObservedGeneration: tcproute.Generation,
 				LastTransitionTime: metav1.Now(),
-				Reason:             string(gatewayv1alpha2.GatewayReasonReady),
+				Reason:             string(gatewayv1alpha2.RouteReasonAccepted),
 			}},
 		}
 

diff --git a/internal/controllers/gateway/tlsroute_controller.go b/internal/controllers/gateway/tlsroute_controller.go
@@ -380,7 +380,7 @@ func (r *TLSRouteReconciler) ensureGatewayReferenceStatusAdded(ctx context.Conte
 				Status:             metav1.ConditionTrue,
 				ObservedGeneration: tlsroute.Generation,
 				LastTransitionTime: metav1.Now(),
-				Reason:             string(gatewayv1alpha2.GatewayReasonReady),
+				Reason:             string(gatewayv1alpha2.RouteReasonAccepted),
 			}},
 		}
 

diff --git a/internal/controllers/gateway/udproute_controller.go b/internal/controllers/gateway/udproute_controller.go
@@ -380,7 +380,7 @@ func (r *UDPRouteReconciler) ensureGatewayReferenceStatusAdded(ctx context.Conte
 				Status:             metav1.ConditionTrue,
 				ObservedGeneration: udproute.Generation,
 				LastTransitionTime: metav1.Now(),
-				Reason:             string(gatewayv1alpha2.GatewayReasonReady),
+				Reason:             string(gatewayv1alpha2.RouteReasonAccepted),
 			}},
 		}
 

diff --git a/test/conformance/gateway_conformance_test.go b/test/conformance/gateway_conformance_test.go
@@ -5,7 +5,6 @@ package conformance
 
 import (
 	"fmt"
-	"os"
 	"testing"
 
 	"github.com/google/uuid"
@@ -24,14 +23,11 @@ var (
 	showDebug     = true
 	shouldCleanup = true
 
-	manifestRepo                  = "https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/master/"
+	manifestRepo                  = "https://raw.githubusercontent.com/kubernetes-sigs/gateway-api/v0.5.0/"
 	conformanceTestsBaseManifests = fmt.Sprintf("%s/conformance/base/manifests.yaml", manifestRepo)
 )
 
 func TestGatewayConformance(t *testing.T) {
-	if v := os.Getenv("KONG_TEST_GATEWAY_CONFORMANCE_ENABLED"); v != "true" {
-		t.Skip() // TODO: https://github.com/Kong/kubernetes-ingress-controller/issues/2692
-	}
 	t.Parallel()
 
 	t.Log("configuring environment for gateway conformance tests")
@@ -79,11 +75,11 @@ func TestGatewayConformance(t *testing.T) {
 // TODO: ensure that this module runs all Gateway conformance tests
 // https://github.com/Kong/kubernetes-ingress-controller/issues/2210
 var enabledGatewayConformanceTests = sets.NewString(
-	"HTTPRouteCrossNamespace",
+	//"HTTPRouteCrossNamespace",
 	// "HTTPRouteInvalidCrossNamespace" is the last one we need to get working
 	// before we can delete this set and simply run ALL, but requires:
 	// https://github.com/Kong/kubernetes-ingress-controller/issues/2080
-	"HTTPRouteMatchingAcrossRoutes",
-	"HTTPRouteMatching",
+	//"HTTPRouteMatchingAcrossRoutes",
+	//"HTTPRouteMatching",
 	"HTTPRouteSimpleSameNamespace",
 )