Skip to content

Commit 95ffca1

Browse files
build(deps): bump sigs.k8s.io/gateway-api from 1.2.1 to 1.3.0 (#7017)
Bumps [sigs.k8s.io/gateway-api](https://github.com/kubernetes-sigs/gateway-api) from 1.2.1 to 1.3.0. - [Release notes](https://github.com/kubernetes-sigs/gateway-api/releases) - [Changelog](https://github.com/kubernetes-sigs/gateway-api/blob/main/RELEASE.md) - [Commits](kubernetes-sigs/gateway-api@v1.2.1...v1.3.0) --- updated-dependencies: - dependency-name: sigs.k8s.io/gateway-api dependency-version: 1.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Sunjay Bhatia <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Sunjay Bhatia <[email protected]>
1 parent f18d439 commit 95ffca1

File tree

12 files changed

+42768
-35702
lines changed

12 files changed

+42768
-35702
lines changed

examples/gateway/00-crds.yaml

Lines changed: 14261 additions & 11917 deletions
Large diffs are not rendered by default.

examples/render/contour-gateway-provisioner.yaml

Lines changed: 14243 additions & 11884 deletions
Large diffs are not rendered by default.

examples/render/contour-gateway.yaml

Lines changed: 14243 additions & 11884 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ require (
4646
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
4747
sigs.k8s.io/controller-runtime v0.21.0
4848
sigs.k8s.io/controller-tools v0.18.0
49-
sigs.k8s.io/gateway-api v1.2.1
49+
sigs.k8s.io/gateway-api v1.3.0
5050
sigs.k8s.io/kustomize/kyaml v0.20.1
5151
)
5252

@@ -94,7 +94,7 @@ require (
9494
github.com/mailru/easyjson v0.9.0 // indirect
9595
github.com/mattn/go-colorable v0.1.14 // indirect
9696
github.com/mattn/go-isatty v0.0.20 // indirect
97-
github.com/miekg/dns v1.1.62 // indirect
97+
github.com/miekg/dns v1.1.65 // indirect
9898
github.com/mitchellh/go-homedir v1.1.0 // indirect
9999
github.com/mitchellh/mapstructure v1.5.0 // indirect
100100
github.com/moby/spdystream v0.5.0 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
183183
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
184184
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
185185
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
186-
github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
187-
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
186+
github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc=
187+
github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
188188
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
189189
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
190190
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
@@ -462,8 +462,8 @@ sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytI
462462
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
463463
sigs.k8s.io/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9xrsE=
464464
sigs.k8s.io/controller-tools v0.18.0/go.mod h1:gLKoiGBriyNh+x1rWtUQnakUYEujErjXs9pf+x/8n1U=
465-
sigs.k8s.io/gateway-api v1.2.1 h1:fZZ/+RyRb+Y5tGkwxFKuYuSRQHu9dZtbjenblleOLHM=
466-
sigs.k8s.io/gateway-api v1.2.1/go.mod h1:EpNfEXNjiYfUJypf0eZ0P5iXA9ekSGWaS1WgPaM42X0=
465+
sigs.k8s.io/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
466+
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
467467
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
468468
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
469469
sigs.k8s.io/kustomize/kyaml v0.20.1 h1:PCMnA2mrVbRP3NIB6v9kYCAc38uvFLVs8j/CD567A78=

internal/dag/builder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
249249
},
250250
Spec: gatewayapi_v1.GatewaySpec{
251251
GatewayClassName: gatewayapi_v1.ObjectName(validClass.Name),
252-
Addresses: []gatewayapi_v1.GatewayAddress{
252+
Addresses: []gatewayapi_v1.GatewaySpecAddress{
253253
{
254254
Type: ptr.To(gatewayapi_v1.IPAddressType),
255255
Value: "1.2.3.4",

internal/dag/gatewayapi_processor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ func (l *listenerInfo) AllowsKind(kind gatewayapi_v1.Kind) bool {
412412

413413
// isAddressAssigned returns true if either there are no addresses requested in specAddresses,
414414
// or if at least one address from specAddresses appears in statusAddresses.
415-
func isAddressAssigned(specAddresses []gatewayapi_v1.GatewayAddress, statusAddresses []gatewayapi_v1.GatewayStatusAddress) bool {
415+
func isAddressAssigned(specAddresses []gatewayapi_v1.GatewaySpecAddress, statusAddresses []gatewayapi_v1.GatewayStatusAddress) bool {
416416
if len(specAddresses) == 0 {
417417
return true
418418
}

internal/dag/status_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8562,7 +8562,7 @@ func TestGatewayAPIHTTPRouteDAGStatus(t *testing.T) {
85628562
Namespace: "projectcontour",
85638563
},
85648564
Spec: gatewayapi_v1.GatewaySpec{
8565-
Addresses: []gatewayapi_v1.GatewayAddress{{
8565+
Addresses: []gatewayapi_v1.GatewaySpecAddress{{
85668566
Value: "1.2.3.4",
85678567
}},
85688568
Listeners: []gatewayapi_v1.Listener{{

internal/provisioner/controller/gateway_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func TestGatewayReconcile(t *testing.T) {
9595
}
9696
}
9797

98-
makeGatewayWithAddrs := func(addrs []gatewayapi_v1.GatewayAddress) *gatewayapi_v1.Gateway {
98+
makeGatewayWithAddrs := func(addrs []gatewayapi_v1.GatewaySpecAddress) *gatewayapi_v1.Gateway {
9999
gtw := makeGateway()
100100
gtw.Spec.Addresses = addrs
101101
return gtw
@@ -220,7 +220,7 @@ func TestGatewayReconcile(t *testing.T) {
220220
},
221221
"A gateway with one IP address results in an Envoy service with loadBalancerIP set to that IP address": {
222222
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
223-
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
223+
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
224224
{
225225
Type: ptr.To(gatewayapi_v1.IPAddressType),
226226
Value: "172.18.255.207",
@@ -234,7 +234,7 @@ func TestGatewayReconcile(t *testing.T) {
234234
},
235235
"A gateway with two IP addresses results in an Envoy service with loadBalancerIP set to the first IP address": {
236236
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
237-
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
237+
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
238238
{
239239
Type: ptr.To(gatewayapi_v1.IPAddressType),
240240
Value: "172.18.255.207",
@@ -251,7 +251,7 @@ func TestGatewayReconcile(t *testing.T) {
251251
},
252252
"A gateway with one Hostname address results in an Envoy service with loadBalancerIP set to that hostname": {
253253
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
254-
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
254+
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
255255
{
256256
Type: ptr.To(gatewayapi_v1.HostnameAddressType),
257257
Value: "projectcontour.io",
@@ -264,7 +264,7 @@ func TestGatewayReconcile(t *testing.T) {
264264
},
265265
"A gateway with two Hostname addresses results in an Envoy service with loadBalancerIP set to the first hostname": {
266266
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
267-
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
267+
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
268268
{
269269
Type: ptr.To(gatewayapi_v1.HostnameAddressType),
270270
Value: "projectcontour.io",
@@ -281,7 +281,7 @@ func TestGatewayReconcile(t *testing.T) {
281281
},
282282
"A gateway with one custom address type results in an Envoy service with no loadBalancerIP": {
283283
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
284-
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
284+
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
285285
{
286286
Type: ptr.To(gatewayapi_v1.AddressType("acme.io/CustomAddressType")),
287287
Value: "custom-address-types-are-not-supported",

internal/provisioner/controller/gatewayclass.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import (
3939

4040
const (
4141
gatewayAPIBundleVersionAnnotation = "gateway.networking.k8s.io/bundle-version"
42-
gatewayAPICRDBundleSupportedVersion = "v1.2.1"
42+
gatewayAPICRDBundleSupportedVersion = "v1.3.0"
4343
)
4444

4545
// gatewayClassReconciler reconciles GatewayClass objects.

0 commit comments

Comments
 (0)