Skip to content

Commit 0521ec1

Browse files
majst01majst01
authored
Update to go-1.25, debian:13 (#120)
1 parent 5596e02 commit 0521ec1

File tree

4 files changed

+321
-297
lines changed

4 files changed

+321
-297
lines changed

‎.github/workflows/docker.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
3030

3131
- name: Checkout
32-
uses: actions/checkout@v4
32+
uses: actions/checkout@v5
3333

34-
- name: Set up Go 1.24
35-
uses: actions/setup-go@v5
34+
- name: Set up Go 1.25
35+
uses: actions/setup-go@v6
3636
with:
37-
go-version: '1.24.x'
37+
go-version: '1.25.x'
3838
cache: false
3939

4040
- name: Lint

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM golang:1.24-bookworm AS builder
1+
FROM golang:1.25-trixie AS builder
22
WORKDIR /work
33
COPY . .
44
RUN make
55

6-
FROM gcr.io/distroless/static-debian12:nonroot
6+
FROM gcr.io/distroless/static-debian13:nonroot
77

88
COPY --from=builder /work/bin/metal-cloud-controller-manager .
99

‎go.mod‎

Lines changed: 96 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
module github.com/metal-stack/metal-ccm
22

3-
go 1.24.0
4-
5-
toolchain go1.24.4
3+
go 1.25
64

75
require (
8-
github.com/avast/retry-go/v4 v4.6.1
6+
github.com/avast/retry-go/v4 v4.7.0
97
github.com/cilium/cilium v1.17.5
108
github.com/google/go-cmp v0.7.0
119
github.com/google/uuid v1.6.0
12-
github.com/metal-stack/metal-go v0.41.2
13-
github.com/metal-stack/metal-lib v0.23.0
10+
github.com/metal-stack/metal-go v0.42.4
11+
github.com/metal-stack/metal-lib v0.23.5
1412
github.com/metal-stack/v v1.0.3
15-
github.com/spf13/pflag v1.0.6
13+
github.com/spf13/pflag v1.0.10
1614
go.universe.tf/metallb v0.15.2
17-
k8s.io/api v0.33.2
18-
k8s.io/apimachinery v0.33.2
19-
k8s.io/client-go v0.33.2
20-
k8s.io/cloud-provider v0.33.2
21-
k8s.io/component-base v0.33.2
15+
k8s.io/api v0.34.1
16+
k8s.io/apimachinery v0.34.1
17+
k8s.io/client-go v0.34.1
18+
k8s.io/cloud-provider v0.34.1
19+
k8s.io/component-base v0.34.1
2220
k8s.io/klog/v2 v2.130.1
23-
sigs.k8s.io/controller-runtime v0.21.0
21+
sigs.k8s.io/controller-runtime v0.22.4
2422
)
2523

2624
require (
27-
cel.dev/expr v0.24.0 // indirect
25+
cel.dev/expr v0.25.1 // indirect
2826
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
2927
github.com/NYTimes/gziphandler v1.1.1 // indirect
3028
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
31-
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
3229
github.com/beorn7/perks v1.0.1 // indirect
3330
github.com/blang/semver/v4 v4.0.0 // indirect
34-
github.com/cenkalti/backoff/v5 v5.0.2 // indirect
31+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3532
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3633
github.com/cilium/ebpf v0.17.1 // indirect
3734
github.com/cilium/hive v0.0.0-20250522145610-0734675df148 // indirect
@@ -43,125 +40,134 @@ require (
4340
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
4441
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4542
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
46-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
43+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4744
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4845
github.com/felixge/httpsnoop v1.0.4 // indirect
4946
github.com/fsnotify/fsnotify v1.9.0 // indirect
50-
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
51-
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
47+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
48+
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
5249
github.com/go-logr/logr v1.4.3 // indirect
5350
github.com/go-logr/stdr v1.2.2 // indirect
54-
github.com/go-openapi/analysis v0.23.0 // indirect
55-
github.com/go-openapi/errors v0.22.1 // indirect
56-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
57-
github.com/go-openapi/jsonreference v0.21.0 // indirect
58-
github.com/go-openapi/loads v0.22.0 // indirect
59-
github.com/go-openapi/runtime v0.28.0 // indirect
60-
github.com/go-openapi/spec v0.21.0 // indirect
61-
github.com/go-openapi/strfmt v0.23.0 // indirect
62-
github.com/go-openapi/swag v0.23.1 // indirect
63-
github.com/go-openapi/validate v0.24.0 // indirect
64-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
51+
github.com/go-openapi/analysis v0.24.1 // indirect
52+
github.com/go-openapi/errors v0.22.4 // indirect
53+
github.com/go-openapi/jsonpointer v0.22.1 // indirect
54+
github.com/go-openapi/jsonreference v0.21.3 // indirect
55+
github.com/go-openapi/loads v0.23.2 // indirect
56+
github.com/go-openapi/runtime v0.29.2 // indirect
57+
github.com/go-openapi/spec v0.22.1 // indirect
58+
github.com/go-openapi/strfmt v0.25.0 // indirect
59+
github.com/go-openapi/swag v0.25.1 // indirect
60+
github.com/go-openapi/swag/cmdutils v0.25.1 // indirect
61+
github.com/go-openapi/swag/conv v0.25.1 // indirect
62+
github.com/go-openapi/swag/fileutils v0.25.1 // indirect
63+
github.com/go-openapi/swag/jsonname v0.25.1 // indirect
64+
github.com/go-openapi/swag/jsonutils v0.25.1 // indirect
65+
github.com/go-openapi/swag/loading v0.25.1 // indirect
66+
github.com/go-openapi/swag/mangling v0.25.1 // indirect
67+
github.com/go-openapi/swag/netutils v0.25.1 // indirect
68+
github.com/go-openapi/swag/stringutils v0.25.1 // indirect
69+
github.com/go-openapi/swag/typeutils v0.25.1 // indirect
70+
github.com/go-openapi/swag/yamlutils v0.25.1 // indirect
71+
github.com/go-openapi/validate v0.25.1 // indirect
72+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6573
github.com/goccy/go-json v0.10.5 // indirect
6674
github.com/gogo/protobuf v1.3.2 // indirect
67-
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
75+
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
6876
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
6977
github.com/golang/protobuf v1.5.4 // indirect
7078
github.com/google/btree v1.1.3 // indirect
71-
github.com/google/cel-go v0.25.0 // indirect
72-
github.com/google/gnostic-models v0.6.9 // indirect
79+
github.com/google/cel-go v0.26.1 // indirect
80+
github.com/google/gnostic-models v0.7.0 // indirect
7381
github.com/gopacket/gopacket v1.3.1 // indirect
7482
github.com/gorilla/mux v1.8.1 // indirect
7583
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
76-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
84+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.3 // indirect
7785
github.com/inconshreveable/mousetrap v1.1.0 // indirect
78-
github.com/josharian/intern v1.0.0 // indirect
7986
github.com/json-iterator/go v1.1.12 // indirect
8087
github.com/kylelemons/godebug v1.1.0 // indirect
81-
github.com/lestrrat-go/blackmagic v1.0.3 // indirect
88+
github.com/lestrrat-go/blackmagic v1.0.4 // indirect
8289
github.com/lestrrat-go/httpcc v1.0.1 // indirect
8390
github.com/lestrrat-go/httprc v1.0.6 // indirect
8491
github.com/lestrrat-go/iter v1.0.2 // indirect
8592
github.com/lestrrat-go/jwx/v2 v2.1.6 // indirect
8693
github.com/lestrrat-go/option v1.0.1 // indirect
8794
github.com/mackerelio/go-osstat v0.2.6 // indirect
88-
github.com/mailru/easyjson v0.9.0 // indirect
8995
github.com/metal-stack/security v0.9.4 // indirect
9096
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
9197
github.com/mitchellh/mapstructure v1.5.0 // indirect
9298
github.com/moby/term v0.5.2 // indirect
9399
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
94-
github.com/modern-go/reflect2 v1.0.2 // indirect
100+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
95101
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
96102
github.com/oklog/ulid v1.3.1 // indirect
97-
github.com/opentracing/opentracing-go v1.2.1-0.20220228012449-10b1cf09e00b // indirect
98-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
99-
github.com/petermattis/goid v0.0.0-20240813172612-4fcff4a6cae7 // indirect
103+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
104+
github.com/petermattis/goid v0.0.0-20250813065127-a731cc31b4fe // indirect
100105
github.com/pkg/errors v0.9.1 // indirect
101-
github.com/prometheus/client_golang v1.22.0 // indirect
106+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
107+
github.com/prometheus/client_golang v1.23.2 // indirect
102108
github.com/prometheus/client_model v0.6.2 // indirect
103-
github.com/prometheus/common v0.64.0 // indirect
104-
github.com/prometheus/procfs v0.16.1 // indirect
105-
github.com/rogpeppe/go-internal v1.14.1 // indirect
106-
github.com/sagikazarmark/locafero v0.7.0 // indirect
107-
github.com/sasha-s/go-deadlock v0.3.5 // indirect
108-
github.com/segmentio/asm v1.2.0 // indirect
109+
github.com/prometheus/common v0.67.2 // indirect
110+
github.com/prometheus/procfs v0.19.2 // indirect
111+
github.com/sagikazarmark/locafero v0.12.0 // indirect
112+
github.com/sasha-s/go-deadlock v0.3.6 // indirect
113+
github.com/segmentio/asm v1.2.1 // indirect
109114
github.com/sirupsen/logrus v1.9.3 // indirect
110-
github.com/sourcegraph/conc v0.3.0 // indirect
111-
github.com/spf13/afero v1.14.0 // indirect
112-
github.com/spf13/cast v1.9.2 // indirect
113-
github.com/spf13/cobra v1.9.1 // indirect
114-
github.com/spf13/viper v1.20.1 // indirect
115-
github.com/stoewer/go-strcase v1.3.0 // indirect
115+
github.com/spf13/afero v1.15.0 // indirect
116+
github.com/spf13/cast v1.10.0 // indirect
117+
github.com/spf13/cobra v1.10.1 // indirect
118+
github.com/spf13/viper v1.21.0 // indirect
119+
github.com/stoewer/go-strcase v1.3.1 // indirect
116120
github.com/subosito/gotenv v1.6.0 // indirect
117121
github.com/vishvananda/netlink v1.3.1 // indirect
118122
github.com/vishvananda/netns v0.0.5 // indirect
119123
github.com/x448/float16 v0.8.4 // indirect
120-
go.etcd.io/etcd/api/v3 v3.5.21 // indirect
121-
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
122-
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
123-
go.mongodb.org/mongo-driver v1.17.4 // indirect
124-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
125-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
126-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
127-
go.opentelemetry.io/otel v1.36.0 // indirect
128-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
129-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.36.0 // indirect
130-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
131-
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
132-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
133-
go.opentelemetry.io/proto/otlp v1.7.0 // indirect
124+
go.etcd.io/etcd/api/v3 v3.6.4 // indirect
125+
go.etcd.io/etcd/client/pkg/v3 v3.6.4 // indirect
126+
go.etcd.io/etcd/client/v3 v3.6.4 // indirect
127+
go.mongodb.org/mongo-driver v1.17.6 // indirect
128+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
129+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
130+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
131+
go.opentelemetry.io/otel v1.38.0 // indirect
132+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
133+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
134+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
135+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
136+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
137+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
134138
go.uber.org/dig v1.19.0 // indirect
135139
go.uber.org/multierr v1.11.0 // indirect
136140
go.uber.org/zap v1.27.0 // indirect
141+
go.yaml.in/yaml/v2 v2.4.3 // indirect
142+
go.yaml.in/yaml/v3 v3.0.4 // indirect
137143
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
138-
golang.org/x/crypto v0.39.0 // indirect
139-
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
140-
golang.org/x/net v0.41.0 // indirect
141-
golang.org/x/oauth2 v0.30.0 // indirect
142-
golang.org/x/sync v0.15.0 // indirect
143-
golang.org/x/sys v0.33.0 // indirect
144-
golang.org/x/term v0.32.0 // indirect
145-
golang.org/x/text v0.26.0 // indirect
146-
golang.org/x/time v0.12.0 // indirect
147-
golang.org/x/tools v0.34.0 // indirect
148-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
149-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
150-
google.golang.org/grpc v1.73.0 // indirect
151-
google.golang.org/protobuf v1.36.6 // indirect
144+
golang.org/x/crypto v0.44.0 // indirect
145+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
146+
golang.org/x/net v0.47.0 // indirect
147+
golang.org/x/oauth2 v0.33.0 // indirect
148+
golang.org/x/sync v0.18.0 // indirect
149+
golang.org/x/sys v0.38.0 // indirect
150+
golang.org/x/term v0.37.0 // indirect
151+
golang.org/x/text v0.31.0 // indirect
152+
golang.org/x/time v0.14.0 // indirect
153+
golang.org/x/tools v0.38.0 // indirect
154+
google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba // indirect
155+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251111163417-95abcf5c77ba // indirect
156+
google.golang.org/grpc v1.76.0 // indirect
157+
google.golang.org/protobuf v1.36.10 // indirect
152158
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
153159
gopkg.in/inf.v0 v0.9.1 // indirect
154160
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
155161
gopkg.in/yaml.v3 v3.0.1 // indirect
156-
k8s.io/apiserver v0.33.2 // indirect
157-
k8s.io/component-helpers v0.33.2 // indirect
158-
k8s.io/controller-manager v0.33.2 // indirect
159-
k8s.io/kms v0.33.2 // indirect
160-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
161-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
162+
k8s.io/apiserver v0.34.1 // indirect
163+
k8s.io/component-helpers v0.34.1 // indirect
164+
k8s.io/controller-manager v0.34.1 // indirect
165+
k8s.io/kms v0.34.1 // indirect
166+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
167+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
162168
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
163169
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
164170
sigs.k8s.io/randfill v1.0.0 // indirect
165-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
166-
sigs.k8s.io/yaml v1.4.0 // indirect
171+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
172+
sigs.k8s.io/yaml v1.6.0 // indirect
167173
)

0 commit comments

Comments
 (0)