Update cluster-api to v1.7.0-rc.1 (#1722)

Signed-off-by: Prajyot-Parab <prajyot.parab2@ibm.com>
kubernetes-sigs · Apr 10, 2024 · 12aedb1 · 12aedb1
1 parent d1bd56f
commit 12aedb1
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 31 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ go 1.21
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.17.1
 	github.com/onsi/gomega => github.com/onsi/gomega v1.32.0
-	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.0
+	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.1
 )
 
 require (
@@ -38,9 +38,9 @@ require (
 	k8s.io/client-go v0.29.3
 	k8s.io/klog/v2 v2.110.1
 	k8s.io/utils v0.0.0-20231127182322-b307cd553661
-	sigs.k8s.io/cluster-api v1.7.0-rc.0
-	sigs.k8s.io/cluster-api/test v1.7.0-rc.0
-	sigs.k8s.io/controller-runtime v0.17.2
+	sigs.k8s.io/cluster-api v1.7.0-rc.1
+	sigs.k8s.io/cluster-api/test v1.7.0-rc.1
+	sigs.k8s.io/controller-runtime v0.17.3
 	sigs.k8s.io/yaml v1.4.0
 )
 

diff --git a/go.sum b/go.sum
@@ -548,12 +548,12 @@ k8s.io/utils v0.0.0-20231127182322-b307cd553661 h1:FepOBzJ0GXm8t0su67ln2wAZjbQ6R
 k8s.io/utils v0.0.0-20231127182322-b307cd553661/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
-sigs.k8s.io/cluster-api v1.7.0-rc.0 h1:IEakUB6iUsepyPJrMZr0BdaCDevaNOc1IdIjrcgPt8g=
-sigs.k8s.io/cluster-api v1.7.0-rc.0/go.mod h1:IX7Zzd8Q/k9+GRwgxgkLMZ+1G2U6F8W/oSKj8aalQf4=
-sigs.k8s.io/cluster-api/test v1.7.0-rc.0 h1:HfZozXkO2YYO+nnqJfDs37RXamnT7ScD+pRnjUirJYg=
-sigs.k8s.io/cluster-api/test v1.7.0-rc.0/go.mod h1:SNCf0lUezgjRr607CpR8Vp2izORDZ7PgFm/HL/3c4lM=
-sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
-sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
+sigs.k8s.io/cluster-api v1.7.0-rc.1 h1:AyVEevZky7xHwe+zZDzKe5C2SpeHD1NKLUJ0gihn92g=
+sigs.k8s.io/cluster-api v1.7.0-rc.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
+sigs.k8s.io/cluster-api/test v1.7.0-rc.1 h1:c90WDQmJo4HJqMYCWyuyzOwyhbECdOtM4JmNHWsjGvo=
+sigs.k8s.io/cluster-api/test v1.7.0-rc.1/go.mod h1:yG0g5Mdq73fMn9JP4akgRQPSne973L+Qx6iVH+LjtSM=
+sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
+sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
 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.22.0 h1:z/+yr/azoOfzsfooqRsPw1wjJlqT/ukXP0ShkHwNlsI=

diff --git 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.21
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.0
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.7.0-rc.1
 
 require (
 	github.com/aquasecurity/trivy v0.48.3
@@ -15,7 +15,7 @@ require (
 	golang.org/x/vuln v1.0.4
 	gotest.tools/gotestsum v1.11.0
 	k8s.io/code-generator v0.29.3
-	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240402171010-6e6ef9539065
+	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240409165607-c9136af030ea
 	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
 	sigs.k8s.io/controller-tools v0.14.0
 	sigs.k8s.io/kustomize/kustomize/v5 v5.4.1
@@ -491,7 +491,7 @@ require (
 	golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
 	golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
 	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.18.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect

diff --git a/hack/tools/go.sum b/hack/tools/go.sum
@@ -1860,8 +1860,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2474,10 +2474,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.7.0-rc.0 h1:IEakUB6iUsepyPJrMZr0BdaCDevaNOc1IdIjrcgPt8g=
-sigs.k8s.io/cluster-api v1.7.0-rc.0/go.mod h1:IX7Zzd8Q/k9+GRwgxgkLMZ+1G2U6F8W/oSKj8aalQf4=
-sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240402171010-6e6ef9539065 h1:TlZg7WBEmRQP91nzZwJ4+Lx8HBPVAboNBl1KbD9hT5s=
-sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240402171010-6e6ef9539065/go.mod h1:5fOmX24cNNzJHF7cfjeU5VKrogwjeYDIT5+mESxbz4c=
+sigs.k8s.io/cluster-api v1.7.0-rc.1 h1:AyVEevZky7xHwe+zZDzKe5C2SpeHD1NKLUJ0gihn92g=
+sigs.k8s.io/cluster-api v1.7.0-rc.1/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
+sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240409165607-c9136af030ea h1:OWGmx7FpNHXBrUIjTK39YG9EqScPt54fGzpreTkAyQg=
+sigs.k8s.io/cluster-api/hack/tools v0.0.0-20240409165607-c9136af030ea/go.mod h1:/I/TWwxKZ+5faLcdKqE8bAi0eUYROP/lybV6e97ENMs=
 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9 h1:ylYUI5uaq/guUFerFRVG81FHSA5/3+fERCE1RQbQUZ4=
 sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9/go.mod h1:+sJcI1F0QI0Cv+8fp5rH5B2fK1LxzrAQqYnaPx9nY8I=
 sigs.k8s.io/controller-tools v0.14.0 h1:rnNoCC5wSXlrNoBKKzL70LNJKIQKEzT6lloG6/LF73A=

diff --git 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.7.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.0/core-components.yaml
+    - name: v1.7.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.1/core-components.yaml
       type: url
       files:
       - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
   - name: kubeadm
     type: BootstrapProvider
     versions:
-    - name: v1.7.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.0/bootstrap-components.yaml
+    - name: v1.7.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.1/bootstrap-components.yaml
       type: url
       files:
       - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-    - name: v1.7.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.0/control-plane-components.yaml
+    - name: v1.7.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.1/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
@@ -9,24 +9,24 @@ providers:
   - name: cluster-api
     type: CoreProvider
     versions:
-    - name: v1.7.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.0/core-components.yaml
+    - name: v1.7.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.1/core-components.yaml
       type: url
       files:
       - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
   - name: kubeadm
     type: BootstrapProvider
     versions:
-    - name: v1.7.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.0/bootstrap-components.yaml
+    - name: v1.7.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.1/bootstrap-components.yaml
       type: url
       files:
       - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"
   - name: kubeadm
     type: ControlPlaneProvider
     versions:
-    - name: v1.7.0-rc.0
-      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.0/control-plane-components.yaml
+    - name: v1.7.0-rc.1
+      value: https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.0-rc.1/control-plane-components.yaml
       type: url
       files:
       - sourcePath: "${PWD}/test/e2e/data/shared/metadata.yaml"