Skip to content

Commit 4194b9e

Browse files
Merge pull request #900 from salasberryfin/bump_capi_to_v1.12.7_release-0.24
[release-0.24] bump capi to v1.12.7
2 parents 3f8be9f + 80e0d38 commit 4194b9e

6 files changed

Lines changed: 62 additions & 74 deletions

File tree

go.mod

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
go.etcd.io/etcd/api/v3 v3.6.6
1717
go.etcd.io/etcd/client/v3 v3.6.6
1818
go.uber.org/zap v1.27.1
19-
google.golang.org/grpc v1.78.0
19+
google.golang.org/grpc v1.79.3
2020
gopkg.in/yaml.v3 v3.0.1
2121
k8s.io/api v0.34.3
2222
k8s.io/apiextensions-apiserver v0.34.3
@@ -25,16 +25,16 @@ require (
2525
k8s.io/client-go v0.34.3
2626
k8s.io/klog/v2 v2.130.1
2727
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
28-
sigs.k8s.io/cluster-api v1.12.3
29-
sigs.k8s.io/cluster-api/test v1.12.3
28+
sigs.k8s.io/cluster-api v1.12.7
29+
sigs.k8s.io/cluster-api/test v1.12.7
3030
sigs.k8s.io/controller-runtime v0.22.5
3131
sigs.k8s.io/kind v0.31.0
3232
sigs.k8s.io/yaml v1.6.0
3333
)
3434

3535
require (
3636
al.essio.dev/pkg/shellescape v1.5.1 // indirect
37-
cel.dev/expr v0.24.0 // indirect
37+
cel.dev/expr v0.25.1 // indirect
3838
dario.cat/mergo v1.0.1 // indirect
3939
github.com/BurntSushi/toml v1.4.0 // indirect
4040
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -48,7 +48,7 @@ require (
4848
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
4949
github.com/beorn7/perks v1.0.1 // indirect
5050
github.com/blang/semver/v4 v4.0.0 // indirect
51-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
51+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
5252
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5353
github.com/clarketm/json v1.17.1 // indirect
5454
github.com/cloudflare/circl v1.6.3 // indirect
@@ -59,7 +59,6 @@ require (
5959
github.com/coreos/go-systemd/v22 v22.7.0 // indirect
6060
github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 // indirect
6161
github.com/distribution/reference v0.6.0 // indirect
62-
github.com/docker/docker v28.5.2+incompatible // indirect
6362
github.com/docker/go-connections v0.6.0 // indirect
6463
github.com/docker/go-units v0.5.0 // indirect
6564
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
@@ -88,7 +87,7 @@ require (
8887
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
8988
github.com/google/uuid v1.6.0 // indirect
9089
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
91-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
90+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
9291
github.com/huandu/xstrings v1.5.0 // indirect
9392
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9493
github.com/josharian/intern v1.0.0 // indirect
@@ -101,8 +100,9 @@ require (
101100
github.com/mitchellh/copystructure v1.2.0 // indirect
102101
github.com/mitchellh/reflectwalk v1.0.2 // indirect
103102
github.com/moby/docker-image-spec v1.3.1 // indirect
103+
github.com/moby/moby/api v1.54.1 // indirect
104+
github.com/moby/moby/client v0.4.0 // indirect
104105
github.com/moby/spdystream v0.5.0 // indirect
105-
github.com/moby/sys/sequential v0.6.0 // indirect
106106
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
107107
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
108108
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -136,14 +136,14 @@ require (
136136
github.com/x448/float16 v0.8.4 // indirect
137137
go.etcd.io/etcd/client/pkg/v3 v3.6.6 // indirect
138138
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
139-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
139+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
140140
go.opentelemetry.io/otel v1.40.0 // indirect
141-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
142-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
141+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
142+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
143143
go.opentelemetry.io/otel/metric v1.40.0 // indirect
144144
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
145145
go.opentelemetry.io/otel/trace v1.40.0 // indirect
146-
go.opentelemetry.io/proto/otlp v1.5.0 // indirect
146+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
147147
go.uber.org/multierr v1.11.0 // indirect
148148
go.yaml.in/yaml/v2 v2.4.2 // indirect
149149
go.yaml.in/yaml/v3 v3.0.4 // indirect
@@ -159,8 +159,8 @@ require (
159159
golang.org/x/time v0.14.0 // indirect
160160
golang.org/x/tools v0.41.0 // indirect
161161
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
162-
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
163-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251222181119-0a764e51fe1b // indirect
162+
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
163+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
164164
google.golang.org/protobuf v1.36.11 // indirect
165165
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
166166
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -170,5 +170,5 @@ require (
170170
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
171171
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
172172
sigs.k8s.io/randfill v1.0.0 // indirect
173-
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
173+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
174174
)

0 commit comments

Comments
 (0)