build(deps): bump sigs.k8s.io/gateway-api from 1.1.0 to 1.2.1

.codespell.ignorewords

@@ -9,3 +9,4 @@ aks
 immediatedly
 te
 NotIn
+maxmimum

go.mod

@@ -45,7 +45,7 @@ require (
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
 	sigs.k8s.io/controller-runtime v0.19.3
 	sigs.k8s.io/controller-tools v0.16.5
-	sigs.k8s.io/gateway-api v1.1.0
+	sigs.k8s.io/gateway-api v1.2.1
 	sigs.k8s.io/kustomize/kyaml v0.18.1
 )
 

go.sum

@@ -810,8 +810,8 @@ sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8b
 sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
 sigs.k8s.io/controller-tools v0.16.5 h1:5k9FNRqziBPwqr17AMEPPV/En39ZBplLAdOwwQHruP4=
 sigs.k8s.io/controller-tools v0.16.5/go.mod h1:8vztuRVzs8IuuJqKqbXCSlXcw+lkAv/M2sTpg55qjMY=
-sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
-sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
+sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
+sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
 sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
 sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=

internal/dag/builder_test.go

@@ -5064,7 +5064,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 						Rules: []gatewayapi_v1.GRPCRouteRule{{
 							Matches: []gatewayapi_v1.GRPCRouteMatch{{
 								Method:  gatewayapi.GRPCMethodMatch(gatewayapi_v1.GRPCMethodMatchExact, "io.projectcontour", "Login"),
-								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.HeaderMatchExact, "version", "2"),
+								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.GRPCHeaderMatchExact, "version", "2"),
 							}},
 							BackendRefs: gatewayapi.GRPCRouteBackendRef("kuard", 8080, 1),
 						}},
@@ -5106,7 +5106,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 						Rules: []gatewayapi_v1.GRPCRouteRule{{
 							Matches: []gatewayapi_v1.GRPCRouteMatch{{
 								Method:  gatewayapi.GRPCMethodMatch(gatewayapi_v1.GRPCMethodMatchExact, "io.projectcontour", "Login"),
-								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.HeaderMatchRegularExpression, "version", "2+"),
+								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.GRPCHeaderMatchRegularExpression, "version", "2+"),
 							}},
 							BackendRefs: gatewayapi.GRPCRouteBackendRef("kuard", 8080, 1),
 						}},
@@ -5147,7 +5147,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
 						},
 						Rules: []gatewayapi_v1.GRPCRouteRule{{
 							Matches: []gatewayapi_v1.GRPCRouteMatch{{
-								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.HeaderMatchExact, "version", "2"),
+								Headers: gatewayapi.GRPCHeaderMatch(gatewayapi_v1.GRPCHeaderMatchExact, "version", "2"),
 							}},
 							BackendRefs: gatewayapi.GRPCRouteBackendRef("kuard", 8080, 1),
 						}},

internal/dag/gatewayapi_processor.go

