Skip to content

Commit ac83396

Browse files
k8s-infra-cherrypick-robotAmulyam24
k8s-infra-cherrypick-robot
and
Amulyam24
authored
Update cluster-api to v1.11.2 and golang to 1.24.8 (#2513)
Co-authored-by: Amulyam24 <amulmek1@in.ibm.com>
1 parent 5cf2472 commit ac83396

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
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.8
8888
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
8989

9090
# Trivy

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ go 1.24.0
66
replace (
77
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.23.4
88
github.com/onsi/gomega => github.com/onsi/gomega v1.37.0
9-
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.1
9+
sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.2
1010
)
1111

1212
require (
@@ -40,8 +40,8 @@ require (
4040
k8s.io/component-base v0.33.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.11.1
44-
sigs.k8s.io/cluster-api/test v1.11.1
43+
sigs.k8s.io/cluster-api v1.11.2
44+
sigs.k8s.io/cluster-api/test v1.11.2
4545
sigs.k8s.io/controller-runtime v0.21.0
4646
sigs.k8s.io/yaml v1.6.0
4747
)

‎go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
6464
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
6565
github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0=
6666
github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4=
67-
github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM=
68-
github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
67+
github.com/coredns/corefile-migration v1.0.28 h1:O8YafUREqUcGbRtcJfOmWU6ifcw2HX76I1QvI5xZpsw=
68+
github.com/coredns/corefile-migration v1.0.28/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY=
6969
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
7070
github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
7171
github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
@@ -481,10 +481,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J
481481
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
482482
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
483483
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
484-
sigs.k8s.io/cluster-api v1.11.1 h1:7CyGCTxv1p3Y2kRe1ljTj/w4TcdIdWNj0CTBc4i1aBo=
485-
sigs.k8s.io/cluster-api v1.11.1/go.mod h1:zyrjgJ5RbXhwKcAdUlGPNK5YOHpcmxXvur+5I8lkMUQ=
486-
sigs.k8s.io/cluster-api/test v1.11.1 h1:p9tT2HupKHW1URQDsZ3QNdEC/YPc8nrkiV6RCtNgi5k=
487-
sigs.k8s.io/cluster-api/test v1.11.1/go.mod h1:COviHWIKTcip0VADeIh8Rm5bjqzyZ1LuzKBW1EqjJRc=
484+
sigs.k8s.io/cluster-api v1.11.2 h1:uAczaBavU5Y6aDgyoXWtq28k1kalpSZnVItwXHusw1c=
485+
sigs.k8s.io/cluster-api v1.11.2/go.mod h1:C1gJVAjMXRG+M+djjGYNkoi5kBMhFnOUI9QqZDAtMms=
486+
sigs.k8s.io/cluster-api/test v1.11.2 h1:SaYS/HexHPIU2r7oDBaq/CNOD+NP84oGnRY3KD9YIN8=
487+
sigs.k8s.io/cluster-api/test v1.11.2/go.mod h1:COviHWIKTcip0VADeIh8Rm5bjqzyZ1LuzKBW1EqjJRc=
488488
sigs.k8s.io/controller-runtime v0.21.0 h1:CYfjpEuicjUecRk+KAeyYh+ouUBn4llGyDYytIGcJS8=
489489
sigs.k8s.io/controller-runtime v0.21.0/go.mod h1:OSg14+F65eWqIu4DceX7k/+QRAbTTvxeQSNSOQpukWM=
490490
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.8
1717
GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION)
1818

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

‎hack/tools/go.mod‎

Lines changed: 2 additions & 2 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.24.0
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.1
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.11.2
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.3
1616
k8s.io/code-generator v0.33.3
1717
k8s.io/release v0.16.9
18-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250902052713-dc0fb8760107
18+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250923135618-a3139c21c0db
1919
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387
2020
sigs.k8s.io/controller-tools v0.18.0
2121
sigs.k8s.io/kustomize/kustomize/v5 v5.7.1

‎hack/tools/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,10 +1511,10 @@ mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 h1:WjUu4yQoT5BHT1w8Zu56SP836
15111511
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4/go.mod h1:rthT7OuvRbaGcd5ginj6dA2oLE7YNlta9qhBNNdCaLE=
15121512
sigs.k8s.io/bom v0.6.0 h1:IPMPHx6XdmMeW2oEeF66DgNyP5d4RxfuXwiC1qn+n9o=
15131513
sigs.k8s.io/bom v0.6.0/go.mod h1:MV0D3vdGlkaPgi5EwpwMBeQ8n8QS8Q2u1lJ5LyE7RLM=
1514-
sigs.k8s.io/cluster-api v1.11.1 h1:7CyGCTxv1p3Y2kRe1ljTj/w4TcdIdWNj0CTBc4i1aBo=
1515-
sigs.k8s.io/cluster-api v1.11.1/go.mod h1:zyrjgJ5RbXhwKcAdUlGPNK5YOHpcmxXvur+5I8lkMUQ=
1516-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250902052713-dc0fb8760107 h1:nrHxoKCdYG9s4kS1v0j5EJ8K3JTz6rlQdnfu5tIWRVQ=
1517-
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250902052713-dc0fb8760107/go.mod h1:NI3ikApK2FzecHWNuglo2chzggfSCKN0JSLBn8eSMR8=
1514+
sigs.k8s.io/cluster-api v1.11.2 h1:uAczaBavU5Y6aDgyoXWtq28k1kalpSZnVItwXHusw1c=
1515+
sigs.k8s.io/cluster-api v1.11.2/go.mod h1:C1gJVAjMXRG+M+djjGYNkoi5kBMhFnOUI9QqZDAtMms=
1516+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250923135618-a3139c21c0db h1:lZLIbMbxs0VuMhVgy0rKRUCctDmw6Fav3HKmrovXitc=
1517+
sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250923135618-a3139c21c0db/go.mod h1:NI3ikApK2FzecHWNuglo2chzggfSCKN0JSLBn8eSMR8=
15181518
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387 h1:WVCytp5VYi3EbLI/tKmjQ3zgEWdQrMAARVUtmqAmf48=
15191519
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387/go.mod h1:IaDsO8xSPRxRG1/rm9CP7+jPmj0nMNAuNi/yiHnLX8k=
15201520
sigs.k8s.io/controller-tools v0.18.0 h1:rGxGZCZTV2wJreeRgqVoWab/mfcumTMmSwKzoM9xrsE=

‎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.11.1
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/core-components.yaml
12+
- name: v1.11.2
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/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.11.1
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/bootstrap-components.yaml
20+
- name: v1.11.2
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/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.11.1
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/control-plane-components.yaml
28+
- name: v1.11.2
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/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.11.1
13-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/core-components.yaml
12+
- name: v1.11.2
13+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/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.11.1
21-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/bootstrap-components.yaml
20+
- name: v1.11.2
21+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/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.11.1
29-
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.1/control-plane-components.yaml
28+
- name: v1.11.2
29+
value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.11.2/control-plane-components.yaml
3030
type: url
3131
files:
3232
- sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"

0 commit comments

Comments
 (0)