Skip to content

Commit 16f8ab4

Browse files
ErikJiangErikJiang
authored
Merge pull request #1567 from ErikJiang/bump_go_1.24
bump golang version to 1.24
2 parents 4549ee6 + f2b753f commit 16f8ab4

File tree

180 files changed

+29
-40219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

180 files changed

+29
-40219
lines changed

‎.github/workflows/auto-compatibility-schedule.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
- uses: actions/setup-go@v4
3131
with:
32-
go-version: 1.22.4
32+
go-version: 1.24.3
3333

3434
- name: kubean_compatibility_schedule
3535
run: |

‎.github/workflows/auto-main-ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- uses: actions/setup-go@v4
2525
with:
26-
go-version: 1.22.4
26+
go-version: 1.24.3
2727

2828
- name: unit test
2929
run: |

‎.github/workflows/auto-pr-ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050

5151
- uses: actions/setup-go@v4
5252
with:
53-
go-version: 1.22.4
53+
go-version: 1.24.3
5454

5555
- name: static check
5656
uses: golangci/golangci-lint-action@v8
@@ -86,7 +86,7 @@ jobs:
8686

8787
- uses: actions/setup-go@v4
8888
with:
89-
go-version: 1.22.4
89+
go-version: 1.24.3
9090

9191
- name: unit test
9292
run: |
@@ -199,7 +199,7 @@ jobs:
199199
ref: ${{ needs.get_ref.outputs.ref }}
200200
- uses: actions/setup-go@v4
201201
with:
202-
go-version: 1.22.4
202+
go-version: 1.24.3
203203
- name: e2e
204204
run: |
205205
CONTAINER_TAG="$(git describe --tags --abbrev=8 --dirty)-e2e"

‎.github/workflows/e2e_schedule.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- uses: actions/setup-go@v4
3939
with:
40-
go-version: 1.22.4
40+
go-version: 1.24.3
4141

4242
- name: e2e_schedule_sonobuoy
4343
uses: nick-fields/retry@v3

‎.github/workflows/kubean_e2e_test_ci.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
fetch-depth: 0
6666
- uses: actions/setup-go@v4
6767
with:
68-
go-version: 1.22.4
68+
go-version: 1.24.3
6969
- name: centos_calico_airgap
7070
run: |
7171
# export runner_name=${{ runner.name }}
@@ -97,7 +97,7 @@ jobs:
9797
fetch-depth: 0
9898
- uses: actions/setup-go@v4
9999
with:
100-
go-version: 1.22.4
100+
go-version: 1.24.3
101101
- name: centos_calico_online
102102
continue-on-error: ${{ vars.CENTOS_CALICO_ONLINE_ALLOW_FAILURE != 'false' }}
103103
run: |
@@ -134,7 +134,7 @@ jobs:
134134
fetch-depth: 0
135135
# - uses: actions/setup-go@v4
136136
# with:
137-
# go-version: 1.22.4
137+
# go-version: 1.24.3
138138
- name: centos_cilium_online
139139
continue-on-error: ${{ vars.CENTOS_CILIUM_ONLINE_ALLOW_FAILURE != 'false' }}
140140
run: |
@@ -167,7 +167,7 @@ jobs:
167167
fetch-depth: 0
168168
- uses: actions/setup-go@v4
169169
with:
170-
go-version: 1.22.4
170+
go-version: 1.24.3
171171
- name: centos_cilium_airgap
172172
continue-on-error: ${{ vars.CENTOS_CILIUM_AIRGAP_ALLOW_FAILURE != 'false' }}
173173
run: |
@@ -201,7 +201,7 @@ jobs:
201201
fetch-depth: 0
202202
- uses: actions/setup-go@v4
203203
with:
204-
go-version: 1.22.4
204+
go-version: 1.24.3
205205
- name: redhat_calico_online
206206
continue-on-error: ${{ vars.REDHAT_CALICO_ONLINE_ALLOW_FAILURE != 'false' }}
207207
run: |
@@ -232,7 +232,7 @@ jobs:
232232
fetch-depth: 0
233233
- uses: actions/setup-go@v4
234234
with:
235-
go-version: 1.22.4
235+
go-version: 1.24.3
236236
- name: redhat_calico_airgap
237237
continue-on-error: ${{ vars.REDHAT_CALICO_AIRGAP_ALLOW_FAILURE != 'false' }}
238238
run: |
@@ -263,7 +263,7 @@ jobs:
263263
fetch-depth: 0
264264
- uses: actions/setup-go@v4
265265
with:
266-
go-version: 1.22.4
266+
go-version: 1.24.3
267267
- name: redhat_cilium_airgap
268268
continue-on-error: ${{ vars.REDHAT_CILIUM_AIRGAP_ALLOW_FAILURE != 'false' }}
269269
run: |
@@ -295,7 +295,7 @@ jobs:
295295
fetch-depth: 0
296296
- uses: actions/setup-go@v4
297297
with:
298-
go-version: 1.22.4
298+
go-version: 1.24.3
299299
- name: redhat_cilium_online
300300
continue-on-error: ${{ vars.REDHAT_CILIUM_ONLINE_ALLOW_FAILURE != 'false' }}
301301
run: |
@@ -327,7 +327,7 @@ jobs:
327327
fetch-depth: 0
328328
- uses: actions/setup-go@v4
329329
with:
330-
go-version: 1.22.4
330+
go-version: 1.24.3
331331
- name: kylin_calico_online
332332
continue-on-error: ${{ vars.KYLIN_CALICO_ONLINE_ALLOW_FAILURE != 'false' }}
333333
run: |
@@ -359,7 +359,7 @@ jobs:
359359
fetch-depth: 0
360360
- uses: actions/setup-go@v4
361361
with:
362-
go-version: 1.22.4
362+
go-version: 1.24.3
363363
- name: kylin_calico_airgap
364364
continue-on-error: ${{ vars.KYLIN_CALICO_AIRGAP_ALLOW_FAILURE != 'false' }}
365365
run: |