@@ -1727,10 +1727,10 @@ func gatewayGRPCHeaderMatchConditions(matches []gatewayapi_v1.GRPCHeaderMatch) (
 	for _, match := range matches {
 		// "Exact" and "RegularExpression" are the only supported match types. If match type is not specified, use "Exact" as default.
 		var matchType string
-		switch ptr.Deref(match.Type, gatewayapi_v1.HeaderMatchExact) {
-		case gatewayapi_v1.HeaderMatchExact:
+		switch ptr.Deref(match.Type, gatewayapi_v1.GRPCHeaderMatchExact) {
+		case gatewayapi_v1.GRPCHeaderMatchExact:
 			matchType = HeaderMatchTypeExact
-		case gatewayapi_v1.HeaderMatchRegularExpression:
+		case gatewayapi_v1.GRPCHeaderMatchRegularExpression:
 			if err := ValidateRegex(match.Value); err != nil {
 				return nil, fmt.Errorf("GRPCRoute.Spec.Rules.Matches.Headers: Invalid value for RegularExpression match type is specified")
 			}

internal/dag/status_test.go

@@ -10754,7 +10754,7 @@ func TestGatewayAPIGRPCRouteDAGStatus(t *testing.T) {
 							},
 							Headers: []gatewayapi_v1.GRPCHeaderMatch{
 								{
-									Type:  ptr.To(gatewayapi_v1.HeaderMatchType("UNKNOWN")), // <---- unknown type to break the test
+									Type:  ptr.To(gatewayapi_v1.GRPCHeaderMatchType("UNKNOWN")), // <---- unknown type to break the test
 									Name:  gatewayapi_v1.GRPCHeaderName("foo"),
 									Value: "bar",
 								},
@@ -10809,7 +10809,7 @@ func TestGatewayAPIGRPCRouteDAGStatus(t *testing.T) {
 							},
 							Headers: []gatewayapi_v1.GRPCHeaderMatch{
 								{
-									Type:  ptr.To(gatewayapi_v1.HeaderMatchRegularExpression),
+									Type:  ptr.To(gatewayapi_v1.GRPCHeaderMatchRegularExpression),
 									Name:  gatewayapi_v1.GRPCHeaderName("foo"),
 									Value: "invalid(-)regex)",
 								},

internal/gatewayapi/helpers.go

@@ -173,7 +173,7 @@ func GRPCMethodMatch(matchType gatewayapi_v1.GRPCMethodMatchType, service, metho
 	}
 }
 
-func GRPCHeaderMatch(matchType gatewayapi_v1.HeaderMatchType, name, value string) []gatewayapi_v1.GRPCHeaderMatch {
+func GRPCHeaderMatch(matchType gatewayapi_v1.GRPCHeaderMatchType, name, value string) []gatewayapi_v1.GRPCHeaderMatch {
 	return []gatewayapi_v1.GRPCHeaderMatch{
 		{
 			Type:  ptr.To(matchType),

internal/provisioner/controller/gateway_test.go

@@ -1276,13 +1276,13 @@ func TestGatewayReconcile(t *testing.T) {
 				Spec: gatewayapi_v1.GatewaySpec{
 					GatewayClassName: gatewayapi_v1.ObjectName("gatewayclass-1"),
 					Infrastructure: &gatewayapi_v1.GatewayInfrastructure{
-						Labels: map[gatewayapi_v1.AnnotationKey]gatewayapi_v1.AnnotationValue{
-							gatewayapi_v1.AnnotationKey("projectcontour.io/label-1"): gatewayapi_v1.AnnotationValue("label-value-1"),
-							gatewayapi_v1.AnnotationKey("projectcontour.io/label-2"): gatewayapi_v1.AnnotationValue("label-value-2"),
+						Labels: map[gatewayapi_v1.LabelKey]gatewayapi_v1.LabelValue{
+							"projectcontour.io/label-1": "label-value-1",
+							"projectcontour.io/label-2": "label-value-2",
 						},
 						Annotations: map[gatewayapi_v1.AnnotationKey]gatewayapi_v1.AnnotationValue{
-							gatewayapi_v1.AnnotationKey("projectcontour.io/annotation-1"): gatewayapi_v1.AnnotationValue("annotation-value-1"),
-							gatewayapi_v1.AnnotationKey("projectcontour.io/annotation-2"): gatewayapi_v1.AnnotationValue("annotation-value-2"),
+							"projectcontour.io/annotation-1": "annotation-value-1",
+							"projectcontour.io/annotation-2": "annotation-value-2",
 						},
 					},
 				},

internal/provisioner/controller/gatewayclass.go

@@ -39,7 +39,7 @@ import (
 
 const (
 	gatewayAPIBundleVersionAnnotation   = "gateway.networking.k8s.io/bundle-version"
-	gatewayAPICRDBundleSupportedVersion = "v1.1.0"
+	gatewayAPICRDBundleSupportedVersion = "v1.2.1"
 )
 
 // gatewayClassReconciler reconciles GatewayClass objects.

internal/provisioner/controller/gatewayclass_test.go

@@ -556,7 +556,7 @@ func TestGatewayClassReconcile(t *testing.T) {
 					// contrived way to cause this scenario.
 					Name: "gatewayclasses-wrong.gateway.networking.k8s.io",
 					Annotations: map[string]string{
-						"gateway.networking.k8s.io/bundle-version": "v1.1.0",
+						gatewayAPIBundleVersionAnnotation: gatewayAPICRDBundleSupportedVersion,
 					},
 				},
 			},
@@ -589,7 +589,7 @@ func TestGatewayClassReconcile(t *testing.T) {
 				ObjectMeta: meta_v1.ObjectMeta{
 					Name: "gatewayclasses.gateway.networking.k8s.io",
 					Annotations: map[string]string{
-						"gateway.networking.k8s.io/bundle-version-wrong": "v1.1.0",
+						"gateway.networking.k8s.io/bundle-version-wrong": gatewayAPICRDBundleSupportedVersion,
 					},
 				},
 			},
@@ -676,7 +676,7 @@ func TestGatewayClassReconcile(t *testing.T) {
 					ObjectMeta: meta_v1.ObjectMeta{
 						Name: "gatewayclasses.gateway.networking.k8s.io",
 						Annotations: map[string]string{
-							"gateway.networking.k8s.io/bundle-version": "v1.1.0",
+							gatewayAPIBundleVersionAnnotation: gatewayAPICRDBundleSupportedVersion,
 						},
 					},
 				})

site/content/resources/compatibility-matrix.md

@@ -10,7 +10,7 @@ These combinations of versions are specifically tested in CI and supported by th
 
 | Contour Version | Envoy Version        | Kubernetes Versions | Gateway API Version |
 | --------------- | :------------------- | ------------------- | --------------------|
-| main            | [1.32.0][65]         | 1.32, 1.31, 1.30    | [1.1.0][111]        |
+| main            | [1.32.0][65]         | 1.32, 1.31, 1.30    | [1.2.1][112]        |
 | 1.30.1          | [1.31.3][64]         | 1.30, 1.29, 1.28    | [1.1.0][111]        |
 | 1.30.0          | [1.31.0][60]         | 1.30, 1.29, 1.28    | [1.1.0][111]        |
 | 1.29.3          | [1.30.7][63]         | 1.29, 1.28, 1.27    | [1.0.0][110]        |
@@ -230,3 +230,4 @@ __Note:__ This list of extensions was last verified to be complete with Envoy v1
 [109]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v0.8.1
 [110]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.0.0
 [111]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.1.0
+[112]: https://github.com/kubernetes-sigs/gateway-api/releases/tag/v1.2.1

test/conformance/gatewayapi/gateway_conformance_test.go

@@ -67,6 +67,7 @@ func TestGatewayConformance(t *testing.T) {
 		// This clientset is needed in addition to the client only because
 		// controller-runtime client doesn't support non CRUD sub-resources yet (https://github.com/kubernetes-sigs/controller-runtime/issues/452).
 		Clientset:                  clientset,
+		RestConfig:                 cfg,
 		GatewayClassName:           *flags.GatewayClassName,
 		Debug:                      *flags.ShowDebug,
 		CleanupBaseResources:       *flags.CleanupBaseResources,
@@ -138,7 +139,18 @@ func TestGatewayConformance(t *testing.T) {
 		// exclude tests we don't want to run using the ExemptFeatures
 		// field.
 		options.EnableAllSupportedFeatures = false
-		options.SupportedFeatures = features.AllFeatures.Delete(append(features.MeshCoreFeatures.UnsortedList(), features.UDPRouteFeatures.UnsortedList()...)...)
+
+		supportedFeatures := features.AllFeatures
+		supportedFeatures.Delete(features.MeshCoreFeatures.UnsortedList()...)
+		// As of GWAPI 1.2.1 UDPRouteFeatures is a different
+		// type than AllFeatures/MeshCoreFeatures hence the
+		// slightly different deletion syntax.
+		for _, f := range features.UDPRouteFeatures {
+			supportedFeatures.Delete(f)
+		}
+		for f := range supportedFeatures {
+			options.SupportedFeatures.Insert(f.Name)
+		}
 	}
 
 	conformance.RunConformanceWithOptions(t, options)

versions.yaml

@@ -9,11 +9,11 @@ versions:
     dependencies:
       envoy: "1.32.0"
       kubernetes:
+        - "1.32"
+        - "1.31"
         - "1.30"
-        - "1.29"
-        - "1.28"
       gateway-api:
-        - "1.1.0"
+        - "1.2.1"
   - version: v1.30.1
     supported: "true"
     dependencies: