diff --git a/Makefile b/Makefile index 2cc35eca8..73a31329b 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ RELEASE_NOTES_DIR := CHANGELOG OUTPUT_TYPE ?= type=registry # Go -GO_VERSION ?=1.24.7 +GO_VERSION ?=1.24.8 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION) # Trivy diff --git a/go.mod b/go.mod index 2b4756bfe..57c3e1e17 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ go 1.23.2 replace ( github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.23.3 github.com/onsi/gomega => github.com/onsi/gomega v1.36.3 - sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.7 ) require ( @@ -40,8 +40,8 @@ require ( k8s.io/component-base v0.32.3 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 - sigs.k8s.io/cluster-api v1.10.6 - sigs.k8s.io/cluster-api/test v1.10.6 + sigs.k8s.io/cluster-api v1.10.7 + sigs.k8s.io/cluster-api/test v1.10.7 sigs.k8s.io/controller-runtime v0.20.4 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index f3987fe94..65bf97897 100644 --- a/go.sum +++ b/go.sum @@ -60,8 +60,8 @@ github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/coredns/caddy v1.1.1 h1:2eYKZT7i6yxIfGP3qLJoJ7HAsDJqYB+X68g4NYjSrE0= github.com/coredns/caddy v1.1.1/go.mod h1:A6ntJQlAWuQfFlsd9hvigKbo2WS0VUs2l1e2F+BawD4= -github.com/coredns/corefile-migration v1.0.27 h1:WIIw5sU0LfGgoGnhdrYdVcto/aWmJoGA/C62iwkU0JM= -github.com/coredns/corefile-migration v1.0.27/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY= +github.com/coredns/corefile-migration v1.0.28 h1:O8YafUREqUcGbRtcJfOmWU6ifcw2HX76I1QvI5xZpsw= +github.com/coredns/corefile-migration v1.0.28/go.mod h1:56DPqONc3njpVPsdilEnfijCwNGC3/kTJLl7i7SPavY= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4= github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw= github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= @@ -505,10 +505,10 @@ k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6J k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 h1:CPT0ExVicCzcpeN4baWEV2ko2Z/AsiZgEdwgcfwLgMo= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g= -sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4= -sigs.k8s.io/cluster-api/test v1.10.6 h1:xMRVX91mmvcWihzFpj9a7Zc5Np+zB6zfYoVD6tyww/s= -sigs.k8s.io/cluster-api/test v1.10.6/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0= +sigs.k8s.io/cluster-api v1.10.7 h1:MuzeuAhLJLTgmqTitVz1XeXZLgAd4tJfnH9xitKG63A= +sigs.k8s.io/cluster-api v1.10.7/go.mod h1:PTuQc7CgNahPlJrLNJ0q4gKdpQ4wITgeVXDiDQQv2to= +sigs.k8s.io/cluster-api/test v1.10.7 h1:RoaKevoDx2xsloAvAzmRcuImmpS7tNJcEd6k/KH2Cf4= +sigs.k8s.io/cluster-api/test v1.10.7/go.mod h1:t177O+xWeeCqbPXVlsGNn+LKkoyFo9Oh3ar0znVRwX0= sigs.k8s.io/controller-runtime v0.20.4 h1:X3c+Odnxz+iPTRobG4tp092+CvBU9UK0t/bRf+n0DGU= sigs.k8s.io/controller-runtime v0.20.4/go.mod h1:xg2XB0K5ShQzAgsoujxuKN4LNXR2LfwwHsPj7Iaw+XY= sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8= diff --git a/hack/ccm/Makefile b/hack/ccm/Makefile index 522bfacf4..22081873d 100644 --- a/hack/ccm/Makefile +++ b/hack/ccm/Makefile @@ -13,7 +13,7 @@ # limitations under the License. # Go -GO_VERSION ?=1.24.7 +GO_VERSION ?=1.24.8 GO_CONTAINER_IMAGE ?= golang:$(GO_VERSION) REGISTRY=gcr.io/k8s-staging-capi-ibmcloud diff --git a/hack/tools/go.mod b/hack/tools/go.mod index 730985705..8bbf8f6a3 100644 --- a/hack/tools/go.mod +++ b/hack/tools/go.mod @@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-provider-ibmcloud/hack/tools go 1.23.0 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.6 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.10.7 require ( github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 @@ -15,7 +15,7 @@ require ( gotest.tools/gotestsum v1.12.2 k8s.io/code-generator v0.32.3 k8s.io/release v0.16.9 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250825160708-c37851897736 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250919062212-53c0cef6f47a sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387 sigs.k8s.io/controller-tools v0.17.0 sigs.k8s.io/kustomize/kustomize/v5 v5.5.0 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index e91937305..34c3e500c 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -1476,10 +1476,10 @@ mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8 mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ= sigs.k8s.io/bom v0.6.0 h1:IPMPHx6XdmMeW2oEeF66DgNyP5d4RxfuXwiC1qn+n9o= sigs.k8s.io/bom v0.6.0/go.mod h1:MV0D3vdGlkaPgi5EwpwMBeQ8n8QS8Q2u1lJ5LyE7RLM= -sigs.k8s.io/cluster-api v1.10.6 h1:0bnLTpT47R8KIvGZ3tTGek0DwMIc8fZi6IxA3Mlqq4g= -sigs.k8s.io/cluster-api v1.10.6/go.mod h1:vymugs3Jm3gxHVMuVqdzgp6BVy/SEqQVyUg/UM7bnT4= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250825160708-c37851897736 h1:xa87IUYgACVXj0IjPpp28TVZwfUR/tfhc/w7FjXtW6c= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250825160708-c37851897736/go.mod h1:fmT4/QJJPqD2FOWZCCo63SQnivsyQUntJI0gxvvbM1o= +sigs.k8s.io/cluster-api v1.10.7 h1:MuzeuAhLJLTgmqTitVz1XeXZLgAd4tJfnH9xitKG63A= +sigs.k8s.io/cluster-api v1.10.7/go.mod h1:PTuQc7CgNahPlJrLNJ0q4gKdpQ4wITgeVXDiDQQv2to= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250919062212-53c0cef6f47a h1:WTgSYSOEOZeWjLWjAjYXlXeeHwrho39RI/zvVUL+EP0= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250919062212-53c0cef6f47a/go.mod h1:fmT4/QJJPqD2FOWZCCo63SQnivsyQUntJI0gxvvbM1o= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387 h1:WVCytp5VYi3EbLI/tKmjQ3zgEWdQrMAARVUtmqAmf48= sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387/go.mod h1:IaDsO8xSPRxRG1/rm9CP7+jPmj0nMNAuNi/yiHnLX8k= sigs.k8s.io/controller-tools v0.17.0 h1:KaEQZbhrdY6J3zLBHplt+0aKUp8PeIttlhtF2UDo6bI= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index 00aae063a..4d306a531 100644 --- a/test/e2e/config/ibmcloud-e2e-powervs.yaml +++ b/test/e2e/config/ibmcloud-e2e-powervs.yaml @@ -9,24 +9,24 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" diff --git a/test/e2e/config/ibmcloud-e2e-vpc.yaml b/test/e2e/config/ibmcloud-e2e-vpc.yaml index bd29286e6..6737a04d4 100644 --- a/test/e2e/config/ibmcloud-e2e-vpc.yaml +++ b/test/e2e/config/ibmcloud-e2e-vpc.yaml @@ -9,24 +9,24 @@ providers: - name: cluster-api type: CoreProvider versions: - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/core-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/bootstrap-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.10.6 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.6/control-plane-components.yaml + - name: v1.10.7 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.10.7/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"