Skip to content

Commit ef5aaa5

Browse files
committed
Uplift CAPI to v1.12.0-beta-0
Signed-off-by: Sunnatillo <[email protected]>
1 parent b428328 commit ef5aaa5

File tree

10 files changed

+498
-447
lines changed

10 files changed

+498
-447
lines changed

api/go.mod

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -6,53 +6,59 @@ require (
66
github.com/metal3-io/ip-address-manager/api v1.11.0
77
github.com/onsi/gomega v1.38.2
88
github.com/pkg/errors v0.9.1
9-
k8s.io/api v0.33.5
10-
k8s.io/apiextensions-apiserver v0.33.5
11-
k8s.io/apimachinery v0.33.5
12-
k8s.io/client-go v0.33.5
13-
sigs.k8s.io/cluster-api v1.11.3
14-
sigs.k8s.io/controller-runtime v0.21.0
9+
k8s.io/api v0.34.1
10+
k8s.io/apiextensions-apiserver v0.34.1
11+
k8s.io/apimachinery v0.34.1
12+
k8s.io/client-go v0.34.1
13+
sigs.k8s.io/cluster-api v1.12.0-beta.0
14+
sigs.k8s.io/controller-runtime v0.22.4
1515
)
1616

1717
require (
18-
github.com/blang/semver/v4 v4.0.0 // indirect
18+
github.com/beorn7/perks v1.0.1 // indirect
19+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1920
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
20-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
21+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2122
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
22-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
23+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2324
github.com/go-logr/logr v1.4.3 // indirect
2425
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2526
github.com/go-openapi/jsonreference v0.20.2 // indirect
2627
github.com/go-openapi/swag v0.23.0 // indirect
2728
github.com/gogo/protobuf v1.3.2 // indirect
28-
github.com/google/gnostic-models v0.6.9 // indirect
29+
github.com/google/gnostic-models v0.7.0 // indirect
2930
github.com/google/go-cmp v0.7.0 // indirect
3031
github.com/google/uuid v1.6.0 // indirect
3132
github.com/josharian/intern v1.0.0 // indirect
3233
github.com/json-iterator/go v1.1.12 // indirect
3334
github.com/mailru/easyjson v0.7.7 // indirect
3435
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
35-
github.com/modern-go/reflect2 v1.0.2 // indirect
36+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
3637
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
37-
github.com/spf13/pflag v1.0.7 // indirect
38+
github.com/pmezard/go-difflib v1.0.0 // indirect
39+
github.com/prometheus/client_golang v1.22.0 // indirect
40+
github.com/prometheus/client_model v0.6.1 // indirect
41+
github.com/prometheus/common v0.62.0 // indirect
42+
github.com/prometheus/procfs v0.15.1 // indirect
43+
github.com/spf13/pflag v1.0.10 // indirect
3844
github.com/x448/float16 v0.8.4 // indirect
3945
go.yaml.in/yaml/v2 v2.4.2 // indirect
4046
go.yaml.in/yaml/v3 v3.0.4 // indirect
41-
golang.org/x/net v0.43.0 // indirect
42-
golang.org/x/oauth2 v0.30.0 // indirect
43-
golang.org/x/sys v0.35.0 // indirect
44-
golang.org/x/term v0.34.0 // indirect
45-
golang.org/x/text v0.28.0 // indirect
47+
golang.org/x/net v0.46.0 // indirect
48+
golang.org/x/oauth2 v0.32.0 // indirect
49+
golang.org/x/sys v0.37.0 // indirect
50+
golang.org/x/term v0.36.0 // indirect
51+
golang.org/x/text v0.30.0 // indirect
4652
golang.org/x/time v0.9.0 // indirect
4753
google.golang.org/protobuf v1.36.7 // indirect
4854
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4955
gopkg.in/inf.v0 v0.9.1 // indirect
5056
gopkg.in/yaml.v3 v3.0.1 //indirect
5157
k8s.io/klog/v2 v2.130.1 // indirect
52-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
53-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
54-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
58+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
59+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
60+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
5561
sigs.k8s.io/randfill v1.0.0 // indirect
56-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
62+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
5763
sigs.k8s.io/yaml v1.6.0 // indirect
5864
)

api/go.sum

Lines changed: 52 additions & 54 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,22 @@ require (
1313
github.com/pkg/errors v0.9.1
1414
github.com/spf13/pflag v1.0.10
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.33.5
17-
k8s.io/apiextensions-apiserver v0.33.5
18-
k8s.io/apimachinery v0.33.5
19-
k8s.io/client-go v0.33.5
20-
k8s.io/component-base v0.33.5
16+
k8s.io/api v0.34.1
17+
k8s.io/apiextensions-apiserver v0.34.1
18+
k8s.io/apimachinery v0.34.1
19+
k8s.io/client-go v0.34.1
20+
k8s.io/component-base v0.34.1
2121
k8s.io/klog/v2 v2.130.1
22-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
23-
sigs.k8s.io/cluster-api v1.11.3
24-
sigs.k8s.io/controller-runtime v0.21.0
22+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
23+
sigs.k8s.io/cluster-api v1.12.0-beta.0
24+
sigs.k8s.io/controller-runtime v0.22.4
2525
sigs.k8s.io/yaml v1.6.0
2626
)
2727

