From 3065e97506ab1a37b1f154f27c4bda22ea93fc57 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Wed, 7 Dec 2022 18:39:02 -0800 Subject: [PATCH 1/4] Run all core and extended conformance tests Signed-off-by: Arko Dasgupta --- test/conformance/conformance_test.go | 37 ++-------------------------- 1 file changed, 2 insertions(+), 35 deletions(-) diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index dcf537c2ad..37f020865f 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -54,42 +54,9 @@ func TestGatewayAPIConformance(t *testing.T) { Debug: *flags.ShowDebug, CleanupBaseResources: *flags.CleanupBaseResources, ValidUniqueListenerPorts: validUniqueListenerPorts, - SupportedFeatures: sets.New( - suite.SupportHTTPRouteQueryParamMatching, - suite.SupportReferenceGrant, - suite.SupportHTTPResponseHeaderModification, - suite.SupportHTTPRouteMethodMatching, - suite.SupportRouteDestinationPortMatching, - ), }) + cSuite.Setup(t) - egTests := []suite.ConformanceTest{ - tests.HTTPRouteSimpleSameNamespace, - tests.HTTPRouteRequestHeaderModifier, - tests.HTTPRouteResponseHeaderModifier, - tests.HTTPRouteQueryParamMatching, - tests.HTTPRouteInvalidCrossNamespaceParentRef, - tests.HTTPExactPathMatching, - tests.HTTPRouteCrossNamespace, - tests.HTTPRouteHeaderMatching, - tests.HTTPRouteMethodMatching, - tests.HTTPRouteMatching, - tests.HTTPRouteMatchingAcrossRoutes, - tests.HTTPRouteHostnameIntersection, - tests.HTTPRouteListenerHostnameMatching, - tests.HTTPRouteInvalidNonExistentBackendRef, - tests.HTTPRouteInvalidBackendRefUnknownKind, - tests.HTTPRouteInvalidCrossNamespaceBackendRef, - tests.GatewaySecretReferenceGrantAllInNamespace, - tests.GatewaySecretReferenceGrantSpecific, - tests.GatewaySecretMissingReferenceGrant, - tests.GatewaySecretInvalidReferenceGrant, - tests.GatewayInvalidTLSConfiguration, - tests.GatewayInvalidRouteKind, - tests.HTTPRouteReferenceGrant, - tests.HTTPRoutePartiallyInvalidViaInvalidReferenceGrant, - tests.HTTPRouteInvalidParentRefNotMatchingListenerPort, - } - cSuite.Run(t, egTests) + cSuite.Run(t, tests.ConformanceTests) } From fa332e7f65430a216b92e4390c4a9f7de4d087d6 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 7 Feb 2023 10:28:07 -0800 Subject: [PATCH 2/4] update to main Signed-off-by: Arko Dasgupta --- go.mod | 2 +- go.sum | 4 ++-- test/conformance/conformance_test.go | 11 ++++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index c8f16e2071..f207c1dfb8 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect k8s.io/apiextensions-apiserver v0.26.1 // indirect k8s.io/component-base v0.26.1 // indirect - k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/klog/v2 v2.90.0 // indirect k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect diff --git a/go.sum b/go.sum index 04b73bff51..c056940915 100644 --- a/go.sum +++ b/go.sum @@ -710,8 +710,8 @@ k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= -k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= -k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.90.0 h1:VkTxIV/FjRXn1fgNNcKGM8cfmL1Z33ZjXRTVxKCoF5M= +k8s.io/klog/v2 v2.90.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 37f020865f..6f8c8ec410 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -49,11 +49,12 @@ func TestGatewayAPIConformance(t *testing.T) { } cSuite := suite.New(suite.Options{ - Client: client, - GatewayClassName: *flags.GatewayClassName, - Debug: *flags.ShowDebug, - CleanupBaseResources: *flags.CleanupBaseResources, - ValidUniqueListenerPorts: validUniqueListenerPorts, + Client: client, + GatewayClassName: *flags.GatewayClassName, + Debug: *flags.ShowDebug, + CleanupBaseResources: *flags.CleanupBaseResources, + ValidUniqueListenerPorts: validUniqueListenerPorts, + EnableAllSupportedFeatures: true, }) cSuite.Setup(t) From c238572b88d16a03a92ca52f88d3a587b489da8a Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 7 Feb 2023 10:54:28 -0800 Subject: [PATCH 3/4] temp pin crd version Signed-off-by: Arko Dasgupta --- tools/make/kube.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/make/kube.mk b/tools/make/kube.mk index 2566656755..6210b0be42 100644 --- a/tools/make/kube.mk +++ b/tools/make/kube.mk @@ -2,7 +2,7 @@ ENVTEST_K8S_VERSION ?= 1.24.1 # GATEWAY_API_VERSION refers to the version of Gateway API CRDs. # For more details, see https://gateway-api.sigs.k8s.io/guides/getting-started/#installing-gateway-api -GATEWAY_API_VERSION ?= $(shell go list -m -f '{{.Version}}' sigs.k8s.io/gateway-api) +GATEWAY_API_VERSION ?= v0.6.0 GATEWAY_RELEASE_URL ?= https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/experimental-install.yaml From 1a7205fadc8af9e3e1ca1dc189eae2dd3c161f5e Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Wed, 8 Feb 2023 12:26:13 -0800 Subject: [PATCH 4/4] test main Signed-off-by: Arko Dasgupta --- test/conformance/conformance_test.go | 1 - tools/make/kube.mk | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/test/conformance/conformance_test.go b/test/conformance/conformance_test.go index 6f8c8ec410..9f76510322 100644 --- a/test/conformance/conformance_test.go +++ b/test/conformance/conformance_test.go @@ -13,7 +13,6 @@ import ( "testing" "github.com/stretchr/testify/require" - "k8s.io/apimachinery/pkg/util/sets" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/gateway-api/apis/v1alpha2" diff --git a/tools/make/kube.mk b/tools/make/kube.mk index 6210b0be42..2566656755 100644 --- a/tools/make/kube.mk +++ b/tools/make/kube.mk @@ -2,7 +2,7 @@ ENVTEST_K8S_VERSION ?= 1.24.1 # GATEWAY_API_VERSION refers to the version of Gateway API CRDs. # For more details, see https://gateway-api.sigs.k8s.io/guides/getting-started/#installing-gateway-api -GATEWAY_API_VERSION ?= v0.6.0 +GATEWAY_API_VERSION ?= $(shell go list -m -f '{{.Version}}' sigs.k8s.io/gateway-api) GATEWAY_RELEASE_URL ?= https://github.com/kubernetes-sigs/gateway-api/releases/download/${GATEWAY_API_VERSION}/experimental-install.yaml