From 5ac2e14828bcd4d58643360f3f1245a04ad1d9b7 Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Fri, 23 Feb 2024 08:57:15 -0800 Subject: [PATCH] Revert "[release-0.19] Bump kubernetes-sigs/cluster-api to latest release (#2952)" This reverts commit 89796c5ff0b2bcbd855d45c8b57d994b6da531d1. --- UPSTREAM_PROJECTS.yaml | 4 +- .../cluster-api/ATTRIBUTION.txt | 6 +- .../cluster-api/CAPD_ATTRIBUTION.txt | 10 +- .../kubernetes-sigs/cluster-api/CHECKSUMS | 20 ++-- projects/kubernetes-sigs/cluster-api/GIT_TAG | 2 +- .../cluster-api/GOLANG_VERSION | 2 +- .../kubernetes-sigs/cluster-api/README.md | 2 +- ...r-runtime-patch-for-restmapper-cache.patch | 97 +++++++++++++++++++ 8 files changed, 120 insertions(+), 23 deletions(-) create mode 100644 projects/kubernetes-sigs/cluster-api/patches/0040-Use-controller-runtime-patch-for-restmapper-cache.patch diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml index 0636fd07f6..727bf98e42 100644 --- a/UPSTREAM_PROJECTS.yaml +++ b/UPSTREAM_PROJECTS.yaml @@ -175,8 +175,8 @@ projects: repos: - name: cluster-api versions: - - tag: v1.6.2 - go_version: "1.21" + - tag: v1.6.1 + go_version: "1.20" - name: cluster-api-provider-cloudstack versions: - tag: v0.4.9-rc8 diff --git a/projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt b/projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt index 147f95d88d..8a04cac0fb 100644 --- a/projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt @@ -227,10 +227,10 @@ 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.2 -- +** sigs.k8s.io/cluster-api; version v1.6.1 -- https://github.com/kubernetes-sigs/cluster-api -** sigs.k8s.io/controller-runtime; version v0.16.5 -- +** sigs.k8s.io/controller-runtime; version v0.16.5-0.20240215143111-dca5e8b2b00a -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -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.21.6 -- +** golang.org/go; version go1.20.13 -- https://github.com/golang/go ** golang.org/x/crypto; version v0.17.0 -- diff --git a/projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt b/projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt index 84894dc047..7dec3e5e1a 100644 --- a/projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt +++ b/projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt @@ -191,16 +191,16 @@ 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.2 -- +** sigs.k8s.io/cluster-api/test/infrastructure/container; version v1.6.1 -- https://github.com/kubernetes-sigs/cluster-api -** sigs.k8s.io/cluster-api/test/infrastructure/docker; version v1.6.2 -- +** sigs.k8s.io/cluster-api/test/infrastructure/docker; version v1.6.1 -- https://github.com/kubernetes-sigs/cluster-api -** sigs.k8s.io/cluster-api/test/infrastructure/kind; version v1.6.2 -- +** sigs.k8s.io/cluster-api/test/infrastructure/kind; version v1.6.1 -- https://github.com/kubernetes-sigs/cluster-api -** sigs.k8s.io/controller-runtime; version v0.16.5 -- +** sigs.k8s.io/controller-runtime; version v0.16.5-0.20240215143111-dca5e8b2b00a -- https://github.com/kubernetes-sigs/controller-runtime ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd -- @@ -1006,7 +1006,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ------ -** golang.org/go; version go1.21.6 -- +** golang.org/go; version go1.20.13 -- https://github.com/golang/go ** golang.org/x/crypto; version v0.17.0 -- diff --git a/projects/kubernetes-sigs/cluster-api/CHECKSUMS b/projects/kubernetes-sigs/cluster-api/CHECKSUMS index d3e07d8924..37b18e9b7e 100644 --- a/projects/kubernetes-sigs/cluster-api/CHECKSUMS +++ b/projects/kubernetes-sigs/cluster-api/CHECKSUMS @@ -1,10 +1,10 @@ -57a3e26aef256f577605841d0ec02bc604b337ed3bd526efec416c722ed37124 _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager -e84e7bf5b6631048d26d5102ebf8cff632c3729c950c6b8fcd294a6d590acea3 _output/bin/cluster-api/linux-amd64/clusterctl -26453cac05b6ff6ac70aa7ab5dda5c5285dc2d83c437f6a09c13fea702ca309b _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager -97cb7faaa7bee82e4d1f6f29404da56ed49d95af6ce434294649feac35741cee _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager -5e8d5fb9b012181d6229dc281094d02f2782550d8c2cd394e10d770b5c525fbf _output/bin/cluster-api/linux-amd64/manager -c0aeb72a6edbc6abf9a0e6d684cb1725087df22dc2c72dc9c7fc536aeb9cf190 _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager -4636b7ef9bc382390577afc928d03b5b24fa1e8f9103876116e45d3ee612ca08 _output/bin/cluster-api/linux-arm64/clusterctl -f9d69b699e74ffe482734d7072ae4ca21371855abbac6090484d7bf72d97f135 _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager -a4cf6c5db57ba3ebd95cdc6b569d82f9478363e2f33af7fcce2c3e96b9aba694 _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager -4d5cd3ac0e02ba2a526756ea00abd672f6fcd4362eecc95fbf1b9f93ae8ecac8 _output/bin/cluster-api/linux-arm64/manager +da0493c87aea29298320c53c9c6591d2aef72a9d3c4e9aecf04447e401b91a1a _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager +98f9193ae5557f9ee9d8360240302b2bc5213670c4afe1701d441db7f5c98a45 _output/bin/cluster-api/linux-amd64/clusterctl +b3e6f57970612b6f88e74823906f8adc7f65fe7a84024892bad5c41a4794093b _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager +fd0fda5bd83099d536db1aff2ac91b6e1435d1426cc1a4ad5dca8c349c251eef _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager +101d2d46cc8ec92b734d7c6c78ade0dc05f411f03ea66a820a5a92d15a7c7c4c _output/bin/cluster-api/linux-amd64/manager +22802d6f80dfc805c2c8accc4889bb2731d2ef687db876915d6e9d3a920977fc _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager +d7ccaa9abfd903ebc45e79ecae9a53a6d81a09dcff14c28c74a740fd672e27dc _output/bin/cluster-api/linux-arm64/clusterctl +407c308a7122921e0c782ac04697724c509b9dc9b224c408600cc18e7821c687 _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager +4f832b9d7a26f4d802d7e113d3bc6388e66abd51b3259b7ae093bb070f3c735d _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager +f6158d12b049f6230c59d3d069e35abee372b59ff326c829c98727037c409604 _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 index d4f6e2c5d4..0236045093 100644 --- a/projects/kubernetes-sigs/cluster-api/GIT_TAG +++ b/projects/kubernetes-sigs/cluster-api/GIT_TAG @@ -1 +1 @@ -v1.6.2 +v1.6.1 diff --git a/projects/kubernetes-sigs/cluster-api/GOLANG_VERSION b/projects/kubernetes-sigs/cluster-api/GOLANG_VERSION index d2ab029d32..5fb5a6b4f5 100644 --- a/projects/kubernetes-sigs/cluster-api/GOLANG_VERSION +++ b/projects/kubernetes-sigs/cluster-api/GOLANG_VERSION @@ -1 +1 @@ -1.21 +1.20 diff --git a/projects/kubernetes-sigs/cluster-api/README.md b/projects/kubernetes-sigs/cluster-api/README.md index 36a55f5b20..a328d98922 100644 --- 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.2-blue) +![Version](https://img.shields.io/badge/version-v1.6.1-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. diff --git a/projects/kubernetes-sigs/cluster-api/patches/0040-Use-controller-runtime-patch-for-restmapper-cache.patch b/projects/kubernetes-sigs/cluster-api/patches/0040-Use-controller-runtime-patch-for-restmapper-cache.patch new file mode 100644 index 0000000000..60a3d93b61 --- /dev/null +++ b/projects/kubernetes-sigs/cluster-api/patches/0040-Use-controller-runtime-patch-for-restmapper-cache.patch @@ -0,0 +1,97 @@ +From 3f900f5d9fadf763fa10b198c778e05d19a0f9cb Mon Sep 17 00:00:00 2001 +From: Guillermo Gaston +Date: Thu, 15 Feb 2024 15:04:46 +0000 +Subject: [PATCH 40/40] Use controller-runtime patch for restmapper cache + +This fixes the issue with a race condition when making v1alpha4 not +served. + +Using a merged but unreleased change. Will update to the release tag +once this is cut. +--- + go.mod | 2 ++ + go.sum | 4 ++-- + hack/tools/go.mod | 2 ++ + hack/tools/go.sum | 4 ++-- + test/go.mod | 2 ++ + test/go.sum | 4 ++-- + 6 files changed, 12 insertions(+), 6 deletions(-) + +diff --git a/go.mod b/go.mod +index 7aa6a0993..3c0e9d880 100644 +--- a/go.mod ++++ b/go.mod +@@ -185,3 +185,5 @@ require ( + sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + ) ++ ++replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a +diff --git a/go.sum b/go.sum +index 912d9645d..8239a813a 100644 +--- a/go.sum ++++ b/go.sum +@@ -1042,8 +1042,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/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= +-sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= ++sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a h1:1veEwfhXsw2Afqx7EkhS9wOslyLuw6O8sRfGx23PfWs= ++sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= + 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/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0= +diff --git a/hack/tools/go.mod b/hack/tools/go.mod +index 24e7ab32c..c7aa64ca4 100644 +--- a/hack/tools/go.mod ++++ b/hack/tools/go.mod +@@ -139,3 +139,5 @@ require ( + sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + ) ++ ++replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a +diff --git a/hack/tools/go.sum b/hack/tools/go.sum +index e0e2b7c89..a3f48c117 100644 +--- a/hack/tools/go.sum ++++ b/hack/tools/go.sum +@@ -747,8 +747,8 @@ k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/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/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= +-sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= ++sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a h1:1veEwfhXsw2Afqx7EkhS9wOslyLuw6O8sRfGx23PfWs= ++sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= + sigs.k8s.io/controller-tools v0.13.0 h1:NfrvuZ4bxyolhDBt/rCZhDnx3M2hzlhgo5n3Iv2RykI= + sigs.k8s.io/controller-tools v0.13.0/go.mod h1:5vw3En2NazbejQGCeWKRrE7q4P+CW8/klfVqP8QZkgA= + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +diff --git a/test/go.mod b/test/go.mod +index 3df0e722b..b13a67f13 100644 +--- a/test/go.mod ++++ b/test/go.mod +@@ -161,3 +161,5 @@ require ( + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + ) ++ ++replace sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a +diff --git a/test/go.sum b/test/go.sum +index 88c1ca288..226708e02 100644 +--- a/test/go.sum ++++ b/test/go.sum +@@ -865,8 +865,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/controller-runtime v0.16.3 h1:2TuvuokmfXvDUamSx1SuAOO3eTyye+47mJCigwG62c4= +-sigs.k8s.io/controller-runtime v0.16.3/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= ++sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a h1:1veEwfhXsw2Afqx7EkhS9wOslyLuw6O8sRfGx23PfWs= ++sigs.k8s.io/controller-runtime v0.16.5-0.20240215143111-dca5e8b2b00a/go.mod h1:j7bialYoSn142nv9sCOJmQgDXQXxnroFU4VnX/brVJ0= + 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.20.0 h1:f0sc3v9mQbGnjBUaqSFST1dwIuiikKVGgoTwpoP33a8= +-- +2.39.3 (Apple Git-145) +