diff --git a/go.mod b/go.mod index 547bd65c9..305526c1e 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ toolchain go1.22.9 replace ( github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.21.0 github.com/onsi/gomega => github.com/onsi/gomega v1.35.1 - sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.4 + sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.5 ) require ( @@ -43,9 +43,9 @@ require ( k8s.io/component-base v0.31.3 k8s.io/klog/v2 v2.130.1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 - sigs.k8s.io/cluster-api v1.9.4 - sigs.k8s.io/cluster-api/test v1.9.4 - sigs.k8s.io/controller-runtime v0.19.4 + sigs.k8s.io/cluster-api v1.9.5 + sigs.k8s.io/cluster-api/test v1.9.5 + sigs.k8s.io/controller-runtime v0.19.6 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index c6d523400..5bc6235e7 100644 --- a/go.sum +++ b/go.sum @@ -506,12 +506,12 @@ k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1 k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 h1:2770sDpzrjjsAtVhSeUFseziht227YAWYHLGNM8QPwY= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw= -sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M= -sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8= -sigs.k8s.io/cluster-api/test v1.9.4 h1:ZZ+IPK/lfyc4d/QPtompt+cxXYC6tGJ4kTHhhocgbIM= -sigs.k8s.io/cluster-api/test v1.9.4/go.mod h1:dHLUcNc9vBNyQyY6NTcqcfpFvIiXmcL5Iqe2sETFD1c= -sigs.k8s.io/controller-runtime v0.19.4 h1:SUmheabttt0nx8uJtoII4oIP27BVVvAKFvdvGFwV/Qo= -sigs.k8s.io/controller-runtime v0.19.4/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= +sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro= +sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI= +sigs.k8s.io/cluster-api/test v1.9.5 h1:DtiiDWCIGaWhp4cA7xzGPWeM796XIRQwOptLATe0yFg= +sigs.k8s.io/cluster-api/test v1.9.5/go.mod h1:YL2wANe8TFWFBka9CDkxjPj7KALqUtK+PtKa4ChNIok= +sigs.k8s.io/controller-runtime v0.19.6 h1:fuq53qTLQ7aJTA7aNsklNnu7eQtSFqJUomOyM+phPLk= +sigs.k8s.io/controller-runtime v0.19.6/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kind v0.25.0 h1:ugUvgesHKKA0yKmD6QtYTiEev+kPUpGxdTPbMGf8VTU= diff --git a/hack/tools/go.mod b/hack/tools/go.mod index a336eb5ff..b3aff2a7f 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.22.9 -replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.4 +replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.9.5 require ( github.com/aquasecurity/trivy v0.58.2 @@ -15,7 +15,7 @@ require ( golang.org/x/vuln v1.1.4 gotest.tools/gotestsum v1.12.0 k8s.io/code-generator v0.31.3 - sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250121131638-79e6731b0d20 + sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250214153822-068c0f3c8ed3 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20241202165100-3e6681045387 sigs.k8s.io/controller-tools v0.16.5 sigs.k8s.io/kustomize/kustomize/v5 v5.4.3 diff --git a/hack/tools/go.sum b/hack/tools/go.sum index 6f52c6b7c..34266efe1 100644 --- a/hack/tools/go.sum +++ b/hack/tools/go.sum @@ -2521,10 +2521,10 @@ oras.land/oras-go v1.2.5/go.mod h1:PuAwRShRZCsZb7g8Ar3jKKQR/2A/qN+pkYxIOd/FAoo= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/cluster-api v1.9.4 h1:pa2Ho50F9Js/Vv/Jy11TcpmGiqY2ukXCoDj/dY25Y7M= -sigs.k8s.io/cluster-api v1.9.4/go.mod h1:9DjpPCxJJo7/mH+KceINNJHr9c5X9S9HEp2B8JG3Uv8= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250121131638-79e6731b0d20 h1:9PYmnSYryJaJK8x4k0fjNj893ew3tAI1v/vylyTf0dI= -sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250121131638-79e6731b0d20/go.mod h1:iUWzwkv2bBp+Hvcq4UQ9kXQdlwx9+54KQ0Hz416LEUg= +sigs.k8s.io/cluster-api v1.9.5 h1:68164Q201Y5ANVkhyrOZenoMbfL2SEBjVYZs/ihhSro= +sigs.k8s.io/cluster-api v1.9.5/go.mod h1:DyqyZ4jRvKGKewDRn1Q4OCHaVjsdTogymbO6mrgHEDI= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250214153822-068c0f3c8ed3 h1:hwNplANgZMQ2k0lYe8vgTJCUVpfmC+sUaM8dlY3p86A= +sigs.k8s.io/cluster-api/hack/tools v0.0.0-20250214153822-068c0f3c8ed3/go.mod h1:c+mz4WRKrXZhOlfdEFe6PC1Xwo2QkYx4mlOrnqR9kW0= 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.16.5 h1:5k9FNRqziBPwqr17AMEPPV/En39ZBplLAdOwwQHruP4= diff --git a/test/e2e/config/ibmcloud-e2e-powervs.yaml b/test/e2e/config/ibmcloud-e2e-powervs.yaml index 00e8527a6..4ac4dbcac 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.9.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/core-components.yaml + - name: v1.9.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.9.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/bootstrap-components.yaml + - name: v1.9.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.9.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/control-plane-components.yaml + - name: v1.9.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/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 2521ff206..5c2bbe527 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.9.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/core-components.yaml + - name: v1.9.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/core-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: BootstrapProvider versions: - - name: v1.9.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/bootstrap-components.yaml + - name: v1.9.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/bootstrap-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml" - name: kubeadm type: ControlPlaneProvider versions: - - name: v1.9.4 - value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.4/control-plane-components.yaml + - name: v1.9.5 + value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.5/control-plane-components.yaml type: url files: - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"