Skip to content

Commit 7b2a9d3

Browse files
Amulyam24Amulyam24
authored
[release-0.11]Update cluster-api and golang version (#2490)
1 parent 6c28dba commit 7b2a9d3

File tree

9 files changed

+36
-36
lines changed

9 files changed

+36
-36
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ RELEASE_NOTES_DIR := CHANGELOG
8484
OUTPUT_TYPE ?= type=registry
8585

8686
# Go
87-
GO_VERSION ?=1.24.6
87+
GO_VERSION ?=1.24.7
8888
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
8989

9090
# Trivy

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.23.2
66
replace (
77
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.23.3
88
github.com/onsi/gomega => github.com/onsi/gomega v1.36.3
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.3
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6
1010
)
1111

1212
require (
@@ -40,8 +40,8 @@ require (
4040
k8s.io/component-base v0.32.3
4141
k8s.io/klog/v2 v2.130.1
4242
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
43-
sigs.k8s.io/cluster-api v1.10.3
44-
sigs.k8s.io/cluster-api/test v1.10.3
43+
sigs.k8s.io/cluster-api v1.10.6
44+
sigs.k8s.io/cluster-api/test v1.10.6
4545
sigs.k8s.io/controller-runtime v0.20.4
4646
sigs.k8s.io/yaml v1.4.0
4747
)
@@ -98,7 +98,7 @@ require (
9898
github.com/go-playground/universal-translator v0.18.1 // indirect
9999
github.com/go-playground/validator/v10 v10.26.0 // indirect
100100
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
101-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
101+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
102102
github.com/gobuffalo/flect v1.0.3 // indirect
103103
github.com/gogo/protobuf v1.3.2 // indirect
104104
github.com/golang/protobuf v1.5.4 // indirect

‎go.sum‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
6060
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
6161
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
6262
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
63-
github.com/coredns/corefile-migration v1.0.26 h1:xiiEkVB1Dwolb24pkeDUDBfygV9/XsOSq79yFCrhptY=
64-
github.com/coredns/corefile-migration v1.0.26/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
63+
github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM=
64+
github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
6565
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
6666
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
6767
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
@@ -146,8 +146,8 @@ github.com/go-playground/validator/v10 v10.26.0 h1:SP05Nqhjcvz81uJaRfEV0YBSSSGMc
146146
github.com/go-playground/validator/v10 v10.26.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo=
147147
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
148148
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
149-
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
150-
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
149+
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
150+
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
151151
github.com/gobuffalo/flect v1.0.3 h1:xeWBM2nui+qnVvNM4S3foBhCAL2XgPU+a7FdpelbTq4=
152152
github.com/gobuffalo/flect v1.0.3/go.mod h1:A5msMlrHtLqh9umBSnvabjsMrCcCpAyzglnDvkbYKHs=
153153
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
@@ -505,10 +505,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
505505
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
506506
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo=
507507
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
508-
sigs.k8s.io/cluster-api v1.10.3 h1:7tE5xgQJutisgDyeLzaZ9JhDaHGuG3GjPltsFM89BoA=
509-
sigs.k8s.io/cluster-api v1.10.3/go.mod h1:pu1WDn+fdax9aC9ZtDDoXqnO7P3LLjxbKGU/Nzf/DF4=
510-
sigs.k8s.io/cluster-api/test v1.10.3 h1:NFdzowDNIY6Pq+3DQKOdpctnIMk4rWBZCxDyKgo6vzM=
511-
sigs.k8s.io/cluster-api/test v1.10.3/go.mod h1:reUcQ/HTpDDkTXqsZj1BEmn3VzAoABy2XhLaM2XlMQQ=
508+
sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g=
509+
sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4=
510+
sigs.k8s.io/cluster-api/test v1.10.6 h1:xMRVX91mmvcWihzFpj9a7Zc5Np+zB6zfYoVD6tyww/s=
511+
sigs.k8s.io/cluster-api/test v1.10.6/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0=
512512
sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU=
513513
sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY=
514514
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=

‎hack/ccm/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
# Go
16-
GO_VERSION ?=1.24.6
16+
GO_VERSION ?=1.24.7
1717
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
1818

1919
REGISTRY=gcr.io/k8s-staging-capi-ibmcloud

‎hack/tools/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools
22

33
go 1.23.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.3
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6
66

77
require (
88
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46
@@ -15,7 +15,7 @@ require (
1515
gotest.tools/gotestsum v1.12.2
1616
k8s.io/code-generator v0.32.3
1717
k8s.io/release v0.16.9
18-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250613143655-9beb81e3a3ef
18+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250825160708-c37851897736
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387
2020
sigs.k8s.io/controller-tools v0.17.0
2121
sigs.k8s.io/kustomize/kustomize/v5 v5.5.0
@@ -195,7 +195,7 @@ require (
195195
github.com/go-toolsmith/astp v1.1.0 // indirect
196196
github.com/go-toolsmith/strparse v1.1.0 // indirect
197197
github.com/go-toolsmith/typep v1.1.0 // indirect
198-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
198+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
199199
github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
200200
github.com/goark/errs v1.3.2 // indirect
201201
github.com/goark/go-cvss v1.6.6 // indirect

‎hack/tools/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,8 +483,8 @@ github.com/go-toolsmith/strparse v1.1.0 h1:GAioeZUK9TGxnLS+qfdqNbA4z0SSm5zVNtCQi
483483
github.com/go-toolsmith/strparse v1.1.0/go.mod h1:7ksGy58fsaQkGQlY8WVoBFNyEPMGuJin1rfoPS4lBSQ=
484484
github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUNHus=
485485
github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig=
486-
github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
487-
github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
486+
github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs=
487+
github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
488488
github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY=
489489
github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
490490
github.com/goark/errs v1.3.2 h1:ifccNe1aK7Xezt4XVYwHUqalmnfhuphnEvh3FshCReQ=
@@ -1476,10 +1476,10 @@ mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8
14761476
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ=
14771477
sigs.k8s.io/bom v0.6.0 h1:IPMPHx6XdmMeW2oEeF66DgNyP5d4RxfuXwiC1qn+n9o=
14781478
sigs.k8s.io/bom v0.6.0/go.mod h1:MV0D3vdGlkaPgi5EwpwMBeQ8n8QS8Q2u1lJ5LyE7RLM=
1479-
sigs.k8s.io/cluster-api v1.10.3 h1:7tE5xgQJutisgDyeLzaZ9JhDaHGuG3GjPltsFM89BoA=
1480-
sigs.k8s.io/cluster-api v1.10.3/go.mod h1:pu1WDn+fdax9aC9ZtDDoXqnO7P3LLjxbKGU/Nzf/DF4=
1481-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250613143655-9beb81e3a3ef h1:/JeNvoiz+PJ8AGNeG3ydQna+stCdnGxc5AKomtxIp98=
1482-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250613143655-9beb81e3a3ef/go.mod h1:BIe6ByXRQqa5t7gR1Fb6kV9xQxkMc5foOsCQJdbd+M4=
1479+
sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g=
1480+
sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4=
1481+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250825160708-c37851897736 h1:xa87IUYgACVXj0IjPpp28TVZwfUR/tfhc/w7FjXtW6c=
1482+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250825160708-c37851897736/go.mod h1:fmT4/QJJPqD2FOWZCCo63SQnivsyQUntJI0gxvvbM1o=
14831483
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387 h1:WVCytp5VYi3EbLI/tKmjQ3zgEWdQrMAARVUtmqAmf48=
14841484
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387/go.mod h1:IaDsO8xSPRxRG1/rm9CP7+jPmj0nMNAuNi/yiHnLX8k=
14851485
sigs.k8s.io/controller-tools v0.17.0 h1:KaEQZbhrdY6J3zLBHplt+0aKUp8PeIttlhtF2UDo6bI=

‎netlify.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ command = "make -C docs/book build"
44
publish = "docs/book/book"
55

66
[build.environment]
7-
GO_VERSION = "1.24.6"
7+
GO_VERSION = "1.24.7"
88

99
# Standard Netlify redirects
1010
[[redirects]]

‎test/e2e/config/ibmcloud-e2e-powervs.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.10.3
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/core-components.yaml
12+
- name: v1.10.6
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.10.3
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/bootstrap-components.yaml
20+
- name: v1.10.6
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.10.3
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/control-plane-components.yaml
28+
- name: v1.10.6
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

‎test/e2e/config/ibmcloud-e2e-vpc.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ providers:
99
- name: cluster-api
1010
type: CoreProvider
1111
versions:
12-
- name: v1.10.3
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/core-components.yaml
12+
- name: v1.10.6
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml
1414
type: url
1515
files:
1616
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
1717
- name: kubeadm
1818
type: BootstrapProvider
1919
versions:
20-
- name: v1.10.3
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/bootstrap-components.yaml
20+
- name: v1.10.6
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml
2222
type: url
2323
files:
2424
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
2525
- name: kubeadm
2626
type: ControlPlaneProvider
2727
versions:
28-
- name: v1.10.3
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.3/control-plane-components.yaml
28+
- name: v1.10.6
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

0 commit comments

Comments
 (0)