Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
87d1756
copy of accepted inference pool test to start from.
SinaChavoshi May 14, 2025
a9dcb62
add yaml file for the test
SinaChavoshi May 14, 2025
c36e5f8
update time out
SinaChavoshi May 14, 2025
aaf23e2
update the yaml file to add port 9002
SinaChavoshi May 14, 2025
2a67e7d
read timeout config from local repo
SinaChavoshi May 14, 2025
8ac7d72
remove excess comments
SinaChavoshi May 14, 2025
66f325d
correct spelling for scenarios
SinaChavoshi May 20, 2025
fd0fa10
check route condition on RouteConditionResolvedRefs
SinaChavoshi May 20, 2025
59b1f9c
Merge branch 'main' into inf_pool_tests_11
SinaChavoshi May 27, 2025
8a078dc
remove empty lines in yaml
SinaChavoshi May 27, 2025
c55a803
set optional/defaulted fields as unspecified
SinaChavoshi May 27, 2025
c6bacb4
Merge branch 'main' into inf_pool_tests_11
SinaChavoshi May 28, 2025
271b7a8
Merge branch 'main' into inf_pool_tests_11
SinaChavoshi May 28, 2025
c92a402
fix timeout
SinaChavoshi May 28, 2025
bb257fd
fix boilerplate header
SinaChavoshi May 28, 2025
5a61a70
change varialbe names to use primary secondary consistently.
SinaChavoshi May 28, 2025
6fa352d
remove extra comments
SinaChavoshi May 28, 2025
5f1bcad
factor out common code
SinaChavoshi May 28, 2025
e5fc860
Add actual http traffic validation using echo-basic
SinaChavoshi May 28, 2025
62791b5
remove extra comments from manifest
SinaChavoshi May 28, 2025
2f08131
remove modifiedTimeoutConfig.HTTPRouteMustHaveCondition per review co…
SinaChavoshi May 28, 2025
fc2a410
Merge remote-tracking branch 'upstream/main'
SinaChavoshi May 29, 2025
d34457a
Merge remote-tracking branch 'upstream/main'
SinaChavoshi Jun 5, 2025
753917a
Merge remote-tracking branch 'upstream/main'
SinaChavoshi Jun 6, 2025
f4bcc9a
Merge branch 'main' into inf_pool_tests_11
SinaChavoshi Jun 6, 2025
d5530dc
Merge remote-tracking branch 'upstream/main'
SinaChavoshi Jun 6, 2025
0ce459c
Merge branch 'main' into inf_pool_tests_11
SinaChavoshi Jun 6, 2025
3b884d6
intermediate update
SinaChavoshi Jun 6, 2025
d90eae0
fix the test run
SinaChavoshi Jun 6, 2025
73731e3
factor out common code
SinaChavoshi Jun 6, 2025
b57fb8a
Merge remote-tracking branch 'upstream/main'
SinaChavoshi Jun 9, 2025
6ee73d5
Merge branch 'main' into inf_pool_tests_11
SinaChavoshi Jun 9, 2025
b239930
move epp def to shared manifest
SinaChavoshi Jun 9, 2025
66b8426
remove extra comments
SinaChavoshi Jun 9, 2025
9432280
revert back to two epps
SinaChavoshi Jun 9, 2025
ad82e88
Merge remote-tracking branch 'upstream/main' into inf_pool_tests_11
SinaChavoshi Jun 13, 2025
04f52f3
add to do for epp image
SinaChavoshi Jun 16, 2025
d6b588e
switch to GeneralMustHaveConditionTimeout
SinaChavoshi Jun 16, 2025
112d878
undo gateway version changes
SinaChavoshi Jun 16, 2025
120feb3
remove unused HTTPRouteMustHaveConditions
SinaChavoshi Jun 16, 2025
8214cdf
update doc string for GetPod
SinaChavoshi Jun 16, 2025
76cb644
update docstring
SinaChavoshi Jun 16, 2025
5dca67b
Remove resource type from names in manifests.
SinaChavoshi Jun 16, 2025
f2c0602
remove type from name
SinaChavoshi Jun 17, 2025
daeb8e6
remove health check
SinaChavoshi Jun 17, 2025
f1ab79f
Merge remote-tracking branch 'upstream/main' into inf_pool_tests_11
SinaChavoshi Jun 17, 2025
81562a2
add todo for combining getpod methods
SinaChavoshi Jun 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
Copyright 2025 The Kubernetes Authors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package basic

