Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca26c1a
build(deps): bump sigs.k8s.io/gateway-api from 1.2.1 to 1.3.0
dependabot[bot] Apr 27, 2025
642b3ef
run generate
sunjayBhatia May 1, 2025
ead7999
fix compilation
sunjayBhatia May 1, 2025
4cac9d4
skip percentage mirror tests
sunjayBhatia May 2, 2025
b4abc44
fix versions.yaml
sunjayBhatia May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26,178 changes: 14,261 additions & 11,917 deletions examples/gateway/00-crds.yaml
View file
Open in desktop

Large diffs are not rendered by default.

26,127 changes: 14,243 additions & 11,884 deletions examples/render/contour-gateway-provisioner.yaml
View file
Open in desktop

Large diffs are not rendered by default.

26,127 changes: 14,243 additions & 11,884 deletions examples/render/contour-gateway.yaml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
k8s.io/utils v0.0.0-20241210054802-24370beab758
sigs.k8s.io/controller-runtime v0.20.4
sigs.k8s.io/controller-tools v0.18.0
sigs.k8s.io/gateway-api v1.2.1
sigs.k8s.io/gateway-api v1.3.0
sigs.k8s.io/kustomize/kyaml v0.19.0
)

Expand Down Expand Up @@ -94,7 +94,7 @@ require (
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/miekg/dns v1.1.62 // indirect
github.com/miekg/dns v1.1.65 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/moby/spdystream v0.5.0 // indirect
Expand Down Expand Up @@ -141,6 +141,6 @@ require (
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
)
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc=
github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
Expand Down Expand Up @@ -452,16 +452,16 @@ sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
sigs.k8s.io/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9xrsE=
sigs.k8s.io/controller-tools v0.18.0/go.mod h1:gLKoiGBriyNh+x1rWtUQnakUYEujErjXs9pf+x/8n1U=
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/gateway-api v1.3.0 h1:q6okN+/UKDATola4JY7zXzx40WO4VISk7i9DIfOvr9M=
sigs.k8s.io/gateway-api v1.3.0/go.mod h1:d8NV8nJbaRbEKem+5IuxkL8gJGOZ+FJ+NvOIltV8gDk=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
sigs.k8s.io/kustomize/kyaml v0.19.0 h1:RFge5qsO1uHhwJsu3ipV7RNolC7Uozc0jUBC/61XSlA=
sigs.k8s.io/kustomize/kyaml v0.19.0/go.mod h1:FeKD5jEOH+FbZPpqUghBP8mrLjJ3+zD3/rf9NNu1cwY=
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 h1:qPeWmscJcXP0snki5IYF79Z8xrl8ETFxgMd7wez1XkI=
sigs.k8s.io/structured-merge-diff/v4 v4.7.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
2 changes: 1 addition & 1 deletion internal/dag/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ func TestDAGInsertGatewayAPI(t *testing.T) {
},
Spec: gatewayapi_v1.GatewaySpec{
GatewayClassName: gatewayapi_v1.ObjectName(validClass.Name),
Addresses: []gatewayapi_v1.GatewayAddress{
Addresses: []gatewayapi_v1.GatewaySpecAddress{
{
Type: ptr.To(gatewayapi_v1.IPAddressType),
Value: "1.2.3.4",
Expand Down
2 changes: 1 addition & 1 deletion internal/dag/gatewayapi_processor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ func (l *listenerInfo) AllowsKind(kind gatewayapi_v1.Kind) bool {

// isAddressAssigned returns true if either there are no addresses requested in specAddresses,
// or if at least one address from specAddresses appears in statusAddresses.
func isAddressAssigned(specAddresses []gatewayapi_v1.GatewayAddress, statusAddresses []gatewayapi_v1.GatewayStatusAddress) bool {
func isAddressAssigned(specAddresses []gatewayapi_v1.GatewaySpecAddress, statusAddresses []gatewayapi_v1.GatewayStatusAddress) bool {
if len(specAddresses) == 0 {
return true
}
Expand Down
2 changes: 1 addition & 1 deletion internal/dag/status_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8562,7 +8562,7 @@ func TestGatewayAPIHTTPRouteDAGStatus(t *testing.T) {
Namespace: "projectcontour",
},
Spec: gatewayapi_v1.GatewaySpec{
Addresses: []gatewayapi_v1.GatewayAddress{{
Addresses: []gatewayapi_v1.GatewaySpecAddress{{
Value: "1.2.3.4",
}},
Listeners: []gatewayapi_v1.Listener{{
Expand Down
12 changes: 6 additions & 6 deletions internal/provisioner/controller/gateway_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func TestGatewayReconcile(t *testing.T) {
}
}

makeGatewayWithAddrs := func(addrs []gatewayapi_v1.GatewayAddress) *gatewayapi_v1.Gateway {
makeGatewayWithAddrs := func(addrs []gatewayapi_v1.GatewaySpecAddress) *gatewayapi_v1.Gateway {
gtw := makeGateway()
gtw.Spec.Addresses = addrs
return gtw
Expand Down Expand Up @@ -220,7 +220,7 @@ func TestGatewayReconcile(t *testing.T) {
},
"A gateway with one IP address results in an Envoy service with loadBalancerIP set to that IP address": {
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
{
Type: ptr.To(gatewayapi_v1.IPAddressType),
Value: "172.18.255.207",
Expand All @@ -234,7 +234,7 @@ func TestGatewayReconcile(t *testing.T) {
},
"A gateway with two IP addresses results in an Envoy service with loadBalancerIP set to the first IP address": {
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
{
Type: ptr.To(gatewayapi_v1.IPAddressType),
Value: "172.18.255.207",
Expand All @@ -251,7 +251,7 @@ func TestGatewayReconcile(t *testing.T) {
},
"A gateway with one Hostname address results in an Envoy service with loadBalancerIP set to that hostname": {
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
{
Type: ptr.To(gatewayapi_v1.HostnameAddressType),
Value: "projectcontour.io",
Expand All @@ -264,7 +264,7 @@ func TestGatewayReconcile(t *testing.T) {
},
"A gateway with two Hostname addresses results in an Envoy service with loadBalancerIP set to the first hostname": {
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
{
Type: ptr.To(gatewayapi_v1.HostnameAddressType),
Value: "projectcontour.io",
Expand All @@ -281,7 +281,7 @@ func TestGatewayReconcile(t *testing.T) {
},
"A gateway with one custom address type results in an Envoy service with no loadBalancerIP": {
gatewayClass: reconcilableGatewayClass("gatewayclass-1", controller),
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewayAddress{
gateway: makeGatewayWithAddrs([]gatewayapi_v1.GatewaySpecAddress{
{
Type: ptr.To(gatewayapi_v1.AddressType("acme.io/CustomAddressType")),
Value: "custom-address-types-are-not-supported",
Expand Down
2 changes: 1 addition & 1 deletion internal/provisioner/controller/gatewayclass.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import (

const (
gatewayAPIBundleVersionAnnotation = "gateway.networking.k8s.io/bundle-version"
gatewayAPICRDBundleSupportedVersion = "v1.2.1"
gatewayAPICRDBundleSupportedVersion = "v1.3.0"
)

// gatewayClassReconciler reconciles GatewayClass objects.
Expand Down
4 changes: 4 additions & 0 deletions test/conformance/gatewayapi/gateway_conformance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ func TestGatewayConformance(t *testing.T) {
ExemptFeatures: sets.New(
features.SupportMesh,
features.SupportUDPRoute,

// TODO: implement percentage based mirroring
// See: https://github.com/projectcontour/contour/issues/7021
features.SupportHTTPRouteRequestPercentageMirror,
),
}
if os.Getenv("GENERATE_GATEWAY_CONFORMANCE_REPORT") == "true" {
Expand Down
2 changes: 1 addition & 1 deletion versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ versions:
- "1.32"
- "1.31"
gateway-api:
- "1.2.1"
- "1.3.0"
- version: v1.32.0
supported: "true"
dependencies:
Expand Down