Skip to content

Commit fbe2946

Browse files
zetxqxrlakhtakia
zetxqx
authored and
rlakhtakia
committed
Work around for gke gateway implementation.
1 parent c06fdfc commit fbe2946

File tree

5 files changed

+160
-3
lines changed

5 files changed

+160
-3
lines changed

‎conformance/conformance.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"io/fs"
2626
"os"
2727
"testing"
28+
"time"
2829

2930
"github.com/stretchr/testify/require"
3031
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -156,6 +157,10 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
156157

157158
baseManifestsValue := "resources/manifests/manifests.yaml"
158159

160+
// DO NOT SUBMIT: delete before submitting
161+
timeConfig := confconfig.DefaultTimeoutConfig()
162+
timeConfig.HTTPRouteMustHaveCondition = 600 * time.Second
163+
timeConfig.MaxTimeToConsistency = 600 * time.Second
159164
opts := confsuite.ConformanceOptions{
160165
Client: c,
161166
ClientOptions: clientOptions,
@@ -166,7 +171,11 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
166171
Debug: *confflags.ShowDebug,
167172
CleanupBaseResources: *confflags.CleanupBaseResources,
168173
SupportedFeatures: sets.New[features.FeatureName](),
174+
<<<<<<< HEAD
169175
TimeoutConfig: inferenceconfig.DefaultInferenceExtensionTimeoutConfig().TimeoutConfig,
176+
=======
177+
TimeoutConfig: timeConfig,
178+
>>>>>>> 1a88ce7 (Work around for gke gateway implementation.)
170179
SkipTests: skipTests,
171180
ExemptFeatures: exemptFeatures,
172181
RunTest: *confflags.RunTest,

‎conformance/tests/basic/inferencepool_httproute_port_validation.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,12 @@ var InferencePoolHTTPRoutePortValidation = suite.ConformanceTest{
114114
backendDeploymentName,
115115
appBackendNamespace,
116116
)
117+
gwapihttp.MakeRequestAndExpectEventuallyConsistentResponse(t, s.RoundTripper, s.TimeoutConfig, gatewayAddr, expectedResponse)
118+
119+
// t.Logf("Successfully verified HTTPRoute %s has conditions: Accepted=True and ResolvedRefs=False (Reason: %s) for Gateway %s due to port mismatch",
120+
// routeNN.String(), resolvedRefsCondition.Reason, gatewayNN.String())
121+
t.Logf("Successfully verified HTTPRoute %s has conditions: Accepted=True and ResolvedRefs=False (Reason: %s) for Gateway %s due to port mismatch",
122+
routeNN.String(), "resolvedRefsCondition", gatewayNN.String())
117123
})
118124
},
119125
}

