Skip to content

Commit 3c7c616

Browse files
committed
Bump ASO version to v2.12.1-0.20250225214749-5877298caa17
Signed-off-by: Bryan Cox <[email protected]>
1 parent 99c1474 commit 3c7c616

File tree

2 files changed

+91
-81
lines changed

2 files changed

+91
-81
lines changed

go.mod

Lines changed: 33 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module sigs.k8s.io/cluster-api-provider-azure
22

3-
go 1.22.7
3+
go 1.23.0
44

5-
toolchain go1.22.12
5+
toolchain go1.23.6
66

77
require (
88
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
@@ -18,7 +18,7 @@ require (
1818
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resourcehealth/armresourcehealth v1.3.0
1919
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources v1.2.0
2020
github.com/Azure/azure-sdk-for-go/sdk/tracing/azotel v0.4.0
21-
github.com/Azure/azure-service-operator/v2 v2.11.0
21+
github.com/Azure/azure-service-operator/v2 v2.12.1-0.20250225214749-5877298caa17
2222
github.com/Azure/go-autorest/autorest v0.11.30
2323
github.com/Azure/go-autorest/autorest/azure/auth v0.5.13
2424
github.com/Azure/msi-dataplane v0.4.0
@@ -47,18 +47,18 @@ require (
4747
golang.org/x/mod v0.23.0
4848
golang.org/x/text v0.22.0
4949
gopkg.in/yaml.v3 v3.0.1
50-
k8s.io/api v0.31.3
51-
k8s.io/apimachinery v0.31.3
52-
k8s.io/client-go v0.31.3
50+
k8s.io/api v0.32.1
51+
k8s.io/apimachinery v0.32.1
52+
k8s.io/client-go v0.32.1
5353
k8s.io/cluster-bootstrap v0.31.3
54-
k8s.io/component-base v0.31.3
54+
k8s.io/component-base v0.32.1
5555
k8s.io/klog/v2 v2.130.1
5656
k8s.io/kubectl v0.30.3
57-
k8s.io/utils v0.0.0-20240821151609-f90d01438635
57+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
5858
sigs.k8s.io/cloud-provider-azure v1.30.4
5959
sigs.k8s.io/cluster-api v1.9.4
6060
sigs.k8s.io/cluster-api/test v1.9.4
61-
sigs.k8s.io/controller-runtime v0.19.4
61+
sigs.k8s.io/controller-runtime v0.19.5
6262
sigs.k8s.io/kind v0.27.0
6363
)
6464

@@ -71,7 +71,7 @@ require (
7171
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry v1.2.0 // indirect
7272
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault v1.4.0 // indirect
7373
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.6.0 // indirect
74-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
74+
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
7575
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
7676
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
7777
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
@@ -82,11 +82,12 @@ require (
8282
github.com/moby/docker-image-spec v1.3.1 // indirect
8383
github.com/moby/term v0.5.0 // indirect
8484
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
85-
github.com/samber/lo v1.47.0 // indirect
85+
github.com/rotisserie/eris v0.5.4 // indirect
86+
github.com/samber/lo v1.49.1 // indirect
8687
github.com/x448/float16 v0.8.4 // indirect
8788
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
8889
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
89-
k8s.io/apiserver v0.31.3 // indirect
90+
k8s.io/apiserver v0.32.1 // indirect
9091
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.29 // indirect
9192
sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader v0.0.16 // indirect
9293
)
@@ -142,18 +143,17 @@ require (
142143
github.com/gogo/protobuf v1.3.2 // indirect
143144
github.com/golang-jwt/jwt/v4 v4.5.1 // indirect
144145
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
145-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
146146
github.com/golang/protobuf v1.5.4 // indirect
147147
github.com/google/btree v1.0.1 // indirect
148-
github.com/google/cel-go v0.22.0 // indirect
148+
github.com/google/cel-go v0.22.1 // indirect
149149
github.com/google/gnostic-models v0.6.8 // indirect
150150
github.com/google/go-github/v53 v53.2.0 // indirect
151151
github.com/google/go-querystring v1.1.0 // indirect
152152
github.com/google/gofuzz v1.2.0 // indirect
153153
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
154154
github.com/google/safetext v0.0.0-20220905092116-b49f7bc46da2 // indirect
155155
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
156-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
156+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
157157
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
158158
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
159159
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -172,7 +172,7 @@ require (
172172
github.com/mitchellh/go-homedir v1.1.0 // indirect
173173
github.com/mitchellh/mapstructure v1.5.0 // indirect
174174
github.com/mitchellh/reflectwalk v1.0.2 // indirect
175-
github.com/moby/spdystream v0.4.0 // indirect
175+
github.com/moby/spdystream v0.5.0 // indirect
176176
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
177177
github.com/modern-go/reflect2 v1.0.2 // indirect
178178
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -209,7 +209,7 @@ require (
209209
golang.org/x/sync v0.11.0 // indirect
210210
golang.org/x/sys v0.30.0 // indirect
211211
golang.org/x/term v0.29.0 // indirect
212-
golang.org/x/time v0.8.0 // indirect
212+
golang.org/x/time v0.9.0 // indirect
213213
golang.org/x/tools v0.30.0 // indirect
214214
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
215215
google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
@@ -219,15 +219,26 @@ require (
219219
gopkg.in/inf.v0 v0.9.1 // indirect
220220
gopkg.in/ini.v1 v1.67.0 // indirect
221221
gopkg.in/yaml.v2 v2.4.0 // indirect
222-
k8s.io/apiextensions-apiserver v0.31.3 // indirect
222+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
223223
k8s.io/cli-runtime v0.30.3 // indirect
224224
k8s.io/cloud-provider v0.30.2 // indirect
225225
k8s.io/component-helpers v0.30.3 // indirect
226-
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
227-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
228-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
226+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
227+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
228+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
229229
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
230230
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
231-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
231+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
232232
sigs.k8s.io/yaml v1.4.0 // indirect
233233
)
234+
235+
// The bump to ASO v2.12.1-0.20250225214749-5877298caa17 brings in k8s apimachinery v0.32.1; however CAPI hasn't bumped
236+
// to that version just yet. Without this replace, there are go mod tidy issues like:
237+
// go: finding module for package k8s.io/apiserver/pkg/util/version
238+
// go: sigs.k8s.io/cluster-api-provider-azure/test imports
239+
// sigs.k8s.io/cluster-api/test/framework imports
240+
// sigs.k8s.io/cluster-api/cmd/clusterctl/client/cluster imports
241+
// sigs.k8s.io/cluster-api/internal/controllers/clusterclass tested by
242+
// sigs.k8s.io/cluster-api/internal/controllers/clusterclass.test imports
243+
// k8s.io/apiserver/pkg/util/version: module k8s.io/apiserver@latest found (v0.32.2), but does not contain package k8s.io/apiserver/pkg/util/version
244+
replace k8s.io/apiserver => k8s.io/apiserver v0.31.3

0 commit comments

Comments
 (0)