Skip to content

Commit 16fd5c0

Browse files
authored
Merge pull request #35 from cloudscale-ch/denis/go-1.25
Upgrade to Go 1.25
2 parents 9cb6142 + dfa75ed commit 16fd5c0

File tree

5 files changed

+392
-471
lines changed

5 files changed

+392
-471
lines changed

.github/workflows/ccm-integration-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ permissions:
1919
contents: read
2020

2121
env:
22-
GO_VERSION: 1.24
22+
GO_VERSION: 1.25
2323

2424
jobs:
2525
lint:
@@ -31,7 +31,7 @@ jobs:
3131
with:
3232
persist-credentials: false
3333

34-
- uses: actions/setup-go@v5
34+
- uses: actions/setup-go@v6
3535
with:
3636
go-version: '${{ env.GO_VERSION }}'
3737

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.24-alpine AS build
1+
FROM golang:1.25-alpine AS build
22
ARG VERSION
33

44
RUN apk add --no-cache git
@@ -15,4 +15,4 @@ FROM alpine:latest
1515
RUN apk add --no-cache ca-certificates
1616

1717
COPY --from=build /host/bin/cloudscale-cloud-controller-manager /usr/local/bin/cloudscale-cloud-controller-manager
18-
ENTRYPOINT ["cloudscale-cloud-controller-manager"]
18+
ENTRYPOINT ["cloudscale-cloud-controller-manager"]

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cloudscale-ch/cloudscale-cloud-controller-manager
22

3-
go 1.24
3+
go 1.25
44

55
// https://github.com/kubernetes/apiserver/issues/97
66
replace github.com/google/cel-go => github.com/google/cel-go v0.17.7

tool.mod

Lines changed: 101 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,55 @@
11
module github.com/cloudscale-ch/cloudscale-cloud-controller-manager
22

3-
go 1.24
3+
go 1.25.0
44

55
tool (
66
github.com/golangci/golangci-lint/v2/cmd/golangci-lint
77
honnef.co/go/tools/cmd/staticcheck
88
)
99