‎conformance/tests/basic/inferencepool_httproute_port_validation.yaml‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,145 @@
1+
<<<<<<< HEAD
2+
=======
3+
# conformance/tests/basic/inferencepool_httproute_port_validation.yaml
4+
5+
# --- Backend Deployment (reusing standard echoserver) ---
6+
7+
apiVersion: apps/v1
8+
kind: Deployment
9+
metadata:
10+
name: infra-backend-deployment-port-test
11+
namespace: gateway-conformance-app-backend
12+
labels:
13+
app: infra-backend-port-test
14+
spec:
15+
replicas: 1
16+
selector:
17+
matchLabels:
18+
app: infra-backend-port-test
19+
template:
20+
metadata:
21+
labels:
22+
app: infra-backend-port-test
23+
spec:
24+
containers:
25+
- name: echoserver
26+
image: gcr.io/k8s-staging-gateway-api/echo-basic:v20240412-v1.0.0-394-g40c666fd
27+
ports:
28+
- containerPort: 3000
29+
readinessProbe:
30+
httpGet:
31+
path: /
32+
port: 3000
33+
initialDelaySeconds: 3
34+
periodSeconds: 5
35+
failureThreshold: 2
36+
env:
37+
- name: POD_NAME
38+
valueFrom:
39+
fieldRef:
40+
fieldPath: metadata.name
41+
- name: NAMESPACE
42+
valueFrom:
43+
fieldRef:
44+
fieldPath: metadata.namespace
45+
---
46+
# --- Backend Service ---
47+
# Service for the infra-backend-deployment-port-test.
48+
apiVersion: v1
49+
kind: Service
50+
metadata:
51+
name: infra-backend-svc-port-test
52+
namespace: gateway-conformance-app-backend
53+
spec:
54+
selector:
55+
app: infra-backend-port-test
56+
ports:
57+
- name: http
58+
port: 3000
59+
targetPort: 3000
60+
---
61+
# --- InferencePool Definition ---
62+
apiVersion: inference.networking.x-k8s.io/v1alpha2
63+
kind: InferencePool
64+
metadata:
65+
name: target-pool-port-validation
66+
namespace: gateway-conformance-app-backend
67+
spec:
68+
selector:
69+
app: "infra-backend-port-test"
70+
targetPortNumber: 3000
71+
extensionRef:
72+
name: target-pool-port-validation-epp
73+
---
74+
apiVersion: v1
75+
kind: Service
76+
metadata:
77+
name: target-pool-port-validation-epp
78+
namespace: gateway-conformance-app-backend
79+
spec:
80+
selector:
81+
app: target-pool-port-validation-epp
82+
ports:
83+
- protocol: TCP
84+
port: 9002
85+
targetPort: 9002
86+
appProtocol: http2
87+
type: ClusterIP
88+
---
89+
apiVersion: apps/v1
90+
kind: Deployment
91+
metadata:
92+
name: target-pool-port-validation-epp
93+
namespace: gateway-conformance-app-backend
94+
labels:
95+
app: target-pool-port-validation-epp
96+
spec:
97+
replicas: 1
98+
selector:
99+
matchLabels:
100+
app: target-pool-port-validation-epp
101+
template:
102+
metadata:
103+
labels:
104+
app: target-pool-port-validation-epp
105+
spec:
106+
terminationGracePeriodSeconds: 130
107+
containers:
108+
- name: epp
109+
image: us-central1-docker.pkg.dev/k8s-staging-images/gateway-api-inference-extension/epp:main
110+
imagePullPolicy: Always
111+
args:
112+
- -poolName
113+
- "target-pool-port-validation"
114+
- "-poolNamespace"
115+
- "gateway-conformance-app-backend"
116+
- -v
117+
- "4"
118+
- --zap-encoder
119+
- "json"
120+
- -grpcPort
121+
- "9002"
122+
- -grpcHealthPort
123+
- "9003"
124+
ports:
125+
- containerPort: 9002
126+
- containerPort: 9003
127+
- name: metrics
128+
containerPort: 9090
129+
livenessProbe:
130+
grpc:
131+
port: 9003
132+
service: inference-extension
133+
initialDelaySeconds: 5
134+
periodSeconds: 10
135+
readinessProbe:
136+
grpc:
137+
port: 9003
138+
service: inference-extension
139+
initialDelaySeconds: 5
140+
periodSeconds: 10
141+
---
142+
>>>>>>> 1a88ce7 (Work around for gke gateway implementation.)
1143
# --- HTTPRoute Scenario 1: Port Unspecified ---
2144
---
3145
apiVersion: gateway.networking.k8s.io/v1

‎conformance/utils/config/timing.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,9 @@ type InferenceExtensionTimeoutConfig struct {
4747
func DefaultInferenceExtensionTimeoutConfig() InferenceExtensionTimeoutConfig {
4848
config := gatewayconfig.DefaultTimeoutConfig()
4949
config.HTTPRouteMustHaveCondition = 300 * time.Second
50-
config.MaxTimeToConsistency = 200 * time.Second
51-
config.DefaultTestTimeout = 600 * time.Second
5250
return InferenceExtensionTimeoutConfig{
5351
TimeoutConfig: config, // Initialize embedded struct
54-
GeneralMustHaveConditionTimeout: 300 * time.Second,
52+
InferencePoolMustHaveConditionTimeout: 300 * time.Second,
5553
InferencePoolMustHaveConditionInterval: 10 * time.Second,
5654
GatewayObjectPollInterval: 5 * time.Second,
5755
HTTPRouteDeletionReconciliationTimeout: 5 * time.Second,

‎go.sum‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,8 @@ sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytI
323323
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
324324
sigs.k8s.io/controller-tools v0.17.3 h1:lwFPLicpBKLgIepah+c8ikRBubFW5kOQyT88r3EwfNw=
325325
sigs.k8s.io/controller-tools v0.17.3/go.mod h1:1ii+oXcYZkxcBXzwv3YZBlzjt1fvkrCGjVF73blosJI=
326+
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
327+
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
326328
sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
327329
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
328330
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

0 commit comments

Comments
 (0)