Skip to content

Commit 1744837

Browse files
authored
Update Gateway API version to 1.2.1 (#2868)
1 parent bda9ea2 commit 1744837

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ The following table lists the software versions NGINX Gateway Fabric supports.
6666

6767
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus |
6868
|----------------------|-------------|------------|-----------|------------|
69-
| Edge | 1.2.0 | 1.25+ | 1.27.3 | R33 |
69+
| Edge | 1.2.1 | 1.25+ | 1.27.3 | R33 |
7070
| 1.5.0 | 1.2.0 | 1.25+ | 1.27.2 | R33 |
7171
| 1.4.0 | 1.1.0 | 1.25+ | 1.27.1 | R32 |
7272
| 1.3.0 | 1.1.0 | 1.25+ | 1.27.0 | R32 |

cmd/gateway/validation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
)
1414

1515
const (
16-
// Regex from: https://github.com./kubernetes-sigs/gateway-api/blob/v1.2.0/apis/v1/shared_types.go#L647
16+
// Regex from: https://github.com./kubernetes-sigs/gateway-api/blob/v1.2.1/apis/v1/shared_types.go#L660
1717
controllerNameRegex = `^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*\/[A-Za-z0-9\/\-._~%!$&'()*+,;=:]+$` //nolint:lll
1818
)
1919

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com./kubernetes-sigs/gateway-api/config/crd/experimental?timeout=120&ref=v1.2.0
4+
- https://github.com./kubernetes-sigs/gateway-api/config/crd/experimental?timeout=120&ref=v1.2.1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com./kubernetes-sigs/gateway-api/config/crd?timeout=120&ref=v1.2.0
4+
- https://github.com./kubernetes-sigs/gateway-api/config/crd?timeout=120&ref=v1.2.1

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
k8s.io/client-go v0.31.3
2626
k8s.io/klog/v2 v2.130.1
2727
sigs.k8s.io/controller-runtime v0.19.3
28-
sigs.k8s.io/gateway-api v1.2.0
28+
sigs.k8s.io/gateway-api v1.2.1
2929
)
3030

3131
require (

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -228,8 +228,8 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1
228228
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
229229
sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
230230
sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
231-
sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8=
232-
sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
231+
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
232+
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
233233
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
234234
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
235235
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

internal/framework/gatewayclass/validate.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const (
1313
// BundleVersionAnnotation is the annotation on Gateway API CRDs that contains the installed version.
1414
BundleVersionAnnotation = "gateway.networking.k8s.io/bundle-version"
1515
// SupportedVersion is the supported version of the Gateway API CRDs.
16-
SupportedVersion = "v1.2.0"
16+
SupportedVersion = "v1.2.1"
1717
)
1818

1919
var gatewayCRDs = map[string]apiVersion{

tests/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
k8s.io/apimachinery v0.31.3
1717
k8s.io/client-go v0.31.3
1818
sigs.k8s.io/controller-runtime v0.19.3
19-
sigs.k8s.io/gateway-api v1.2.0
19+
sigs.k8s.io/gateway-api v1.2.1
2020
sigs.k8s.io/yaml v1.4.0
2121
)
2222

tests/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
219219
pgregory.net/rapid v1.1.0/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04=
220220
sigs.k8s.io/controller-runtime v0.19.3 h1:XO2GvC9OPftRst6xWCpTgBZO04S2cbp0Qqkj8bX1sPw=
221221
sigs.k8s.io/controller-runtime v0.19.3/go.mod h1:j4j87DqtsThvwTv5/Tc5NFRyyF/RF0ip4+62tbTSIUM=
222-
sigs.k8s.io/gateway-api v1.2.0 h1:LrToiFwtqKTKZcZtoQPTuo3FxhrrhTgzQG0Te+YGSo8=
223-
sigs.k8s.io/gateway-api v1.2.0/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
222+
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
223+
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
224224
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
225225
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
226226
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=

0 commit comments

Comments
 (0)