2828
replace github.com/metal3-io/cluster-api-provider-metal3/api => ./api
2929

3030
require (
31-
cel.dev/expr v0.19.1 // indirect
31+
cel.dev/expr v0.24.0 // indirect
3232
github.com/Masterminds/semver/v3 v3.4.0 // indirect
3333
github.com/NYTimes/gziphandler v1.1.1 // indirect
3434
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -37,11 +37,11 @@ require (
3737
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3838
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3939
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
40-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
40+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
4141
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4242
github.com/felixge/httpsnoop v1.0.4 // indirect
43-
github.com/fsnotify/fsnotify v1.8.0 // indirect
44-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
43+
github.com/fsnotify/fsnotify v1.9.0 // indirect
44+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4545
github.com/go-logr/stdr v1.2.2 // indirect
4646
github.com/go-logr/zapr v1.3.0 // indirect
4747
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -51,63 +51,64 @@ require (
5151
github.com/gobuffalo/flect v1.0.3 // indirect
5252
github.com/gogo/protobuf v1.3.2 // indirect
5353
github.com/google/btree v1.1.3 // indirect
54-
github.com/google/cel-go v0.23.2 // indirect
55-
github.com/google/gnostic-models v0.6.9 // indirect
54+
github.com/google/cel-go v0.26.0 // indirect
55+
github.com/google/gnostic-models v0.7.0 // indirect
5656
github.com/google/go-cmp v0.7.0 // indirect
5757
github.com/google/pprof v0.0.0-20250820193118-f64d9cf942d6 // indirect
5858
github.com/google/uuid v1.6.0 // indirect
59-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
59+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
6060
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6161
github.com/josharian/intern v1.0.0 // indirect
6262
github.com/json-iterator/go v1.1.12 // indirect
6363
github.com/kylelemons/godebug v1.1.0 // indirect
6464
github.com/mailru/easyjson v0.7.7 // indirect
6565
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
66-
github.com/modern-go/reflect2 v1.0.2 // indirect
66+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
6767
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
68+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
6869
github.com/prometheus/client_golang v1.22.0 // indirect
6970
github.com/prometheus/client_model v0.6.1 // indirect
7071
github.com/prometheus/common v0.62.0 // indirect
7172
github.com/prometheus/procfs v0.15.1 // indirect
72-
github.com/spf13/cobra v1.9.1 // indirect
73+
github.com/spf13/cobra v1.10.1 // indirect
7374
github.com/stoewer/go-strcase v1.3.0 // indirect
7475
github.com/x448/float16 v0.8.4 // indirect
7576
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
7677
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
77-
go.opentelemetry.io/otel v1.34.0 // indirect
78-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
79-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
80-
go.opentelemetry.io/otel/metric v1.34.0 // indirect
78+
go.opentelemetry.io/otel v1.35.0 // indirect
79+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
80+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
81+
go.opentelemetry.io/otel/metric v1.35.0 // indirect
8182
go.opentelemetry.io/otel/sdk v1.34.0 // indirect
82-
go.opentelemetry.io/otel/trace v1.34.0 // indirect
83-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
83+
go.opentelemetry.io/otel/trace v1.35.0 // indirect
84+
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
8485
go.uber.org/multierr v1.11.0 // indirect
8586
go.uber.org/zap v1.27.0 // indirect
8687
go.yaml.in/yaml/v2 v2.4.2 // indirect
8788
go.yaml.in/yaml/v3 v3.0.4 // indirect
8889
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
89-
golang.org/x/mod v0.27.0 // indirect
90-
golang.org/x/net v0.43.0 // indirect
91-
golang.org/x/oauth2 v0.30.0 // indirect
92-
golang.org/x/sync v0.16.0 // indirect
93-
golang.org/x/sys v0.35.0 // indirect
94-
golang.org/x/term v0.34.0 // indirect
95-
golang.org/x/text v0.28.0 // indirect
90+
golang.org/x/mod v0.28.0 // indirect
91+
golang.org/x/net v0.46.0 // indirect
92+
golang.org/x/oauth2 v0.32.0 // indirect
93+
golang.org/x/sync v0.17.0 // indirect
94+
golang.org/x/sys v0.37.0 // indirect
95+
golang.org/x/term v0.36.0 // indirect
96+
golang.org/x/text v0.30.0 // indirect
9697
golang.org/x/time v0.9.0 // indirect
97-
golang.org/x/tools v0.36.0 // indirect
98+
golang.org/x/tools v0.37.0 // indirect
9899
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
99-
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
100-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
101-
google.golang.org/grpc v1.71.3 // indirect
100+
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
101+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
102+
google.golang.org/grpc v1.72.3 // indirect
102103
google.golang.org/protobuf v1.36.7 // indirect
103104
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
104105
gopkg.in/inf.v0 v0.9.1 // indirect
105106
gopkg.in/yaml.v3 v3.0.1 // indirect
106-
k8s.io/apiserver v0.33.5 // indirect
107-
k8s.io/cluster-bootstrap v0.33.3 // indirect
108-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
107+
k8s.io/apiserver v0.34.1 // indirect
108+
k8s.io/cluster-bootstrap v0.34.1 // indirect
109+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
109110
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
110-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
111+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
111112
sigs.k8s.io/randfill v1.0.0 // indirect
112-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
113+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
113114
)

0 commit comments

Comments
 (0)