feat(conformance): Update InferencePoolResolvedRefsCondition test for E2E request validation (kubernetes-sigs#866)

* WIP tests for inferencepool_resolvedrefs_condition

* update condition check

* Add helper method for inf pool parrent status check

* update manifests

* update the test to match manifest

* fix yaml files.

* add SupportInferencePool

* Add a helper function for HTTPRouteMustBeAcceptedAndResolved

* Add a helper method InferencePoolMustBeAcceptedByParent

* add todo for ensure http requests are routed correctly kubernetes-sigs#865

* Add http tests

* update to use echo server instead

* fix echo server port.

* Add env var to include namespace and pod name for echo server resposne.

* factor out the common HTTPResponse builder

* shorten wait time

* remove extra space

* fix yaml formatting

* clean up yaml file remove white space and optional fields.

* change naming convention to primary secondary consistently.

* add helper method for "MakeRequestAndExpectNotFound/Success

* use config instead of inferenceconfig

Author: SinaChavoshi

conformance/resources/manifests/manifests.yaml

@@ -11,7 +11,6 @@ metadata:
   name: gateway-conformance-infra
   labels:
     gateway-conformance: infra
-
 ---
 # Namespace for application backends (potentially simulating model servers
 # or where InferencePools might reside in some tests).
@@ -21,7 +20,6 @@ metadata:
   name: gateway-conformance-app-backend
   labels:
     gateway-conformance: backend
-
 ---
 # Namespace for simple web server backends. This is expected by
 # the upstream conformance suite's Setup method.
@@ -31,7 +29,6 @@ metadata:
   name: gateway-conformance-web-backend
   labels:
     gateway-conformance: web-backend
-
 ---
 # A basic Gateway resource that allows HTTPRoutes from the same namespace.
 # Tests can use this as a parent reference for routes that target InferencePools.
@@ -55,7 +52,6 @@ spec:
       # Allows HTTPRoutes to attach, which can then reference InferencePools.
       - group: gateway.networking.k8s.io
         kind: HTTPRoute
-
 ---
 # --- Conformance Secondary Gateway Definition ---
 # A second generic Gateway resource for tests requiring multiple Gateways.

conformance/tests/basic/inferencepool_resolvedrefs_condition.go

@@ -29,7 +29,9 @@ import (
 	"sigs.k8s.io/gateway-api/pkg/features"
 
 	"sigs.k8s.io/gateway-api-inference-extension/conformance/tests"
+	"sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config"
 	k8sutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/kubernetes"
+	trafficutils "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/traffic"
 )
 
 func init() {
@@ -46,59 +48,115 @@ var InferencePoolParentStatus = suite.ConformanceTest{
 	},
 	Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
 		const (
-			appBackendNamespace = "gateway-conformance-app-backend"
-			infraNamespace      = "gateway-conformance-infra"
-			poolName            = "multi-gateway-pool"
-			sharedGateway1Name  = "conformance-gateway"
-			sharedGateway2Name  = "conformance-secondary-gateway"
-			httpRoute1Name      = "httproute-for-gw1"
-			httpRoute2Name      = "httproute-for-gw2"
+			appBackendNamespace        = "gateway-conformance-app-backend"
+			infraNamespace             = "gateway-conformance-infra"
+			poolName                   = "multi-gateway-pool"
+			sharedPrimaryGatewayName   = "conformance-gateway"
+			sharedSecondaryGatewayName = "conformance-secondary-gateway"
+			httpRoutePrimaryName       = "httproute-for-primary-gw"
+			httpRouteSecondaryName     = "httproute-for-secondary-gw"
+			hostnamePrimaryGw          = "primary.example.com"
+			pathPrimaryGw              = "/primary-gateway-test"
+			hostnameSecondaryGw        = "secondary.example.com"
+			pathSecondaryGw            = "/secondary-gateway-test"
+			backendServicePodName      = "infra-backend-deployment"
 		)
 
 		poolNN := types.NamespacedName{Name: poolName, Namespace: appBackendNamespace}
-		httpRoute1NN := types.NamespacedName{Name: httpRoute1Name, Namespace: appBackendNamespace}
-		httpRoute2NN := types.NamespacedName{Name: httpRoute2Name, Namespace: appBackendNamespace}
-		gateway1NN := types.NamespacedName{Name: sharedGateway1Name, Namespace: infraNamespace}
-		gateway2NN := types.NamespacedName{Name: sharedGateway2Name, Namespace: infraNamespace}
+		httpRoutePrimaryNN := types.NamespacedName{Name: httpRoutePrimaryName, Namespace: appBackendNamespace}
+		httpRouteSecondaryNN := types.NamespacedName{Name: httpRouteSecondaryName, Namespace: appBackendNamespace}
+		gatewayPrimaryNN := types.NamespacedName{Name: sharedPrimaryGatewayName, Namespace: infraNamespace}
+		gatewaySecondaryNN := types.NamespacedName{Name: sharedSecondaryGatewayName, Namespace: infraNamespace}
 
-		k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, httpRoute1NN, gateway1NN)
-		k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, httpRoute2NN, gateway2NN)
+		inferenceTimeoutConfig := config.DefaultInferenceExtensionTimeoutConfig()
 
