Skip to content

Commit 2d57b6a

Browse files
authored
upgrade: gateway-api version to v1.3.0 (#2547)
1 parent 0a7b040 commit 2d57b6a

File tree

9 files changed

+153
-142
lines changed

9 files changed

+153
-142
lines changed

.github/workflows/apisix-conformance-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
id: go
4747
uses: actions/setup-go@v4
4848
with:
49-
go-version: "1.23"
49+
go-version: "1.24"
5050

5151
- name: Install kind
5252
run: |
@@ -71,7 +71,7 @@ jobs:
7171
- name: Setup Go Env
7272
uses: actions/setup-go@v4
7373
with:
74-
go-version: "1.23"
74+
go-version: "1.24"
7575

7676
- name: Build images
7777
env:

.github/workflows/apisix-e2e-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
- name: Setup Go Env
5353
uses: actions/setup-go@v4
5454
with:
55-
go-version: "1.23"
55+
go-version: "1.24"
5656

5757
- name: Setup Node.js
5858
uses: actions/setup-node@v3

.github/workflows/golangci-lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go Env
3737
uses: actions/setup-go@v4
3838
with:
39-
go-version: "1.23"
39+
go-version: "1.24"
4040

4141
- name: check go path for debug
4242
run: go env

.github/workflows/lint-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Setup Go Env
7070
uses: actions/setup-go@v4
7171
with:
72-
go-version: "1.23"
72+
go-version: "1.24"
7373
- name: run gofmt
7474
working-directory: ./
7575
run: |

.github/workflows/push-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Setup Go Env
3636
uses: actions/setup-go@v4
3737
with:
38-
go-version: "1.23"
38+
go-version: "1.24"
3939

4040
- name: Set up QEMU
4141
uses: docker/setup-qemu-action@v3

.github/workflows/unit-test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Setup Go Env
3737
uses: actions/setup-go@v4
3838
with:
39-
go-version: "1.23"
39+
go-version: "1.24"
4040
- name: Run unit test
4141
working-directory: ./
4242
run: |

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ IMG ?= apache/apisix-ingress-controller:$(IMAGE_TAG)
2727
ENVTEST_K8S_VERSION = 1.30.0
2828
KIND_NAME ?= apisix-ingress-cluster
2929

30-
GATEAY_API_VERSION ?= v1.2.0
30+
GATEAY_API_VERSION ?= v1.3.0
3131
ADC_VERSION ?= 0.21.0
3232

3333
GINKGO_VERSION ?= 2.20.0

go.mod

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,44 @@
11
module github.com/apache/apisix-ingress-controller
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.23.7
5+
toolchain go1.24.7
66

77
require (
88
github.com/Masterminds/sprig/v3 v3.2.3
99
github.com/api7/gopkg v0.2.1-0.20230601092738-0f3730f9b57a
1010
github.com/gavv/httpexpect/v2 v2.16.0
1111
github.com/go-logr/logr v1.4.2
1212
github.com/go-logr/zapr v1.3.0
13-
github.com/google/go-cmp v0.6.0
13+
github.com/google/go-cmp v0.7.0
1414
github.com/google/uuid v1.6.0
1515
github.com/gorilla/websocket v1.5.1
1616
github.com/gruntwork-io/terratest v0.50.0
1717
github.com/hashicorp/go-memdb v1.3.4
1818
github.com/incubator4/go-resty-expr v0.1.1
19-
github.com/onsi/ginkgo/v2 v2.20.0
20-
github.com/onsi/gomega v1.34.1
19+
github.com/onsi/ginkgo/v2 v2.22.0
20+
github.com/onsi/gomega v1.36.1
2121
github.com/pkg/errors v0.9.1
2222
github.com/prometheus/client_golang v1.19.1
2323
github.com/samber/lo v1.47.0
24-
github.com/spf13/cobra v1.8.1
24+
github.com/spf13/cobra v1.9.1
2525
github.com/stretchr/testify v1.10.0
2626
go.uber.org/zap v1.27.0
2727
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
2828
gopkg.in/yaml.v3 v3.0.1
29-
k8s.io/api v0.31.1
30-
k8s.io/apiextensions-apiserver v0.31.1
31-
k8s.io/apimachinery v0.31.1
32-
k8s.io/client-go v0.31.1
29+
k8s.io/api v0.32.3
30+
k8s.io/apiextensions-apiserver v0.32.3
31+
k8s.io/apimachinery v0.32.3
32+
k8s.io/client-go v0.32.3
3333
k8s.io/kubectl v0.30.3
34-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
35-
sigs.k8s.io/controller-runtime v0.19.0
36-
sigs.k8s.io/gateway-api v1.2.0
34+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
35+
sigs.k8s.io/controller-runtime v0.20.4
36+
sigs.k8s.io/gateway-api v1.3.0
3737
sigs.k8s.io/yaml v1.4.0
3838
)
3939

4040
require (
41+
cel.dev/expr v0.19.1 // indirect
4142
filippo.io/edwards25519 v1.1.0 // indirect
4243
github.com/Masterminds/goutils v1.1.1 // indirect
4344
github.com/Masterminds/semver/v3 v3.2.1 // indirect
@@ -87,12 +88,12 @@ require (
8788
github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
8889
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
8990
github.com/cespare/xxhash/v2 v2.3.0 // indirect
90-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
91+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
9192
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
9293
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
9394
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
94-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
95-
github.com/fatih/color v1.17.0 // indirect
95+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
96+
github.com/fatih/color v1.18.0 // indirect
9697
github.com/fatih/structs v1.1.0 // indirect
9798
github.com/felixge/httpsnoop v1.0.4 // indirect
9899
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -106,13 +107,13 @@ require (
106107
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
107108
github.com/gobwas/glob v0.2.3 // indirect
108109
github.com/gogo/protobuf v1.3.2 // indirect
109-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
110110
github.com/golang/protobuf v1.5.4 // indirect
111-
github.com/google/cel-go v0.20.1 // indirect
111+
github.com/google/btree v1.1.3 // indirect
112+
github.com/google/cel-go v0.22.0 // indirect
112113
github.com/google/gnostic-models v0.6.8 // indirect
113114
github.com/google/go-querystring v1.1.0 // indirect
114115
github.com/google/gofuzz v1.2.0 // indirect
115-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
116+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
116117
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
117118
github.com/gruntwork-io/go-commons v0.8.0 // indirect
118119
github.com/hashicorp/errwrap v1.1.0 // indirect
@@ -137,12 +138,12 @@ require (
137138
github.com/mattn/go-colorable v0.1.13 // indirect
138139
github.com/mattn/go-isatty v0.0.20 // indirect
139140
github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
140-
github.com/miekg/dns v1.1.62 // indirect
141+
github.com/miekg/dns v1.1.65 // indirect
141142
github.com/mitchellh/copystructure v1.2.0 // indirect
142143
github.com/mitchellh/go-homedir v1.1.0 // indirect
143144
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
144145
github.com/mitchellh/reflectwalk v1.0.2 // indirect
145-
github.com/moby/spdystream v0.4.0 // indirect
146+
github.com/moby/spdystream v0.5.0 // indirect
146147
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
147148
github.com/modern-go/reflect2 v1.0.2 // indirect
148149
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -157,8 +158,8 @@ require (
157158
github.com/sergi/go-diff v1.3.1 // indirect
158159
github.com/shopspring/decimal v1.3.1 // indirect
159160
github.com/spf13/cast v1.6.0 // indirect
160-
github.com/spf13/pflag v1.0.5 // indirect
161-
github.com/stoewer/go-strcase v1.2.0 // indirect
161+
github.com/spf13/pflag v1.0.6 // indirect
162+
github.com/stoewer/go-strcase v1.3.0 // indirect
162163
github.com/urfave/cli v1.22.16 // indirect
163164
github.com/valyala/bytebufferpool v1.0.0 // indirect
164165
github.com/valyala/fasthttp v1.34.0 // indirect
@@ -169,41 +170,42 @@ require (
169170
github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0 // indirect
170171
github.com/yudai/gojsondiff v1.0.0 // indirect
171172
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
173+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
172174
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
173-
go.opentelemetry.io/otel v1.29.0 // indirect
175+
go.opentelemetry.io/otel v1.34.0 // indirect
174176
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
175177
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
176-
go.opentelemetry.io/otel/metric v1.29.0 // indirect
177-
go.opentelemetry.io/otel/sdk v1.29.0 // indirect
178-
go.opentelemetry.io/otel/trace v1.29.0 // indirect
178+
go.opentelemetry.io/otel/metric v1.34.0 // indirect
179+
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
180+
go.opentelemetry.io/otel/trace v1.34.0 // indirect
179181
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
180182
go.uber.org/multierr v1.11.0 // indirect
181183
golang.org/x/arch v0.6.0 // indirect
182-
golang.org/x/crypto v0.36.0 // indirect
183-
golang.org/x/mod v0.20.0 // indirect
184-
golang.org/x/net v0.38.0 // indirect
184+
golang.org/x/crypto v0.37.0 // indirect
185+
golang.org/x/mod v0.23.0 // indirect
186+
golang.org/x/net v0.39.0 // indirect
185187
golang.org/x/oauth2 v0.27.0 // indirect
186-
golang.org/x/sync v0.12.0 // indirect
187-
golang.org/x/sys v0.31.0 // indirect
188-
golang.org/x/term v0.30.0 // indirect
189-
golang.org/x/text v0.23.0 // indirect
188+
golang.org/x/sync v0.13.0 // indirect
189+
golang.org/x/sys v0.32.0 // indirect
190+
golang.org/x/term v0.31.0 // indirect
191+
golang.org/x/text v0.24.0 // indirect
190192
golang.org/x/time v0.8.0 // indirect
191-
golang.org/x/tools v0.24.0 // indirect
193+
golang.org/x/tools v0.30.0 // indirect
192194
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
193-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 // indirect
194-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
195-
google.golang.org/grpc v1.67.1 // indirect
196-
google.golang.org/protobuf v1.35.1 // indirect
195+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
196+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
197+
google.golang.org/grpc v1.71.1 // indirect
198+
google.golang.org/protobuf v1.36.6 // indirect
199+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
197200
gopkg.in/fsnotify.v1 v1.4.7 // indirect
198201
gopkg.in/inf.v0 v0.9.1 // indirect
199202
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
200-
gopkg.in/yaml.v2 v2.4.0 // indirect
201-
k8s.io/apiserver v0.31.1 // indirect
202-
k8s.io/component-base v0.31.1 // indirect
203+
k8s.io/apiserver v0.32.3 // indirect
204+
k8s.io/component-base v0.32.3 // indirect
203205
k8s.io/klog/v2 v2.130.1 // indirect
204-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
206+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
205207
moul.io/http2curl/v2 v2.3.0 // indirect
206-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
207-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
208-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
208+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
209+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
210+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
209211
)

0 commit comments

Comments
 (0)