Skip to content

Commit 0c24d26

Browse files
zetxqxrlakhtakia
authored andcommitted
feat(conformance): Add EPP conformance test for Gateway routing (kubernetes-sigs#961)
* Add gateway_following_epp_routing test. * One working version. * Okay version of GatwayFollowingEPPRouting conformance test. * fix typos and formats. * upgrader gateway-api versino to use the updated conformance testutils and small refactor. * use AllowCRDsMismatch to bypass. * format. * refactor more. * wire up the flag. * Refine test cases. * Refine log error info. * small timeout twek. * use common resource. * back to depend on gateway-api 1.30. * update go.sum. * format. * resolve minor comments. * remove seen logic. * trailing new line.
1 parent fbe2946 commit 0c24d26

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

conformance/conformance.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ import (
4646
// Import necessary types and utilities from the core Gateway API conformance suite.
4747
gatewayv1 "sigs.k8s.io/gateway-api/apis/v1" // Import core Gateway API types
4848
confapis "sigs.k8s.io/gateway-api/conformance/apis/v1" // Report struct definition
49+
"sigs.k8s.io/gateway-api/conformance/utils/config"
4950
confflags "sigs.k8s.io/gateway-api/conformance/utils/flags"
5051
apikubernetes "sigs.k8s.io/gateway-api/conformance/utils/kubernetes"
5152
confsuite "sigs.k8s.io/gateway-api/conformance/utils/suite"
@@ -158,7 +159,7 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
158159
baseManifestsValue := "resources/manifests/manifests.yaml"
159160

160161
// DO NOT SUBMIT: delete before submitting
161-
timeConfig := confconfig.DefaultTimeoutConfig()
162+
timeConfig := config.DefaultTimeoutConfig()
162163
timeConfig.HTTPRouteMustHaveCondition = 600 * time.Second
163164
timeConfig.MaxTimeToConsistency = 600 * time.Second
164165
opts := confsuite.ConformanceOptions{
@@ -171,11 +172,7 @@ func DefaultOptions(t *testing.T) confsuite.ConformanceOptions {
171172
Debug: *confflags.ShowDebug,
172173
CleanupBaseResources: *confflags.CleanupBaseResources,
173174
SupportedFeatures: sets.New[features.FeatureName](),
174-
<<<<<<< HEAD
175-
TimeoutConfig: inferenceconfig.DefaultInferenceExtensionTimeoutConfig().TimeoutConfig,
176-
=======
177175
TimeoutConfig: timeConfig,
178-
>>>>>>> 1a88ce7 (Work around for gke gateway implementation.)
179176
SkipTests: skipTests,
180177
ExemptFeatures: exemptFeatures,
181178
RunTest: *confflags.RunTest,

conformance/utils/config/timing.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,11 @@ 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
5052
return InferenceExtensionTimeoutConfig{
5153
TimeoutConfig: config, // Initialize embedded struct
52-
InferencePoolMustHaveConditionTimeout: 300 * time.Second,
54+
GeneralMustHaveConditionTimeout: 300 * time.Second,
5355
InferencePoolMustHaveConditionInterval: 10 * time.Second,
5456
GatewayObjectPollInterval: 5 * time.Second,
5557
HTTPRouteDeletionReconciliationTimeout: 5 * time.Second,

0 commit comments

Comments
 (0)