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 dcf537c2ad..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" @@ -49,47 +48,15 @@ func TestGatewayAPIConformance(t *testing.T) { } cSuite := suite.New(suite.Options{ - Client: client, - GatewayClassName: *flags.GatewayClassName, - Debug: *flags.ShowDebug, - CleanupBaseResources: *flags.CleanupBaseResources, - ValidUniqueListenerPorts: validUniqueListenerPorts, - SupportedFeatures: sets.New( - suite.SupportHTTPRouteQueryParamMatching, - suite.SupportReferenceGrant, - suite.SupportHTTPResponseHeaderModification, - suite.SupportHTTPRouteMethodMatching, - suite.SupportRouteDestinationPortMatching, - ), + Client: client, + GatewayClassName: *flags.GatewayClassName, + Debug: *flags.ShowDebug, + CleanupBaseResources: *flags.CleanupBaseResources, + ValidUniqueListenerPorts: validUniqueListenerPorts, + EnableAllSupportedFeatures: true, }) + 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) }