bump capi to 1.6.3 from 1.6.1 (#3064)

aws · Apr 12, 2024 · 0363ff3 · 0363ff3
1 parent 25189db
commit 0363ff3
Show file tree

Hide file tree

Showing 55 changed files with 12,877 additions and 5,201 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -181,8 +181,8 @@ projects:
     repos:
       - name: cluster-api
         versions:
-          - tag: v1.6.1
-            go_version: "1.20"
+          - tag: v1.6.3
+            go_version: "1.21"
       - name: cluster-api-provider-cloudstack
         versions:
           - tag: v0.4.10-rc1

diff --git a/projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt b/projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt
@@ -227,7 +227,7 @@ https://github.com/kubernetes/utils
 ** sigs.k8s.io/apiserver-network-proxy/konnectivity-client; version v0.1.2 --
 https://github.com/kubernetes-sigs/apiserver-network-proxy
 
-** sigs.k8s.io/cluster-api; version v1.6.1 --
+** sigs.k8s.io/cluster-api; version v1.6.3 --
 https://github.com/kubernetes-sigs/cluster-api
 
 ** sigs.k8s.io/controller-runtime; version v0.16.5-0.20240215143111-dca5e8b2b00a --
@@ -1201,7 +1201,7 @@ https://github.com/ProtonMail/go-crypto
 ** github.com/sagikazarmark/slog-shim; version v0.1.0 --
 https://github.com/sagikazarmark/slog-shim
 
-** golang.org/go; version go1.20.14 --
+** golang.org/go; version go1.21.8 --
 https://github.com/golang/go
 
 ** golang.org/x/crypto; version v0.17.0 --
@@ -1444,7 +1444,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** google.golang.org/protobuf; version v1.31.0 --
+** google.golang.org/protobuf; version v1.33.0 --
 https://go.googlesource.com/protobuf
 
 Copyright (c) 2018 The Go Authors. All rights reserved.

diff --git a/projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt b/projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt
@@ -191,13 +191,13 @@ https://github.com/kubernetes-sigs/apiserver-network-proxy
 ** sigs.k8s.io/cluster-api; version v0.0.0-00010101000000-000000000000 --
 https://github.com/kubernetes-sigs/cluster-api
 
-** sigs.k8s.io/cluster-api/test/infrastructure/container; version v1.6.1 --
+** sigs.k8s.io/cluster-api/test/infrastructure/container; version v1.6.3 --
 https://github.com/kubernetes-sigs/cluster-api
 
-** sigs.k8s.io/cluster-api/test/infrastructure/docker; version v1.6.1 --
+** sigs.k8s.io/cluster-api/test/infrastructure/docker; version v1.6.3 --
 https://github.com/kubernetes-sigs/cluster-api
 
-** sigs.k8s.io/cluster-api/test/infrastructure/kind; version v1.6.1 --
+** sigs.k8s.io/cluster-api/test/infrastructure/kind; version v1.6.3 --
 https://github.com/kubernetes-sigs/cluster-api
 
 ** sigs.k8s.io/controller-runtime; version v0.16.5-0.20240215143111-dca5e8b2b00a --
@@ -1006,7 +1006,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** golang.org/go; version go1.20.14 --
+** golang.org/go; version go1.21.8 --
 https://github.com/golang/go
 
 ** golang.org/x/crypto; version v0.17.0 --
@@ -1069,7 +1069,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ------
 
-** google.golang.org/protobuf; version v1.31.0 --
+** google.golang.org/protobuf; version v1.33.0 --
 https://go.googlesource.com/protobuf
 
 Copyright (c) 2018 The Go Authors. All rights reserved.

diff --git a/projects/kubernetes-sigs/cluster-api/CHECKSUMS b/projects/kubernetes-sigs/cluster-api/CHECKSUMS
@@ -1,10 +1,10 @@
-da644118e346d1302527f73d3d60767333cb2124c7506d60e003bc8b6c02a641  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
-3c3a86fd04d4aba3bc48213b74c46715de9a6f506ddce864719f7ce7c9fb0101  _output/bin/cluster-api/linux-amd64/clusterctl
-dd5fff40cbe8b9a60ee95ed47b2c9e765c97d11bf1edde9af2776b0e94b62ffd  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
-b9b823229452f7f6d4100acfca49c9da04d20185b8b81f220a13da56840e2105  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
-7c3f7221ccfb9d59c4830d8de9eddccd56339889bd94df5d98710a20f048eca1  _output/bin/cluster-api/linux-amd64/manager
-9da0f07c30b35dcb39f1ff8890bac67c58edaadd8a0f2dbdbc9a55839a92193b  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
-dfb3c46a6cab46413cc8169ca7e19904cbca7dcbca841603deaac394bb307693  _output/bin/cluster-api/linux-arm64/clusterctl
-d691a73c22135527a5704369aa9682afae9d15154564cc20b2d0f30d9f39ef4a  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
-e0b535174a1cdea41f22c4e17ae8e7418155832f44dce03d0a883b272abc7ccb  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
-8c73065301a79e51369a5d477510cc9fb3cf0d29ae58efdac259b0b363c68acc  _output/bin/cluster-api/linux-arm64/manager
+2cb4698f4f5948fd844f2b20f0f01b8b8cdf2525f474f9e5b90db60cc51b3ecc  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
+0fc69bdb40acf226c8ec7b4c08af14007e74dbbea190b973a552930d84de96d7  _output/bin/cluster-api/linux-amd64/clusterctl
+9b7be46bf0bd5bef17b21c943f5fb93ed048d36317124c01fb12085e14980fbc  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
+400dde84a6056bb418c37a20da0313524745407d2ca334728ceea3a108aa14df  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
+bd0ef3615c6c7798916623004ca380e543f1e15eb572143690992a4d9c2eddf9  _output/bin/cluster-api/linux-amd64/manager
+64e96b486f9891cd95723f16ae180a461ee47dd8a09c0d00be8a05b8d8f83eb6  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
+79f11cf152e6085993d08b388ea9c5dffb002a38b37e9274c481db73f4317750  _output/bin/cluster-api/linux-arm64/clusterctl
+fc3d2fae9df645e3e9c2c952933e2f4d2e3b3a52ac6a5c24ccd4ee3565c1afc5  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
+f9bfbbb7102662ad93061c146ff459db07045eba77e0f157e8d8bb8f35877e5e  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
+bec2152de3fa9f8783c2121e9d573cd587963faf69126864b40ef329c7e38257  _output/bin/cluster-api/linux-arm64/manager
diff --git a/projects/kubernetes-sigs/cluster-api/GIT_TAG b/projects/kubernetes-sigs/cluster-api/GIT_TAG
@@ -1 +1 @@
-v1.6.1
+v1.6.3
diff --git a/projects/kubernetes-sigs/cluster-api/GOLANG_VERSION b/projects/kubernetes-sigs/cluster-api/GOLANG_VERSION
@@ -1 +1 @@
-1.20
+1.21
diff --git a/projects/kubernetes-sigs/cluster-api/README.md b/projects/kubernetes-sigs/cluster-api/README.md
@@ -1,5 +1,5 @@
 ## **Cluster API**
-![Version](https://img.shields.io/badge/version-v1.6.1-blue)
+![Version](https://img.shields.io/badge/version-v1.6.3-blue)
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiQVZ3TDBZZVVXZUZiVmtqLzVoOVcrV2FaMmxRRzJXRmJCRlZtQkNodXdWZ0FrNm0zQ3l5UzNqTkdsQXgwdzc0bTBZc1RIcjBhMUVFbEhIK3d2VDVPek1rPSIsIml2UGFyYW1ldGVyU3BlYyI6IkVuOGJxNXBPZEtDek81Q3giLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)
 
 [Cluster API](https://github.com/kubernetes-sigs/cluster-api) is a Kubernetes sub-project focused on providing declarative APIs and tooling to simplify provisioning, upgrading, and operating multiple Kubernetes clusters. It uses Kubernetes-style APIs and patterns to automate cluster lifecycle management for platform operators. The supporting infrastructure, like virtual machines, networks, load balancers, and VPCs, as well as the Kubernetes cluster configuration are all defined in the same way that application developers operate deploying and managing their workloads. This enables consistent and repeatable cluster deployments across a wide variety of infrastructure environments. Cluster API can be extended to support any infrastructure provider (AWS, Azure, vSphere, etc.) or bootstrap provider (kubeadm is default) as required by the customer.