From dedb1826a7575e1f84d521aff13f0c83d1bc77af Mon Sep 17 00:00:00 2001 From: bitliu Date: Thu, 19 Oct 2023 15:20:33 +0800 Subject: [PATCH] fix: enable GatewayStaticAddresses conformance test Signed-off-by: bitliu --- test/conformance/conformance_test.go | 13 +++++++++++-- test/conformance/experimental_conformance_test.go | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 731b4a4d1a5..3475d9ed9a9 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -16,7 +16,7 @@ import ( "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" - "sigs.k8s.io/gateway-api/apis/v1" + v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1beta1" "sigs.k8s.io/gateway-api/conformance/tests" @@ -50,9 +50,18 @@ func TestGatewayAPIConformance(t *testing.T) { SkipTests: []string{ tests.GatewaySecretInvalidReferenceGrant.ShortName, tests.HTTPRouteRewritePath.ShortName, - tests.GatewayStaticAddresses.ShortName, }, ExemptFeatures: suite.MeshCoreFeatures, + UsableNetworkAddresses: []v1.GatewayAddress{ + { + Value: "1.2.3.4", + }, + }, + UnusableNetworkAddresses: []v1.GatewayAddress{ + { + Value: "4.3.2.1", + }, + }, }) cSuite.Setup(t) cSuite.Run(t, tests.ConformanceTests) diff --git a/test/conformance/experimental_conformance_test.go b/test/conformance/experimental_conformance_test.go index 7a59247ab31..33a5981bd6d 100644 --- a/test/conformance/experimental_conformance_test.go +++ b/test/conformance/experimental_conformance_test.go @@ -20,7 +20,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/yaml" - "sigs.k8s.io/gateway-api/apis/v1" + v1 "sigs.k8s.io/gateway-api/apis/v1" "sigs.k8s.io/gateway-api/apis/v1alpha2" "sigs.k8s.io/gateway-api/apis/v1beta1" confv1a1 "sigs.k8s.io/gateway-api/conformance/apis/v1alpha1" @@ -98,9 +98,18 @@ func experimentalConformance(t *testing.T) { SkipTests: []string{ tests.GatewaySecretInvalidReferenceGrant.ShortName, tests.HTTPRouteRewritePath.ShortName, - tests.GatewayStaticAddresses.ShortName, }, SupportedFeatures: sets.Set[suite.SupportedFeature]{}.Insert(suite.HTTPRouteExtendedFeatures.UnsortedList()...), + UsableNetworkAddresses: []v1.GatewayAddress{ + { + Value: "1.2.3.4", + }, + }, + UnusableNetworkAddresses: []v1.GatewayAddress{ + { + Value: "4.3.2.1", + }, + }, }, Implementation: *implementation, ConformanceProfiles: conformanceProfiles,