‎.github/workflows/os_e2e_schedule.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
- uses: actions/setup-go@v4
3232
with:
33-
go-version: 1.22.4
33+
go-version: 1.24.3
3434

3535
- name: os_compitable_e2e_schedule
3636
run: |

‎.github/workflows/verify-kubespray.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
ref: ${{ needs.get_ref.outputs.ref }}
6666
- uses: actions/setup-go@v4
6767
with:
68-
go-version: 1.22.4
68+
go-version: 1.24.3
6969
- name: verify_kubespray_e2e_test
7070
env:
7171
CONTAINER_TAG: ${{ needs.output-variable.outputs.container_tag }}

‎api/go.mod‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module github.com/kubean-io/kubean-api
22

3-
go 1.20
3+
go 1.24
44

55
require (
66
k8s.io/api v0.26.4
77
k8s.io/apimachinery v0.26.4
88
k8s.io/client-go v0.26.4
9-
k8s.io/code-generator v0.26.4
9+
k8s.io/klog/v2 v2.80.1
1010
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d
1111
)
1212

@@ -30,22 +30,17 @@ require (
3030
github.com/modern-go/reflect2 v1.0.2 // indirect
3131
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3232
github.com/pkg/errors v0.9.1 // indirect
33-
github.com/spf13/pflag v1.0.5 // indirect
34-
golang.org/x/mod v0.6.0 // indirect
3533
golang.org/x/net v0.7.0 // indirect
3634
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
3735
golang.org/x/sys v0.5.0 // indirect
3836
golang.org/x/term v0.5.0 // indirect
3937
golang.org/x/text v0.7.0 // indirect
4038
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
41-
golang.org/x/tools v0.2.0 // indirect
4239
google.golang.org/appengine v1.6.7 // indirect
4340
google.golang.org/protobuf v1.28.1 // indirect
4441
gopkg.in/inf.v0 v0.9.1 // indirect
4542
gopkg.in/yaml.v2 v2.4.0 // indirect
4643
gopkg.in/yaml.v3 v3.0.1 // indirect
47-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
48-
k8s.io/klog/v2 v2.80.1 // indirect
4944
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
5045
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
5146
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect

‎api/go.sum‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
5555
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
5656
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
5757
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
58-
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
5958
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
6059
github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
6160
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -124,6 +123,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf
124123
github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
125124
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
126125
github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y=
126+
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
127127
github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
128128
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
129129
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -157,7 +157,9 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8m
157157
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
158158
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
159159
github.com/onsi/ginkgo/v2 v2.4.0 h1:+Ig9nvqgS5OBSACXNk15PLdp0U9XPYROt9CFzVdFGIs=
160+
github.com/onsi/ginkgo/v2 v2.4.0/go.mod h1:iHkDK1fKGcBoEHT5W7YBq4RFWaQulw+caOMkAt4OrFo=
160161
github.com/onsi/gomega v1.23.0 h1:/oxKu9c2HVap+F3PfKort2Hw5DEU+HGlW8n+tguWsys=
162+
github.com/onsi/gomega v1.23.0/go.mod h1:Z/NWtiqwBrwUt4/2loMmHL63EDLnYHmVbuBpDr2vQAg=
161163
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
162164
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
163165
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -173,6 +175,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
173175
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
174176
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
175177
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
178+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
176179
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
177180
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
178181
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -217,8 +220,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
217220
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
218221
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
219222
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
220-
golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
221-
golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
222223
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
223224
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
224225
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -345,7 +346,6 @@ golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjs
345346
golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
346347
golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
347348
golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
348-
golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
349349
golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
350350
golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
351351
golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -354,8 +354,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
354354
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
355355
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
356356
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
357-
golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
358-
golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
359357
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
360358
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
361359
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -469,11 +467,6 @@ k8s.io/apimachinery v0.26.4 h1:rZccKdBLg9vP6J09JD+z8Yr99Ce8gk3Lbi9TCx05Jzs=
469467
k8s.io/apimachinery v0.26.4/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
470468
k8s.io/client-go v0.26.4 h1:/7P/IbGBuT73A+G97trf44NTPSNqvuBREpOfdLbHvD4=
471469
k8s.io/client-go v0.26.4/go.mod h1:6qOItWm3EwxJdl/8p5t7FWtWUOwyMdA8N9ekbW4idpI=
472-
k8s.io/code-generator v0.26.4 h1:zgDD0qX13p/jtrAoYRRiYeQ5ibnriwmo2cMkMZAtJxc=
473-
k8s.io/code-generator v0.26.4/go.mod h1:ryaiIKwfxEJEaywEzx3dhWOydpVctKYbqLajJf0O8dI=
474-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
475-
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
476-
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
477470
k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
478471
k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
479472
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=
@@ -487,6 +480,5 @@ sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN
487480
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
488481
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
489482
sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
490-
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
491483
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
492484
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

‎api/vendor/github.com/spf13/pflag/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)