10+
require (
11+
github.com/cloudscale-ch/cloudscale-go-sdk/v6 v6.0.1
12+
github.com/google/uuid v1.6.0
13+
github.com/stretchr/testify v1.11.1
14+
golang.org/x/oauth2 v0.34.0
15+
k8s.io/api v0.35.0
16+
k8s.io/apimachinery v0.35.0
17+
k8s.io/client-go v0.35.0
18+
k8s.io/cloud-provider v0.35.0
19+
k8s.io/component-base v0.35.0
20+
k8s.io/klog/v2 v2.130.1
21+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
22+
)
23+
1024
require (
1125
4d63.com/gocheckcompilerdirectives v1.3.0 // indirect
1226
4d63.com/gochecknoglobals v0.2.2 // indirect
27+
cel.dev/expr v0.24.0 // indirect
1328
github.com/4meepo/tagalign v1.4.2 // indirect
1429
github.com/Abirdcfly/dupword v0.1.3 // indirect
1530
github.com/Antonboom/errname v1.1.0 // indirect
1631
github.com/Antonboom/nilnil v1.1.0 // indirect
1732
github.com/Antonboom/testifylint v1.6.0 // indirect
33+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1834
github.com/BurntSushi/toml v1.5.0 // indirect
1935
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
2036
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
2137
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.1 // indirect
22-
github.com/Masterminds/semver/v3 v3.3.1 // indirect
38+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
39+
github.com/NYTimes/gziphandler v1.1.1 // indirect
2340
github.com/OpenPeeDeeP/depguard/v2 v2.2.1 // indirect
2441
github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
2542
github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
2643
github.com/alexkohler/prealloc v1.0.0 // indirect
2744
github.com/alingse/asasalint v0.0.11 // indirect
2845
github.com/alingse/nilnesserr v0.1.2 // indirect
46+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
2947
github.com/ashanbrown/forbidigo v1.6.0 // indirect
3048
github.com/ashanbrown/makezero v1.2.0 // indirect
3149
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
3250
github.com/beorn7/perks v1.0.1 // indirect
3351
github.com/bkielbasa/cyclop v1.2.3 // indirect
52+
github.com/blang/semver/v4 v4.0.0 // indirect
3453
github.com/blizzy78/varnamelen v0.8.0 // indirect
3554
github.com/bombsimon/wsl/v4 v4.6.0 // indirect
3655
github.com/breml/bidichk v0.3.3 // indirect
@@ -39,6 +58,8 @@ require (
3958
github.com/butuzov/mirror v1.3.0 // indirect
4059
github.com/catenacyber/perfsprint v0.9.1 // indirect
4160
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
61+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
62+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
4263
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4364
github.com/charithe/durationcheck v0.0.10 // indirect
4465
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
@@ -48,19 +69,29 @@ require (
4869
github.com/charmbracelet/x/term v0.2.1 // indirect
4970
github.com/chavacava/garif v0.1.0 // indirect
5071
github.com/ckaznocha/intrange v0.3.1 // indirect
72+
github.com/coreos/go-semver v0.3.1 // indirect
73+
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
5174
github.com/curioswitch/go-reassign v0.3.0 // indirect
5275
github.com/daixiang0/gci v0.13.6 // indirect
5376
github.com/dave/dst v0.27.3 // indirect
5477
github.com/davecgh/go-spew v1.1.1 // indirect
5578
github.com/denis-tingaikin/go-header v0.5.0 // indirect
79+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5680
github.com/ettle/strcase v0.2.0 // indirect
5781
github.com/fatih/color v1.18.0 // indirect
5882
github.com/fatih/structtag v1.2.0 // indirect
83+
github.com/felixge/httpsnoop v1.0.4 // indirect
5984
github.com/firefart/nonamedreturns v1.0.5 // indirect
60-
github.com/fsnotify/fsnotify v1.5.4 // indirect
85+
github.com/fsnotify/fsnotify v1.9.0 // indirect
86+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
6187
github.com/fzipp/gocyclo v0.6.0 // indirect
6288
github.com/ghostiam/protogetter v0.3.12 // indirect
6389
github.com/go-critic/go-critic v0.13.0 // indirect
90+
github.com/go-logr/logr v1.4.3 // indirect
91+
github.com/go-logr/stdr v1.2.2 // indirect
92+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
93+
github.com/go-openapi/jsonreference v0.20.2 // indirect
94+
github.com/go-openapi/swag v0.23.0 // indirect
6495
github.com/go-toolsmith/astcast v1.1.0 // indirect
6596
github.com/go-toolsmith/astcopy v1.1.0 // indirect
6697
github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -72,7 +103,8 @@ require (
72103
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
73104
github.com/gobwas/glob v0.2.3 // indirect
74105
github.com/gofrs/flock v0.12.1 // indirect
75-
github.com/golang/protobuf v1.5.3 // indirect
106+
github.com/gogo/protobuf v1.3.2 // indirect
107+
github.com/golang/protobuf v1.5.4 // indirect
76108
github.com/golangci/dupl v0.0.0-20250308024227-f665c8d69b32 // indirect
77109
github.com/golangci/go-printf-func-name v0.1.0 // indirect
78110
github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
@@ -82,12 +114,17 @@ require (
82114
github.com/golangci/plugin-module-register v0.1.1 // indirect
83115
github.com/golangci/revgrep v0.8.0 // indirect
84116
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
117+
github.com/google/btree v1.1.3 // indirect
118+
github.com/google/cel-go v0.26.0 // indirect
119+
github.com/google/gnostic-models v0.7.0 // indirect
85120
github.com/google/go-cmp v0.7.0 // indirect
86121
github.com/gordonklaus/ineffassign v0.1.0 // indirect
87122
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
88123
github.com/gostaticanalysis/comment v1.5.0 // indirect
89124
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
90125
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
126+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
127+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
91128
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
92129
github.com/hashicorp/go-version v1.7.0 // indirect
93130
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
@@ -97,12 +134,15 @@ require (
97134
github.com/jgautheron/goconst v1.7.1 // indirect
98135
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
99136
github.com/jjti/go-spancheck v0.6.4 // indirect
137+
github.com/josharian/intern v1.0.0 // indirect
138+
github.com/json-iterator/go v1.1.12 // indirect
100139
github.com/julz/importas v0.2.0 // indirect
101140
github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
102141
github.com/kisielk/errcheck v1.9.0 // indirect
103142
github.com/kkHAIKE/contextcheck v1.1.6 // indirect
104143
github.com/kulti/thelper v0.6.3 // indirect
105144
github.com/kunwardeep/paralleltest v1.0.10 // indirect
145+
github.com/kylelemons/godebug v1.1.0 // indirect
106146
github.com/lasiar/canonicalheader v1.1.2 // indirect
107147
github.com/ldez/exptostd v0.4.2 // indirect
108148
github.com/ldez/gomoddirectives v0.6.1 // indirect
@@ -113,18 +153,22 @@ require (
113153
github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
114154
github.com/macabu/inamedparam v0.2.0 // indirect
115155
github.com/magiconair/properties v1.8.6 // indirect
156+
github.com/mailru/easyjson v0.7.7 // indirect
116157
github.com/maratori/testableexamples v1.0.0 // indirect
117158
github.com/maratori/testpackage v1.1.1 // indirect
118159
github.com/matoous/godox v1.1.0 // indirect
119160
github.com/mattn/go-colorable v0.1.14 // indirect
120161
github.com/mattn/go-isatty v0.0.20 // indirect
121162
github.com/mattn/go-runewidth v0.0.16 // indirect
122-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
123163
github.com/mgechev/revive v1.7.0 // indirect
124164
github.com/mitchellh/go-homedir v1.1.0 // indirect
125165
github.com/mitchellh/mapstructure v1.5.0 // indirect
166+
github.com/moby/term v0.5.0 // indirect
167+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
168+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
126169
github.com/moricho/tparallel v0.3.2 // indirect
127170
github.com/muesli/termenv v0.16.0 // indirect
171+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
128172
github.com/nakabonne/nestif v0.3.1 // indirect
129173
github.com/nishanths/exhaustive v0.12.0 // indirect
130174
github.com/nishanths/predeclared v0.2.2 // indirect
@@ -134,10 +178,10 @@ require (
134178
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
135179
github.com/pmezard/go-difflib v1.0.0 // indirect
136180
github.com/polyfloyd/go-errorlint v1.7.1 // indirect
137-
github.com/prometheus/client_golang v1.12.1 // indirect
138-
github.com/prometheus/client_model v0.2.0 // indirect
139-
github.com/prometheus/common v0.32.1 // indirect
140-
github.com/prometheus/procfs v0.7.3 // indirect
181+
github.com/prometheus/client_golang v1.23.2 // indirect
182+
github.com/prometheus/client_model v0.6.2 // indirect
183+
github.com/prometheus/common v0.66.1 // indirect
184+
github.com/prometheus/procfs v0.16.1 // indirect
141185
github.com/quasilyte/go-ruleguard v0.4.4 // indirect
142186
github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
143187
github.com/quasilyte/gogrep v0.5.0 // indirect
@@ -159,14 +203,14 @@ require (
159203
github.com/sourcegraph/go-diff v0.7.0 // indirect
160204
github.com/spf13/afero v1.12.0 // indirect
161205
github.com/spf13/cast v1.5.0 // indirect
162-
github.com/spf13/cobra v1.9.1 // indirect
206+
github.com/spf13/cobra v1.10.0 // indirect
163207
github.com/spf13/jwalterweatherman v1.1.0 // indirect
164-
github.com/spf13/pflag v1.0.6 // indirect
208+
github.com/spf13/pflag v1.0.9 // indirect
165209
github.com/spf13/viper v1.12.0 // indirect
166210
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
167211
github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
212+
github.com/stoewer/go-strcase v1.3.0 // indirect
168213
github.com/stretchr/objx v0.5.2 // indirect
169-
github.com/stretchr/testify v1.10.0 // indirect
170214
github.com/subosito/gotenv v1.4.1 // indirect
171215
github.com/tdakkota/asciicheck v0.4.1 // indirect
172216
github.com/tetafro/godot v1.5.0 // indirect
@@ -178,6 +222,7 @@ require (
178222
github.com/ultraware/whitespace v0.2.0 // indirect
179223
github.com/uudashr/gocognit v1.2.0 // indirect
180224
github.com/uudashr/iface v1.3.1 // indirect
225+
github.com/x448/float16 v0.8.4 // indirect
181226
github.com/xen0n/gosmopolitan v1.3.0 // indirect
182227
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
183228
github.com/yagipy/maintidx v1.0.0 // indirect
@@ -186,21 +231,56 @@ require (
186231
gitlab.com/bosi/decorder v0.4.2 // indirect
187232
go-simpler.org/musttag v0.13.0 // indirect
188233
go-simpler.org/sloglint v0.9.0 // indirect
189-
go.uber.org/atomic v1.7.0 // indirect
234+
go.etcd.io/etcd/api/v3 v3.6.5 // indirect
235+
go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
236+
go.etcd.io/etcd/client/v3 v3.6.5 // indirect
237+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
238+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
239+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
240+
go.opentelemetry.io/otel v1.36.0 // indirect
241+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
242+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
243+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
244+
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
245+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
246+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
190247
go.uber.org/automaxprocs v1.6.0 // indirect
191-
go.uber.org/multierr v1.6.0 // indirect
192-
go.uber.org/zap v1.24.0 // indirect
248+
go.uber.org/multierr v1.11.0 // indirect
249+
go.uber.org/zap v1.27.0 // indirect
250+
go.yaml.in/yaml/v2 v2.4.3 // indirect
251+
go.yaml.in/yaml/v3 v3.0.4 // indirect
252+
golang.org/x/crypto v0.45.0 // indirect
253+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
193254
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
194-
golang.org/x/mod v0.24.0 // indirect
195-
golang.org/x/sync v0.12.0 // indirect
196-
golang.org/x/sys v0.31.0 // indirect
197-
golang.org/x/text v0.23.0 // indirect
198-
golang.org/x/tools v0.31.0 // indirect
199-
google.golang.org/protobuf v1.36.5 // indirect
255+
golang.org/x/mod v0.29.0 // indirect
256+
golang.org/x/net v0.47.0 // indirect
257+
golang.org/x/sync v0.18.0 // indirect
258+
golang.org/x/sys v0.38.0 // indirect
259+
golang.org/x/term v0.37.0 // indirect
260+
golang.org/x/text v0.31.0 // indirect
261+
golang.org/x/time v0.10.0 // indirect
262+
golang.org/x/tools v0.38.0 // indirect
263+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
264+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
265+
google.golang.org/grpc v1.72.2 // indirect
266+
google.golang.org/protobuf v1.36.8 // indirect
267+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
268+
gopkg.in/inf.v0 v0.9.1 // indirect
200269
gopkg.in/ini.v1 v1.67.0 // indirect
270+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
201271
gopkg.in/yaml.v2 v2.4.0 // indirect
202272
gopkg.in/yaml.v3 v3.0.1 // indirect
203273
honnef.co/go/tools v0.6.1 // indirect
274+
k8s.io/apiserver v0.35.0 // indirect
275+
k8s.io/component-helpers v0.35.0 // indirect
276+
k8s.io/controller-manager v0.35.0 // indirect
277+
k8s.io/kms v0.35.0 // indirect
278+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
204279
mvdan.cc/gofumpt v0.7.0 // indirect
205280
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
281+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
282+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
283+
sigs.k8s.io/randfill v1.0.0 // indirect
284+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
285+
sigs.k8s.io/yaml v1.6.0 // indirect
206286
)

0 commit comments

Comments
 (0)