fix tests

Signed-off-by: Guy Daich <guy.daich@sap.com>

Author: guydc

.claude/settings.local.json

@@ -0,0 +1,41 @@
+apiVersion: gateway.networking.k8s.io/v1
+kind: HTTPRoute
+metadata:
+  name: http-with-hc-event-log
+  namespace: gateway-conformance-infra
+spec:
+  parentRefs:
+    - name: hc-event-log-gtw
+  rules:
+    - matches:
+        - path:
+            type: PathPrefix
+            value: /hc-event-log
+      backendRefs:
+        - name: infra-backend-v1
+          port: 8080
+---
+# BTP with an intentionally failing health check (/status/418 never returns 200).
+# With no matches set (log everything), every probe cycle produces a failure
+# event logged to stdout, which Loki collects and the test can assert against.
+apiVersion: gateway.envoyproxy.io/v1alpha1
+kind: BackendTrafficPolicy
+metadata:
+  name: hc-event-log-btp
+  namespace: gateway-conformance-infra
+spec:
+  targetRefs:
+    - group: gateway.networking.k8s.io
+      kind: HTTPRoute
+      name: http-with-hc-event-log
+  healthCheck:
+    active:
+      timeout: 3s
+      interval: 5s
+      unhealthyThreshold: 3
+      healthyThreshold: 1
+      type: HTTP
+      http:
+        path: "/status/418"
+        expectedStatuses:
+          - 200

test/e2e/testdata/backend-health-check-event-log-hc.yaml

@@ -49,45 +49,3 @@ spec:
       backendRefs:
         - name: infra-backend-v1
           port: 8080
----
-apiVersion: gateway.networking.k8s.io/v1
-kind: HTTPRoute
-metadata:
-  name: http-with-hc-event-log
-  namespace: gateway-conformance-infra
-spec:
-  parentRefs:
-    - name: hc-event-log-gtw
-  rules:
-    - matches:
-        - path:
-            type: PathPrefix
-            value: /hc-event-log
-      backendRefs:
-        - name: infra-backend-v1
-          port: 8080
----
-# BTP with an intentionally failing health check (/status/418 never returns 200).
-# With no matches set (log everything), every probe cycle produces a failure
-# event logged to stdout, which Loki collects and the test can assert against.
-apiVersion: gateway.envoyproxy.io/v1alpha1
-kind: BackendTrafficPolicy
-metadata:
-  name: hc-event-log-btp
-  namespace: gateway-conformance-infra
-spec:
-  targetRefs:
-    - group: gateway.networking.k8s.io
-      kind: HTTPRoute
-      name: http-with-hc-event-log
-  healthCheck:
-    active:
-      timeout: 3s
-      interval: 5s
-      unhealthyThreshold: 3
-      healthyThreshold: 1
-      type: HTTP
-      http:
-        path: "/status/418"
-        expectedStatuses:
-          - 200

test/e2e/testdata/backend-health-check-event-log.yaml

@@ -270,24 +270,11 @@ var BackendHealthCheckEventLogTest = suite.ConformanceTest{
 	Test: func(t *testing.T, suite *suite.ConformanceTestSuite) {
 		ns := "gateway-conformance-infra"
 		noHCRouteNN := types.NamespacedName{Name: "http-without-hc-event-log", Namespace: ns}
-		hcRouteNN := types.NamespacedName{Name: "http-with-hc-event-log", Namespace: ns}
 		gwNN := types.NamespacedName{Name: "hc-event-log-gtw", Namespace: ns}
 
 		gwAddr := kubernetes.GatewayAndHTTPRoutesMustBeAccepted(
 			t, suite.Client, suite.TimeoutConfig, suite.ControllerName,
-			kubernetes.NewGatewayRef(gwNN), noHCRouteNN, hcRouteNN,
-		)
-
-		ancestorRef := gwapiv1.ParentReference{
-			Group:     gatewayapi.GroupPtr(gwapiv1.GroupName),
-			Kind:      gatewayapi.KindPtr(resource.KindGateway),
-			Namespace: gatewayapi.NamespacePtr(gwNN.Namespace),
-			Name:      gwapiv1.ObjectName(gwNN.Name),
-		}
-		BackendTrafficPolicyMustBeAccepted(
-			t, suite.Client,
-			types.NamespacedName{Name: "hc-event-log-btp", Namespace: ns},
-			suite.ControllerName, ancestorRef,
+			kubernetes.NewGatewayRef(gwNN), noHCRouteNN,
 		)
 
 		gatewayNS := GetGatewayResourceNamespace()
@@ -297,10 +284,9 @@ var BackendHealthCheckEventLogTest = suite.ConformanceTest{
 			"container": "envoy",
 		}
 
-		// Phase 1: route without health checks — confirm no HC events exist yet.
+		// Phase 1: only the no-HC route is live — no BTP means no health check
+		// probes are running, so Loki must have zero HC events.
 		t.Run("no health check events before HC route is active", func(t *testing.T) {
-			// Send a few requests through the non-HC route to confirm it is reachable,
-			// then verify Loki has not recorded any HC events.
 			http.MakeRequestAndExpectEventuallyConsistentResponse(t, suite.RoundTripper, suite.TimeoutConfig, gwAddr, http.ExpectedResponse{
 				Request:   http.Request{Path: "/no-hc-event-log"},
 				Response:  http.Response{StatusCodes: []int{200}},
@@ -312,7 +298,27 @@ var BackendHealthCheckEventLogTest = suite.ConformanceTest{
 			require.Equal(t, 0, count, "expected no HC events before HC-enabled route is active")
 		})
 
-		// Phase 2: the HC-enabled route is already accepted; wait for events to appear.
+		// Phase 2: apply the HC-enabled route and BTP, then wait for events.
+		hcRouteNN := types.NamespacedName{Name: "http-with-hc-event-log", Namespace: ns}
+		suite.Applier.MustApplyWithCleanup(t, suite.Client, suite.TimeoutConfig, "testdata/backend-health-check-event-log-hc.yaml", true)
+
+		kubernetes.GatewayAndHTTPRoutesMustBeAccepted(
+			t, suite.Client, suite.TimeoutConfig, suite.ControllerName,
+			kubernetes.NewGatewayRef(gwNN), hcRouteNN,
+		)
+
+		ancestorRef := gwapiv1.ParentReference{
+			Group:     gatewayapi.GroupPtr(gwapiv1.GroupName),
+			Kind:      gatewayapi.KindPtr(resource.KindGateway),
+			Namespace: gatewayapi.NamespacePtr(gwNN.Namespace),
+			Name:      gwapiv1.ObjectName(gwNN.Name),
+		}
+		BackendTrafficPolicyMustBeAccepted(
+			t, suite.Client,
+			types.NamespacedName{Name: "hc-event-log-btp", Namespace: ns},
+			suite.ControllerName, ancestorRef,
+		)
+
 		t.Run("health check events appear in logs", func(t *testing.T) {
 			http.AwaitConvergence(
 				t,