Update cluster-api to v1.6.0 (#1528)

Signed-off-by: Prajyot-Parab <[email protected]>
kubernetes-sigs · Dec 11, 2023 · 84ceda3 · 84ceda3
1 parent 938cd92
commit 84ceda3
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ go 1.20
 replace (
 	github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.13.1
 	github.com/onsi/gomega => github.com/onsi/gomega v1.30.0
-	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0-rc.1
+	sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0
 )
 
 require (
@@ -32,8 +32,8 @@ require (
 	k8s.io/client-go v0.28.4
 	k8s.io/klog/v2 v2.100.1
 	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
-	sigs.k8s.io/cluster-api v1.6.0-rc.1
-	sigs.k8s.io/cluster-api/test v1.6.0-rc.1
+	sigs.k8s.io/cluster-api v1.6.0
+	sigs.k8s.io/cluster-api/test v1.6.0
 	sigs.k8s.io/controller-runtime v0.16.3
 	sigs.k8s.io/yaml v1.4.0
 )

diff --git a/go.sum b/go.sum
@@ -913,10 +913,10 @@ 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/apiserver-network-proxy/konnectivity-client v0.1.2 h1:trsWhjU5jZrx6UvFu4WzQDrN7Pga4a7Qg+zcfcj64PA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2/go.mod h1:+qG7ISXqCDVVcyO8hLn12AKVYYUjM7ftlqsqmrhMZE0=
-sigs.k8s.io/cluster-api v1.6.0-rc.1 h1:Mnp73o0L++Ev1BB9Cpaxv0Hfq0puEm/E19wJdPRU3z0=
-sigs.k8s.io/cluster-api v1.6.0-rc.1/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
-sigs.k8s.io/cluster-api/test v1.6.0-rc.1 h1:NnWz+kiB67vOA7hsmtR6d08pRUmY4JUiLTL2EDTHMw8=
-sigs.k8s.io/cluster-api/test v1.6.0-rc.1/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U=
+sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
+sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
+sigs.k8s.io/cluster-api/test v1.6.0 h1:hvqUpSYxXCvs4FiEfsDpFZAfZ7i4kkP/59mVdFHlzSI=
+sigs.k8s.io/cluster-api/test v1.6.0/go.mod h1:DJtbkrnrH77cd3PnXeKCQDMtCGVCrHZHPOjMvEsLB2U=
 sigs.k8s.io/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4=
 sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0=
 sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=

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.20
 
-replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0-rc.1
+replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.6.0
 
 require (
 	github.com/aquasecurity/trivy v0.47.0
@@ -15,7 +15,7 @@ require (
 	golang.org/x/vuln v1.0.1
 	gotest.tools/gotestsum v1.11.0
 	k8s.io/code-generator v0.28.4
-	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20231128131258-cb515e4bfa8a
+	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20231205193824-b15a157143a5
 	sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20211110210527-619e6b92dab9
 	sigs.k8s.io/controller-tools v0.13.0
 	sigs.k8s.io/kustomize/kustomize/v5 v5.2.1

diff --git a/hack/tools/go.sum b/hack/tools/go.sum
@@ -2581,10 +2581,10 @@ oras.land/oras-go v1.2.4/go.mod h1:DYcGfb3YF1nKjcezfX2SNlDAeQFKSXmf+qrFmrh4324=
 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.6.0-rc.1 h1:Mnp73o0L++Ev1BB9Cpaxv0Hfq0puEm/E19wJdPRU3z0=
-sigs.k8s.io/cluster-api v1.6.0-rc.1/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
-sigs.k8s.io/cluster-api/hack/tools v0.0.0-20231128131258-cb515e4bfa8a h1:LDXLpKZvoNH+0zkiI7e/a7c8/zVuEW2HgccSLJStPNM=
-sigs.k8s.io/cluster-api/hack/tools v0.0.0-20231128131258-cb515e4bfa8a/go.mod h1:ztFIXwroEUNtRKdXgDWpNz/AjqRMdIf2GTyaFN5lOEU=
+sigs.k8s.io/cluster-api v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
+sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
+sigs.k8s.io/cluster-api/hack/tools v0.0.0-20231205193824-b15a157143a5 h1:Ra661r/rriusVUxwCPyJMgwNfxyxS79oiuB/FnIt/jE=
+sigs.k8s.io/cluster-api/hack/tools v0.0.0-20231205193824-b15a157143a5/go.mod h1:ztFIXwroEUNtRKdXgDWpNz/AjqRMdIf2GTyaFN5lOEU=
 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.13.0 h1:NfrvuZ4bxyolhDBt/rCZhDnx3M2hzlhgo5n3Iv2RykI=

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -39,7 +39,7 @@ mkdir -p "${ARTIFACTS}/logs/"
 
 ARCH=$(uname -m)
 OS=$(uname -s)
-IBMCLOUD_CLI_VERSION=${IBMCLOUD_CLI_VERSION:-"2.16.0"}
+IBMCLOUD_CLI_VERSION=${IBMCLOUD_CLI_VERSION:-"2.21.0"}
 E2E_FLAVOR=${E2E_FLAVOR:-}
 capibmadm=$(pwd)/bin/capibmadm
 

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