Merge pull request #353 from furkatgofurov7/bump-capi-1-6-0

🌱 Bump CAPI to v1.6.0
kubernetes-sigs · Dec 18, 2023 · a738316 · a738316
2 parents 16cedc0 + 3997821
commit a738316
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module sigs.k8s.io/cluster-api-operator
 
 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/MakeNowJust/heredoc v1.0.0
@@ -22,7 +22,7 @@ require (
  k8s.io/component-base 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 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
@@ -778,8 +778,8 @@ 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 v1.6.0 h1:2bhVSnUbtWI8taCjd9lGiHExsRUpKf7Z1fXqi/IwYx4=
+sigs.k8s.io/cluster-api v1.6.0/go.mod h1:LB7u/WxiWj4/bbpHNOa1oQ8nq0MQ5iYlD0pGfRSBGLI=
 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/test/go.mod b/test/go.mod
@@ -13,9 +13,9 @@ require (
  k8s.io/apimachinery v0.28.4
  k8s.io/klog/v2 v2.100.1
  k8s.io/utils v0.0.0-20230726121419-3b25d923346b
- sigs.k8s.io/cluster-api v1.6.0-rc.1
+ sigs.k8s.io/cluster-api v1.6.0
  sigs.k8s.io/cluster-api-operator v0.0.0-00010101000000-000000000000
- sigs.k8s.io/cluster-api/test v1.6.0-rc.1
+ 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/test/go.sum b/test/go.sum
@@ -744,10 +744,10 @@ k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt
 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/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=