-		t.Run("InferencePool should show Accepted:True by parents when referenced by multiple HTTPRoutes", func(t *testing.T) {
+		k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, httpRoutePrimaryNN, gatewayPrimaryNN)
+		k8sutils.HTTPRouteMustBeAcceptedAndResolved(t, s.Client, s.TimeoutConfig, httpRouteSecondaryNN, gatewaySecondaryNN)
+
+		gwPrimaryAddr := k8sutils.GetGatewayEndpoint(t, s.Client, s.TimeoutConfig, gatewayPrimaryNN)
+		gwSecondaryAddr := k8sutils.GetGatewayEndpoint(t, s.Client, s.TimeoutConfig, gatewaySecondaryNN)
+
+		t.Run("InferencePool should show Accepted:True by parents and be routable via multiple HTTPRoutes", func(t *testing.T) {
 			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
-			// TODO(#865) ensure requests are correctly routed to this InferencePool.
 			t.Logf("InferencePool %s has parent status Accepted:True as expected with two references.", poolNN.String())
+
+			trafficutils.MakeRequestAndExpectSuccess(
+				t,
+				s.RoundTripper,
+				s.TimeoutConfig,
+				gwPrimaryAddr,
+				hostnamePrimaryGw,
+				pathPrimaryGw,
+				backendServicePodName,
+				appBackendNamespace,
+			)
+
+			trafficutils.MakeRequestAndExpectSuccess(
+				t,
+				s.RoundTripper,
+				s.TimeoutConfig,
+				gwSecondaryAddr,
+				hostnameSecondaryGw,
+				pathSecondaryGw,
+				backendServicePodName,
+				appBackendNamespace,
+			)
 		})
 
-		t.Run("Delete httproute-for-gw1", func(t *testing.T) {
-			httproute1 := &gatewayv1.HTTPRoute{
-				ObjectMeta: metav1.ObjectMeta{Name: httpRoute1NN.Name, Namespace: httpRoute1NN.Namespace},
+		t.Run("Delete httproute-for-primary-gw and verify InferencePool status and routing via secondary gw", func(t *testing.T) {
+			httpRoutePrimary := &gatewayv1.HTTPRoute{
+				ObjectMeta: metav1.ObjectMeta{Name: httpRoutePrimaryNN.Name, Namespace: httpRoutePrimaryNN.Namespace},
 			}
-			t.Logf("Deleting HTTPRoute %s", httpRoute1NN.String())
-			require.NoError(t, s.Client.Delete(context.TODO(), httproute1), "failed to delete httproute-for-gw1")
-			time.Sleep(s.TimeoutConfig.GatewayMustHaveCondition)
-		})
+			t.Logf("Deleting HTTPRoute %s", httpRoutePrimaryNN.String())
+			require.NoError(t, s.Client.Delete(context.TODO(), httpRoutePrimary), "failed to delete httproute-for-primary-gw")
+
+			t.Logf("Waiting for %v for Gateway conditions to update after deleting HTTPRoute %s", inferenceTimeoutConfig.HTTPRouteDeletionReconciliationTimeout, httpRoutePrimaryNN.String()) //
+			time.Sleep(inferenceTimeoutConfig.HTTPRouteDeletionReconciliationTimeout)                                                                                                         //
 
-		t.Run("InferencePool should still show Accepted:True by parent after one HTTPRoute is deleted", func(t *testing.T) {
 			k8sutils.InferencePoolMustBeAcceptedByParent(t, s.Client, poolNN)
-			// TODO(#865) ensure requests are correctly routed to this InferencePool.
 			t.Logf("InferencePool %s still has parent status Accepted:True as expected with one reference remaining.", poolNN.String())
+
+			trafficutils.MakeRequestAndExpectSuccess(
+				t,
+				s.RoundTripper,
+				s.TimeoutConfig,
+				gwSecondaryAddr,
+				hostnameSecondaryGw,
+				pathSecondaryGw,
+				backendServicePodName,
+				appBackendNamespace,
+			)
+
+			trafficutils.MakeRequestAndExpectNotFound(
+				t,
+				s.RoundTripper,
+				s.TimeoutConfig,
+				gwPrimaryAddr,
+				hostnamePrimaryGw,
+				pathPrimaryGw,
+			)
 		})
 
-		t.Run("Delete httproute-for-gw2", func(t *testing.T) {
-			httproute2 := &gatewayv1.HTTPRoute{
-				ObjectMeta: metav1.ObjectMeta{Name: httpRoute2NN.Name, Namespace: httpRoute2NN.Namespace},
+		t.Run("Delete httproute-for-secondary-gw and verify InferencePool has no parent statuses and is not routable", func(t *testing.T) {
+			httpRouteSecondary := &gatewayv1.HTTPRoute{
+				ObjectMeta: metav1.ObjectMeta{Name: httpRouteSecondaryNN.Name, Namespace: httpRouteSecondaryNN.Namespace},
 			}
-			t.Logf("Deleting HTTPRoute %s", httpRoute2NN.String())
-			require.NoError(t, s.Client.Delete(context.TODO(), httproute2), "failed to delete httproute-for-gw2")
-		})
+			t.Logf("Deleting HTTPRoute %s", httpRouteSecondaryNN.String())
+			require.NoError(t, s.Client.Delete(context.TODO(), httpRouteSecondary), "failed to delete httproute-for-secondary-gw")
 
-		t.Run("InferencePool should have no parent statuses after all HTTPRoutes are deleted", func(t *testing.T) {
-			t.Logf("Waiting for InferencePool %s to have no parent statuses.", poolNN.String())
 			k8sutils.InferencePoolMustHaveNoParents(t, s.Client, poolNN)
 			t.Logf("InferencePool %s correctly shows no parent statuses, indicating it's no longer referenced.", poolNN.String())
+
+			trafficutils.MakeRequestAndExpectNotFound(
+				t,
+				s.RoundTripper,
+				s.TimeoutConfig,
+				gwSecondaryAddr,
+				hostnameSecondaryGw,
+				pathSecondaryGw,
+			)
 		})
 
-		t.Logf("InferencePoolResolvedRefsCondition completed.")
+		t.Logf("InferencePoolResolvedRefsCondition test completed.")
 	},
 }

conformance/tests/basic/inferencepool_resolvedrefs_condition.yaml

@@ -3,7 +3,7 @@
 # This manifest defines the initial resources for the
 # inferencepool_resolvedrefs_condition.go conformance test.
 
-# --- Backend Deployment (using agnhost echo server) ---
+# --- Backend Deployment (using standard Gateway API echoserver) ---
 # This Deployment provides Pods for the InferencePool to select.
 apiVersion: apps/v1
 kind: Deployment
@@ -13,7 +13,6 @@ metadata:
   labels:
     app: infra-backend
 spec:
-  replicas: 1
   selector:
     matchLabels:
       app: infra-backend
@@ -23,22 +22,30 @@ spec:
         app: infra-backend
     spec:
       containers:
-      - name: agnhost-echo
-        image: k8s.gcr.io/e2e-test-images/agnhost:2.39
-        args:
-        - serve-hostname
-        - --port=8080
+      - name: echoserver
+        image: gcr.io/k8s-staging-gateway-api/echo-basic:v20240412-v1.0.0-394-g40c666fd
         ports:
-        - name: http
-          containerPort: 8080
+        - containerPort: 3000
         readinessProbe:
           httpGet:
             path: /
-            port: 8080
+            port: 3000
           initialDelaySeconds: 3
           periodSeconds: 5
           failureThreshold: 2
-
+        env:
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
 ---
 # --- Backend Service ---
 # Service for the infra-backend-deployment.
@@ -52,36 +59,30 @@ spec:
     app: infra-backend
   ports:
   - name: http
-    protocol: TCP
-    port: 8080
-    targetPort: 8080
+    port: 3000
+    targetPort: 3000
   - name: epp
     port: 9002
     targetPort: 9002
-
 ---
 # --- InferencePool Definition ---
 apiVersion: inference.networking.x-k8s.io/v1alpha2
 kind: InferencePool
 metadata:
-  name: multi-gateway-pool # Name used in the Go test
-  namespace: gateway-conformance-app-backend # Defined in base manifests.yaml
+  name: multi-gateway-pool
+  namespace: gateway-conformance-app-backend
 spec:
-  # --- Selector (Required) ---
-  # Selects the Pods belonging to this pool.
   selector:
     app: "infra-backend"
-  # --- Target Port (Required) ---
-  targetPortNumber: 8080
+  targetPortNumber: 3000
   extensionRef:
     name: infra-backend-svc
-
 ---
-# --- HTTPRoute for Gateway 1 (conformance-gateway) ---
+# --- HTTPRoute for Primary Gateway (conformance-gateway) ---
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: httproute-for-gw1
+  name: httproute-for-primary-gw
   namespace: gateway-conformance-app-backend
 spec:
   parentRefs:
@@ -91,24 +92,23 @@ spec:
     namespace: gateway-conformance-infra
     sectionName: http
   hostnames:
-  - "gw1.example.com"
+  - "primary.example.com"
   rules:
   - backendRefs:
     - group: inference.networking.x-k8s.io
       kind: InferencePool
       name: multi-gateway-pool
-      port: 8080
+      port: 3000
     matches:
     - path:
         type: PathPrefix
-        value: /conformance-gateway-test
-
+        value: /primary-gateway-test
 ---
-# --- HTTPRoute for Gateway 2 (conformance-secondary-gateway) ---
+# --- HTTPRoute for Secondary Gateway (conformance-secondary-gateway) ---
 apiVersion: gateway.networking.k8s.io/v1
 kind: HTTPRoute
 metadata:
-  name: httproute-for-gw2
+  name: httproute-for-secondary-gw
   namespace: gateway-conformance-app-backend
 spec:
   parentRefs:
@@ -124,8 +124,8 @@ spec:
     - group: inference.networking.x-k8s.io
       kind: InferencePool
       name: multi-gateway-pool
-      port: 8080
+      port: 3000
     matches:
     - path:
         type: PathPrefix
-        value: /gateway-2-test
+        value: /secondary-gateway-test

conformance/utils/config/timing.go

@@ -37,13 +37,19 @@ type InferenceExtensionTimeoutConfig struct {
 
 	// GatewayObjectPollInterval is the polling interval used when waiting for a Gateway object to appear.
 	GatewayObjectPollInterval time.Duration
+
+	// HTTPRouteDeletionReconciliationTimeout is the time to wait for controllers to reconcile
+	// state after an HTTPRoute is deleted, before checking dependent resources or traffic.
+	HTTPRouteDeletionReconciliationTimeout time.Duration
 }
 
+// DefaultInferenceExtensionTimeoutConfig returns a new InferenceExtensionTimeoutConfig with default values.
 func DefaultInferenceExtensionTimeoutConfig() InferenceExtensionTimeoutConfig {
 	return InferenceExtensionTimeoutConfig{
-		TimeoutConfig:                          gatewayconfig.DefaultTimeoutConfig(),
+		TimeoutConfig:                          gatewayconfig.DefaultTimeoutConfig(), // Initialize embedded struct
 		InferencePoolMustHaveConditionTimeout:  300 * time.Second,
 		InferencePoolMustHaveConditionInterval: 10 * time.Second,
 		GatewayObjectPollInterval:              5 * time.Second,
+		HTTPRouteDeletionReconciliationTimeout: 5 * time.Second,
 	}
 }

conformance/utils/kubernetes/helpers.go

@@ -256,3 +256,18 @@ func InferencePoolMustBeAcceptedByParent(t *testing.T, c client.Client, poolNN t
 	InferencePoolMustHaveCondition(t, c, poolNN, acceptedByParentCondition)
 	t.Logf("InferencePool %s is Accepted by a parent Gateway (Reason: %s)", poolNN.String(), gatewayv1.GatewayReasonAccepted)
 }
+
+// GetGatewayEndpoint waits for the specified Gateway to have at least one address
+// and returns the address in "host:port" format.
+// It leverages the upstream Gateway API's WaitForGatewayAddress.
+func GetGatewayEndpoint(t *testing.T, k8sClient client.Client, timeoutConfig gatewayapiconfig.TimeoutConfig, gatewayNN types.NamespacedName) string {
+	t.Helper()
+
+	t.Logf("Waiting for Gateway %s/%s to get an address...", gatewayNN.Namespace, gatewayNN.Name)
+	gwAddr, err := gatewayk8sutils.WaitForGatewayAddress(t, k8sClient, timeoutConfig, gatewayk8sutils.NewGatewayRef(gatewayNN))
+	require.NoError(t, err, "failed to get Gateway address for %s", gatewayNN.String())
+	require.NotEmpty(t, gwAddr, "Gateway %s has no address", gatewayNN.String())
+
+	t.Logf("Gateway %s/%s has address: %s", gatewayNN.Namespace, gatewayNN.Name, gwAddr)
+	return gwAddr
+}