import (
"testing"

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1"
"sigs.k8s.io/gateway-api/conformance/utils/suite"

// Import the tests package to append to ConformanceTests
"sigs.k8s.io/gateway-api-inference-extension/conformance/tests"
"sigs.k8s.io/gateway-api-inference-extension/conformance/utils/config"
infrakubernetes "sigs.k8s.io/gateway-api-inference-extension/conformance/utils/kubernetes"
gatewaykubernetes "sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
)

func init() {
tests.ConformanceTests = append(tests.ConformanceTests, HTTPRouteMultipleRulesDifferentPools)
}

// HTTPRouteMultipleRulesDifferentPools defines the test case for validating
// that an HTTPRoute can successfully route to multiple distinct InferencePools
// based on different rules.
var HTTPRouteMultipleRulesDifferentPools = suite.ConformanceTest{
ShortName: "HTTPRouteMultipleRulesDifferentPools",
Description: "Validates that a single HTTPRoute can route to multiple different InferencePools based on distinct rules.",
Manifests: []string{"tests/basic/inferencepool_multiple_rules_different_pools.yaml"},
Test: func(t *testing.T, s *suite.ConformanceTestSuite) {
const (
appBackendNamespace = "gateway-conformance-app-backend"
infraNamespace = "gateway-conformance-infra"
httpRouteName = "httproute-multi-pool-rules"
poolAName = "pool-a"
poolBName = "pool-b"
gatewayName = "conformance-gateway"
)

routeNN := types.NamespacedName{Name: httpRouteName, Namespace: appBackendNamespace}
poolANN := types.NamespacedName{Name: poolAName, Namespace: appBackendNamespace}
poolBNN := types.NamespacedName{Name: poolBName, Namespace: appBackendNamespace}
gatewayNN := types.NamespacedName{Name: gatewayName, Namespace: infraNamespace}

var timeoutConfig config.InferenceExtensionTimeoutConfig = config.DefaultInferenceExtensionTimeoutConfig()

t.Run("HTTPRoute should be Accepted and Reconciled", func(t *testing.T) {
acceptedCondition := metav1.Condition{
Type: string(gatewayv1.RouteConditionAccepted),
Status: metav1.ConditionTrue,
Reason: string(gatewayv1.RouteReasonAccepted),
}
gatewaykubernetes.HTTPRouteMustHaveCondition(t, s.Client, timeoutConfig.TimeoutConfig, routeNN, gatewayNN, acceptedCondition)
t.Logf("HTTPRoute %s is Accepted by Gateway %s", routeNN.String(), gatewayNN.String())

reconciledCondition := metav1.Condition{
Type: string(gatewayv1.RouteConditionType("Reconciled")),
Status: metav1.ConditionTrue,
Reason: "ReconciliationSucceeded",
}
gatewaykubernetes.HTTPRouteMustHaveCondition(t, s.Client, timeoutConfig.TimeoutConfig, routeNN, gatewayNN, reconciledCondition)
t.Logf("HTTPRoute %s is Reconciled by Gateway %s", routeNN.String(), gatewayNN.String())
})

t.Run("InferencePool A should be Accepted", func(t *testing.T) {
acceptedCondition := metav1.Condition{
Type: string(gatewayv1.RouteConditionAccepted),
Status: metav1.ConditionTrue,
Reason: string(gatewayv1.RouteReasonAccepted),
}
infrakubernetes.InferencePoolMustHaveCondition(t, s.Client, poolANN, acceptedCondition)
t.Logf("InferencePool %s parent status shows Accepted by Gateway %s (via HTTPRoute %s)", poolANN.String(), gatewayNN.String(), routeNN.String())
})

t.Run("InferencePool B should be Accepted", func(t *testing.T) {
acceptedCondition := metav1.Condition{
Type: string(gatewayv1.RouteConditionAccepted),
Status: metav1.ConditionTrue,
Reason: string(gatewayv1.RouteReasonAccepted),
}
infrakubernetes.InferencePoolMustHaveCondition(t, s.Client, poolBNN, acceptedCondition)
t.Logf("InferencePool %s parent status shows Accepted by Gateway %s (via HTTPRoute %s)", poolBNN.String(), gatewayNN.String(), routeNN.String())
})
},
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,179 @@
# httproute_multiple_rules_different_pools.yaml
# This manifest defines resources for the httproute_multiple_rules_different_pools conformance test.
# It includes two distinct backend deployments, two InferencePools selecting these deployments,
# and an HTTPRoute with multiple rules targeting these different InferencePools.

# --- Backend Deployment A ---
apiVersion: apps/v1
kind: Deployment
metadata:
name: multi-pool-backend-a-deployment
namespace: gateway-conformance-app-backend
labels:
app: multi-pool-backend-a
spec:
replicas: 1
selector:
matchLabels:
app: multi-pool-backend-a
template:
metadata:
labels:
app: multi-pool-backend-a
spec:
containers:
- name: agnhost-echo-a
image: k8s.gcr.io/e2e-test-images/agnhost:2.39
args:
- serve-hostname
- --port=8080
ports:
- name: http
containerPort: 8080
readinessProbe:
httpGet:
path: /
port: 8080
initialDelaySeconds: 3
periodSeconds: 5
failureThreshold: 2

---
# --- Service for Backend Deployment A (EPP for pool-a) ---
apiVersion: v1
kind: Service
metadata:
name: pool-a-epp
namespace: gateway-conformance-app-backend
spec:
selector:
app: multi-pool-backend-a
ports:
- name: http
protocol: TCP
port: 8080
targetPort: 8080
- name: epp
protocol: TCP
port: 9002
targetPort: 9002

---
# --- Backend Deployment B ---
apiVersion: apps/v1
kind: Deployment
metadata:
name: multi-pool-backend-b-deployment
namespace: gateway-conformance-app-backend
labels:
app: multi-pool-backend-b
spec:
replicas: 1
selector:
matchLabels:
app: multi-pool-backend-b
template:
metadata:
labels:
app: multi-pool-backend-b
spec:
containers:
- name: agnhost-echo-b
image: k8s.gcr.io/e2e-test-images/agnhost:2.39
args:
- serve-hostname
- --port=8080
ports:
- name: http
containerPort: 8080
readinessProbe:
httpGet:
path: /
port: 8080
initialDelaySeconds: 3
periodSeconds: 5
failureThreshold: 2

---
# --- Service for Backend Deployment B (EPP for pool-b) ---
apiVersion: v1
kind: Service
metadata:
name: pool-b-epp
namespace: gateway-conformance-app-backend
spec:
selector:
app: multi-pool-backend-b
ports:
- name: http
protocol: TCP
port: 8080
targetPort: 8080
- name: epp
protocol: TCP
port: 9002
targetPort: 9002

---
# --- InferencePool A Definition ---
apiVersion: inference.networking.x-k8s.io/v1alpha2
kind: InferencePool
metadata:
name: pool-a
namespace: gateway-conformance-app-backend
spec:
selector:
app: "multi-pool-backend-a"
targetPortNumber: 8080
extensionRef:
name: pool-a-epp

---
# --- InferencePool B Definition ---
apiVersion: inference.networking.x-k8s.io/v1alpha2
kind: InferencePool
metadata:
name: pool-b
namespace: gateway-conformance-app-backend
spec:
selector:
app: "multi-pool-backend-b"
targetPortNumber: 8080
extensionRef:
name: pool-b-epp

---
# --- HTTPRoute Definition for Multiple Pools ---
apiVersion: gateway.networking.k8s.io/v1
kind: HTTPRoute
metadata:
name: httproute-multi-pool-rules
namespace: gateway-conformance-app-backend
spec:
parentRefs:
- group: gateway.networking.k8s.io
kind: Gateway
name: conformance-gateway
namespace: gateway-conformance-infra
sectionName: http
rules:
- matches:
- path:
type: PathPrefix
value: /app-a
backendRefs:
- group: inference.networking.x-k8s.io
kind: InferencePool
name: pool-a
port: 8080
weight: 1
- matches:
- path:
type: PathPrefix
value: /app-b
backendRefs:
- group: inference.networking.x-k8s.io
kind: InferencePool
name: pool-b
port: 8080
weight: 1
10 changes: 9 additions & 1 deletion conformance/utils/config/timing.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,21 @@ type InferenceExtensionTimeoutConfig struct {

// GatewayObjectPollInterval is the polling interval used when waiting for a Gateway object to appear.
GatewayObjectPollInterval time.Duration

// HTTPRouteConditionTimeout represents the maximum time to wait for an HTTPRoute to have a specific condition.
HTTPRouteConditionTimeout time.Duration
}

func DefaultInferenceExtensionTimeoutConfig() InferenceExtensionTimeoutConfig {
// Create a local timeout config to modify some values for Inference specific senarios.
modifiedTimeoutConfig := gatewayconfig.DefaultTimeoutConfig()
modifiedTimeoutConfig.HTTPRouteMustHaveCondition = 5 * time.Minute // Increased timeout to 5 minutes

return InferenceExtensionTimeoutConfig{
TimeoutConfig: gatewayconfig.DefaultTimeoutConfig(),
TimeoutConfig: modifiedTimeoutConfig,
InferencePoolMustHaveConditionTimeout: 300 * time.Second,
InferencePoolMustHaveConditionInterval: 10 * time.Second,
GatewayObjectPollInterval: 5 * time.Second,
HTTPRouteConditionTimeout: 300 * time.Second,
}
}