diff --git a/projects/kubernetes-sigs/cluster-api/patches/0001-Adding-capi-support-for-Bottlerocket.patch b/projects/kubernetes-sigs/cluster-api/patches/0001-Adding-capi-support-for-Bottlerocket.patch index bd48888fe3..a4e2a3b685 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0001-Adding-capi-support-for-Bottlerocket.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0001-Adding-capi-support-for-Bottlerocket.patch @@ -1,7 +1,7 @@ -From 249181c6a3b3698beeb9b1bd3ff0991f80e6b8c1 Mon Sep 17 00:00:00 2001 +From 83cad24856d873772d8328eb650656261462bc68 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Fri, 11 Jun 2021 10:43:09 -0700 -Subject: [PATCH 01/36] Adding capi support for Bottlerocket +Subject: [PATCH 01/40] Adding capi support for Bottlerocket Signed-off-by: Vignesh Goutham Ganesh @@ -719,7 +719,7 @@ index 000000000..e4be8d945 +) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go new file mode 100644 -index 000000000..350965204 +index 000000000..b6eec374f --- /dev/null +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -0,0 +1,176 @@ diff --git a/projects/kubernetes-sigs/cluster-api/patches/0002-Add-unstacked-etcd-support.patch b/projects/kubernetes-sigs/cluster-api/patches/0002-Add-unstacked-etcd-support.patch index f254559193..4eedf296b0 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0002-Add-unstacked-etcd-support.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0002-Add-unstacked-etcd-support.patch @@ -1,7 +1,7 @@ -From 39d3e537f52bb91856baff11d708cbb19d9ecf33 Mon Sep 17 00:00:00 2001 +From 1d498a38d41885888474b1a697fef69e43de1733 Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Mon, 28 Jun 2021 13:44:50 -0700 -Subject: [PATCH 02/36] Add unstacked etcd support +Subject: [PATCH 02/40] Add unstacked etcd support Unstacked etcd: API and config changes diff --git a/projects/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch b/projects/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch index b2a8811647..4153864560 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch @@ -1,7 +1,7 @@ -From 59a4714707c94f970a4b4ca2d1f16053fa8eefc5 Mon Sep 17 00:00:00 2001 +From ac0d863e457a0d1871b6f21f968829c20d1b862e Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Fri, 6 Aug 2021 17:16:39 -0700 -Subject: [PATCH 03/36] Unstacked etcd and controlplane upgrade +Subject: [PATCH 03/40] Unstacked etcd and controlplane upgrade Rename controlplane upgrade annotation variable diff --git a/projects/kubernetes-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch b/projects/kubernetes-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch index c133d9aec6..c6b39dc3b7 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch @@ -1,7 +1,7 @@ -From dcebd634166be05ad638e6a871a3e185e4c5068c Mon Sep 17 00:00:00 2001 +From 6d0cb5d9b9170255fe39873f00ebbb9863a610a7 Mon Sep 17 00:00:00 2001 From: Guillermo Gaston Date: Thu, 19 Aug 2021 21:52:52 +0000 -Subject: [PATCH 04/36] Patch config path in kubevip manifest for kubeadm +Subject: [PATCH 04/40] Patch config path in kubevip manifest for kubeadm control plane join with bottlerocket format cr: https://code.amazon.com/reviews/CR-55711271 diff --git a/projects/kubernetes-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch b/projects/kubernetes-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch index e5d51298cf..8e0dce3915 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch @@ -1,7 +1,7 @@ -From fdee04d4087cbc8e19657f00be80834824ea5ae1 Mon Sep 17 00:00:00 2001 +From 06aab5673027315adc4a1bdf80033fbb983fcddb Mon Sep 17 00:00:00 2001 From: Guillermo Gaston Date: Tue, 31 Aug 2021 15:56:28 +0000 -Subject: [PATCH 05/36] Make pause and bottlerocket bootstrap images updatable +Subject: [PATCH 05/40] Make pause and bottlerocket bootstrap images updatable in validation webhook cr: https://code.amazon.com/reviews/CR-56335855 diff --git a/projects/kubernetes-sigs/cluster-api/patches/0006-add-support-for-registry-mirror-for-bottlerocket.patch b/projects/kubernetes-sigs/cluster-api/patches/0006-add-support-for-registry-mirror-for-bottlerocket.patch index a65914e51c..cb5360c78c 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0006-add-support-for-registry-mirror-for-bottlerocket.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0006-add-support-for-registry-mirror-for-bottlerocket.patch @@ -1,7 +1,7 @@ -From c2d88bdebcff7c8ecc946166c0219587d9f356c9 Mon Sep 17 00:00:00 2001 +From 7b8638fef7772e73b83a72ead76ac19bc4fdb8fd Mon Sep 17 00:00:00 2001 From: Abhinav Pandey Date: Tue, 21 Sep 2021 08:57:56 -0700 -Subject: [PATCH 06/36] add support for registry mirror for bottlerocket +Subject: [PATCH 06/40] add support for registry mirror for bottlerocket --- .../kubeadm/api/v1beta1/kubeadm_types.go | 19 +++++++ @@ -259,7 +259,7 @@ index e4be8d945..886af6d87 100644 ` ) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 350965204..61a84e621 100644 +index b6eec374f..8d118c70c 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -22,9 +22,10 @@ const ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch b/projects/kubernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch index f87413ba0d..6b988ac52d 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch @@ -1,7 +1,7 @@ -From 0817d8c57340d5c0078cfbe800b184be2053ea01 Mon Sep 17 00:00:00 2001 +From 9484219a23f74a8fd8fa92b9cd3091f84ba5dcf5 Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Thu, 30 Sep 2021 14:04:36 -0700 -Subject: [PATCH 07/36] Fix proxy template for bottlerocket bootstrap +Subject: [PATCH 07/40] Fix proxy template for bottlerocket bootstrap Bottlerocket expects no-proxy setting to be a comma-separated list of strings. The proxy template was parsing the input no-proxy list @@ -31,7 +31,7 @@ index 886af6d87..4e1de77db 100644 ` registryMirrorTemplate = `{{ define "registryMirrorSettings" -}} diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 61a84e621..331e37202 100644 +index 8d118c70c..74aa7e029 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -4,6 +4,7 @@ import ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0008-Update-core-conversion-spoke-versions.patch b/projects/kubernetes-sigs/cluster-api/patches/0008-Update-core-conversion-spoke-versions.patch index 4ee8d6190c..96036e1971 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0008-Update-core-conversion-spoke-versions.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0008-Update-core-conversion-spoke-versions.patch @@ -1,7 +1,7 @@ -From 3819bf94ade3e16ec1e76b24c454d34b3d267eaf Mon Sep 17 00:00:00 2001 +From 00621939df1097f8d0dfb44f7eddf8b3a9b37c9b Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Sun, 21 Nov 2021 01:16:11 -0800 -Subject: [PATCH 08/36] Update core conversion spoke versions +Subject: [PATCH 08/40] Update core conversion spoke versions --- api/v1alpha4/zz_generated.conversion.go | 6 ++++++ diff --git a/projects/kubernetes-sigs/cluster-api/patches/0009-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch b/projects/kubernetes-sigs/cluster-api/patches/0009-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch index 461f49d5e0..60fcd38563 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0009-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0009-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch @@ -1,7 +1,7 @@ -From 0e30f0f2119a8cbcad4f5d51b2097ca72fb8176a Mon Sep 17 00:00:00 2001 +From bb48f6837a6c40e47a5c35cc40b21d802729732b Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Sun, 21 Nov 2021 20:59:58 -0800 -Subject: [PATCH 09/36] Add bottlerocket changes to capbk v1alpha4 api +Subject: [PATCH 09/40] Add bottlerocket changes to capbk v1alpha4 api --- .../kubeadm/api/v1alpha4/kubeadm_types.go | 72 ++++++++++ diff --git a/projects/kubernetes-sigs/cluster-api/patches/0010-Update-capbk-converions-spoke-version.patch b/projects/kubernetes-sigs/cluster-api/patches/0010-Update-capbk-converions-spoke-version.patch index a50bc24b84..70627f1b87 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0010-Update-capbk-converions-spoke-version.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0010-Update-capbk-converions-spoke-version.patch @@ -1,7 +1,7 @@ -From e329cfc2c1a0ea1e4c05b2b349311443d728c6e7 Mon Sep 17 00:00:00 2001 +From 4c2e7cf64326a1846e77fb5e0401cd2fb13174c4 Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Sun, 21 Nov 2021 21:00:31 -0800 -Subject: [PATCH 10/36] Update capbk converions spoke version +Subject: [PATCH 10/40] Update capbk converions spoke version --- .../api/v1alpha4/zz_generated.conversion.go | 180 ++++++++++++++++++ diff --git a/projects/kubernetes-sigs/cluster-api/patches/0011-Add-status.version-to-list-of-fields-to-ignore-for-u.patch b/projects/kubernetes-sigs/cluster-api/patches/0011-Add-status.version-to-list-of-fields-to-ignore-for-u.patch index ba1358bae7..629c136862 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0011-Add-status.version-to-list-of-fields-to-ignore-for-u.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0011-Add-status.version-to-list-of-fields-to-ignore-for-u.patch @@ -1,7 +1,7 @@ -From 82906b15ac5c0b9b3c30df8591bbdf396db499c9 Mon Sep 17 00:00:00 2001 +From b7be3c8b1b5975f0711c7a6dba778ec50fe14478 Mon Sep 17 00:00:00 2001 From: Vivek Koppuru Date: Wed, 12 Jan 2022 19:04:15 -0800 -Subject: [PATCH 11/36] Add status.version to list of fields to ignore for +Subject: [PATCH 11/40] Add status.version to list of fields to ignore for update --- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0012-Add-node-labels-support-for-bottlerocket.patch b/projects/kubernetes-sigs/cluster-api/patches/0012-Add-node-labels-support-for-bottlerocket.patch index 587baa9488..9479932985 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0012-Add-node-labels-support-for-bottlerocket.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0012-Add-node-labels-support-for-bottlerocket.patch @@ -1,7 +1,7 @@ -From f249ca59068aec430462a5fe6d320a6f46a5394e Mon Sep 17 00:00:00 2001 +From 2bf4a5d86f673d8d87e27621cef0c9ce5a8adaa3 Mon Sep 17 00:00:00 2001 From: Vivek Koppuru Date: Mon, 24 Jan 2022 00:46:44 -0800 -Subject: [PATCH 12/36] Add node labels support for bottlerocket +Subject: [PATCH 12/40] Add node labels support for bottlerocket --- .../internal/bottlerocket/bootstrap.go | 9 ++++++++ @@ -36,7 +36,7 @@ index 4e1de77db..3ebb9240a 100644 ` ) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 331e37202..bc04054d7 100644 +index 74aa7e029..dd4214699 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -27,6 +27,7 @@ type BottlerocketConfig struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0013-Support-worker-node-taints.patch b/projects/kubernetes-sigs/cluster-api/patches/0013-Support-worker-node-taints.patch index a41cd33a70..fd6bdd8d1e 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0013-Support-worker-node-taints.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0013-Support-worker-node-taints.patch @@ -1,7 +1,7 @@ -From 092051a05dba379048c61bf94155f8a79a77b08b Mon Sep 17 00:00:00 2001 +From c525fb5bef0d5e619fa5b360d2655c422206d5a0 Mon Sep 17 00:00:00 2001 From: Daniel Budris Date: Fri, 17 Dec 2021 13:38:39 -0800 -Subject: [PATCH 13/36] Support worker node taints +Subject: [PATCH 13/40] Support worker node taints seperate taints template into its own template @@ -54,7 +54,7 @@ index 3ebb9240a..dd769a78d 100644 ` ) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index bc04054d7..4a1b16fe7 100644 +index dd4214699..fd3c9d15d 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -28,6 +28,7 @@ type BottlerocketConfig struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0014-support-bottle-rocket-control-plane-taints.patch b/projects/kubernetes-sigs/cluster-api/patches/0014-support-bottle-rocket-control-plane-taints.patch index 955ba089bd..35f4ad19ad 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0014-support-bottle-rocket-control-plane-taints.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0014-support-bottle-rocket-control-plane-taints.patch @@ -1,7 +1,7 @@ -From 3e442d801c6c6abe5fed1c0df533124400615a1a Mon Sep 17 00:00:00 2001 +From e11d223eeeaec085f339af443432f4a2061116ed Mon Sep 17 00:00:00 2001 From: danbudris Date: Fri, 18 Feb 2022 09:24:32 -0500 -Subject: [PATCH 14/36] support bottle rocket control plane taints +Subject: [PATCH 14/40] support bottle rocket control plane taints --- .../internal/controllers/kubeadmconfig_controller.go | 6 ++++++ diff --git a/projects/kubernetes-sigs/cluster-api/patches/0015-Support-configuring-bottlerocket-control-container-u.patch b/projects/kubernetes-sigs/cluster-api/patches/0015-Support-configuring-bottlerocket-control-container-u.patch index ea3f2765db..8382c3f4d6 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0015-Support-configuring-bottlerocket-control-container-u.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0015-Support-configuring-bottlerocket-control-container-u.patch @@ -1,7 +1,7 @@ -From 3e2b9cda9d5c5c8558c7429efbe41b457139fe2a Mon Sep 17 00:00:00 2001 +From aee206e56c840079303acf4d1f1c00f9fed8b44a Mon Sep 17 00:00:00 2001 From: Michael Chu Date: Mon, 28 Feb 2022 09:51:25 -0800 -Subject: [PATCH 15/36] Support configuring bottlerocket control container uri +Subject: [PATCH 15/40] Support configuring bottlerocket control container uri Signed-off-by: Michael Chu --- @@ -542,7 +542,7 @@ index dd769a78d..f8f1b97cb 100644 ` ) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 4a1b16fe7..575b9c7f3 100644 +index fd3c9d15d..833f2d1c6 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -25,6 +25,7 @@ const ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0016-Change-format-for-storing-etcd-machine-address.patch b/projects/kubernetes-sigs/cluster-api/patches/0016-Change-format-for-storing-etcd-machine-address.patch index 6ca25996fa..f292cc56d7 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0016-Change-format-for-storing-etcd-machine-address.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0016-Change-format-for-storing-etcd-machine-address.patch @@ -1,7 +1,7 @@ -From 5f6f3c70c35d2fa913b88f94d47724e5b104f984 Mon Sep 17 00:00:00 2001 +From 4250d72e651d6851c068cec587a29630e43b1340 Mon Sep 17 00:00:00 2001 From: Rajashree Mandaogane Date: Thu, 3 Mar 2022 15:01:35 -0800 -Subject: [PATCH 16/36] Change format for storing etcd machine address +Subject: [PATCH 16/40] Change format for storing etcd machine address Once the first etcd member is initialized, the machine controller has to update the secret with the address of the machine, so it can be used diff --git a/projects/kubernetes-sigs/cluster-api/patches/0017-Parse-provider-id-from-kubelet-extra-args.patch b/projects/kubernetes-sigs/cluster-api/patches/0017-Parse-provider-id-from-kubelet-extra-args.patch index 29cd33167b..c7cf62d17b 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0017-Parse-provider-id-from-kubelet-extra-args.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0017-Parse-provider-id-from-kubelet-extra-args.patch @@ -1,7 +1,7 @@ -From 997cf9b8b09e0cd9d6998ccdb5e7228163c75548 Mon Sep 17 00:00:00 2001 +From bb0014967baf41479ab51f0a5e537440486f6288 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Wed, 8 Jun 2022 10:27:26 -0700 -Subject: [PATCH 17/36] Parse provider-id from kubelet extra args +Subject: [PATCH 17/40] Parse provider-id from kubelet extra args Signed-off-by: Vignesh Goutham Ganesh --- @@ -24,7 +24,7 @@ index f8f1b97cb..efdb51fef 100644 ` diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 575b9c7f3..cd06e97d3 100644 +index 833f2d1c6..c9391fedb 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -44,6 +44,7 @@ type BottlerocketSettingsInput struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0018-Add-bottlerocket-control-image-on-nodes-joining-a-ne.patch b/projects/kubernetes-sigs/cluster-api/patches/0018-Add-bottlerocket-control-image-on-nodes-joining-a-ne.patch index 8f7dc9d83f..d2c89e7e7a 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0018-Add-bottlerocket-control-image-on-nodes-joining-a-ne.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0018-Add-bottlerocket-control-image-on-nodes-joining-a-ne.patch @@ -1,7 +1,7 @@ -From d8c02ff39a86bc443cbcd82c9814303e649e3567 Mon Sep 17 00:00:00 2001 +From b038b56ec0baf35e821b9e85e4132eab745f8647 Mon Sep 17 00:00:00 2001 From: Victor Pineda Date: Sun, 19 Jun 2022 10:39:50 -0700 -Subject: [PATCH 18/36] Add bottlerocket control image on nodes joining a new +Subject: [PATCH 18/40] Add bottlerocket control image on nodes joining a new cluster --- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0019-Add-feature-to-specifiy-additional-host-containers-i.patch b/projects/kubernetes-sigs/cluster-api/patches/0019-Add-feature-to-specifiy-additional-host-containers-i.patch index f930bd4e7f..3b340a938c 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0019-Add-feature-to-specifiy-additional-host-containers-i.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0019-Add-feature-to-specifiy-additional-host-containers-i.patch @@ -1,7 +1,7 @@ -From 144c1546473f65babc66c833ff05258b8338e540 Mon Sep 17 00:00:00 2001 +From 4657c55a2aa3f4d5d5687b4cd55ec812f94060b0 Mon Sep 17 00:00:00 2001 From: Victor Pineda Date: Tue, 21 Jun 2022 07:50:19 -0700 -Subject: [PATCH 19/36] Add feature to specifiy additional host containers in +Subject: [PATCH 19/40] Add feature to specifiy additional host containers in BR Host containers are a feature within BR that allows us to pull images @@ -516,7 +516,7 @@ index efdb51fef..bc5094eb1 100644 ` ) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index cd06e97d3..6eda5f15f 100644 +index c9391fedb..0e6124b4c 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -23,28 +23,26 @@ const ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0020-Add-bottlerocket-custom-bootstrap-containers-config-.patch b/projects/kubernetes-sigs/cluster-api/patches/0020-Add-bottlerocket-custom-bootstrap-containers-config-.patch index 4ca4338671..e2f72b6750 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0020-Add-bottlerocket-custom-bootstrap-containers-config-.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0020-Add-bottlerocket-custom-bootstrap-containers-config-.patch @@ -1,7 +1,7 @@ -From ba22385ca118200dd369bf0ff2615d211c67b8cb Mon Sep 17 00:00:00 2001 +From dd3dfa30b41ad0456512497369001a98326bb8b5 Mon Sep 17 00:00:00 2001 From: Jiayi Wang Date: Mon, 21 Nov 2022 17:31:22 -0500 -Subject: [PATCH 20/36] Add bottlerocket custom bootstrap containers config +Subject: [PATCH 20/40] Add bottlerocket custom bootstrap containers config option --- @@ -547,7 +547,7 @@ index 000000000..9065a7c58 + } +} diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 6eda5f15f..5e1c6ea68 100644 +index 0e6124b4c..e504684a0 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -23,14 +23,15 @@ const ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0021-Support-configuring-bottlerocket-admin-container-ima.patch b/projects/kubernetes-sigs/cluster-api/patches/0021-Support-configuring-bottlerocket-admin-container-ima.patch index 27470b39da..1592b72a82 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0021-Support-configuring-bottlerocket-admin-container-ima.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0021-Support-configuring-bottlerocket-admin-container-ima.patch @@ -1,7 +1,7 @@ -From 4141b293e8ca4a792a39f97ef322a3a384bdda35 Mon Sep 17 00:00:00 2001 +From 650aa1d127a89c153c14973ca37ea480601c5f03 Mon Sep 17 00:00:00 2001 From: Jiayi Wang Date: Wed, 23 Nov 2022 09:26:28 -0500 -Subject: [PATCH 21/36] Support configuring bottlerocket admin container image +Subject: [PATCH 21/40] Support configuring bottlerocket admin container image --- .../api/v1alpha4/zz_generated.conversion.go | 2 + @@ -329,7 +329,7 @@ index 9065a7c58..5ee1b0d45 100644 } for _, testcase := range testcases { diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 5e1c6ea68..f917fdfc9 100644 +index e504684a0..9848f47e8 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -25,6 +25,7 @@ const ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0022-Make-bottlerocket-admin-control-custom-bootstrap-con.patch b/projects/kubernetes-sigs/cluster-api/patches/0022-Make-bottlerocket-admin-control-custom-bootstrap-con.patch index 03fff3e479..b3ceec8843 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0022-Make-bottlerocket-admin-control-custom-bootstrap-con.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0022-Make-bottlerocket-admin-control-custom-bootstrap-con.patch @@ -1,7 +1,7 @@ -From af15892740cf265c5e58f408cf6cda238c3d0453 Mon Sep 17 00:00:00 2001 +From 16237155012948448730535cd16b5070bf38c182 Mon Sep 17 00:00:00 2001 From: Jiayi Wang Date: Thu, 5 Jan 2023 14:56:09 -0500 -Subject: [PATCH 22/36] Make bottlerocket admin, control, custom bootstrap +Subject: [PATCH 22/40] Make bottlerocket admin, control, custom bootstrap container images updatable in webhook --- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0023-Mark-etcd-machine-status-to-running-after-etcd-contr.patch b/projects/kubernetes-sigs/cluster-api/patches/0023-Mark-etcd-machine-status-to-running-after-etcd-contr.patch index ee6fc22cf0..b009703e0c 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0023-Mark-etcd-machine-status-to-running-after-etcd-contr.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0023-Mark-etcd-machine-status-to-running-after-etcd-contr.patch @@ -1,7 +1,7 @@ -From 61324025cbf8db2d89372ff2a02ff3ce5278f527 Mon Sep 17 00:00:00 2001 +From 385222fdbac08ad655c4d3324eac73c305533ec1 Mon Sep 17 00:00:00 2001 From: Jiayi Wang Date: Mon, 9 Jan 2023 15:41:05 -0500 -Subject: [PATCH 23/36] Mark etcd machine status to running after etcd +Subject: [PATCH 23/40] Mark etcd machine status to running after etcd controller adds the etcd machine ready label --- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0024-add-support-for-registry-credentials.patch b/projects/kubernetes-sigs/cluster-api/patches/0024-add-support-for-registry-credentials.patch index f0279a6a2f..3d2578d2d1 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0024-add-support-for-registry-credentials.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0024-add-support-for-registry-credentials.patch @@ -1,7 +1,7 @@ -From c15af3f7b3adb91adf3cb4a17c0028cea8ffc62a Mon Sep 17 00:00:00 2001 +From 3b6ca85d0ea31a41e521e368778101f2e632fa64 Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Wed, 14 Dec 2022 12:47:42 -0800 -Subject: [PATCH 24/36] add support for registry credentials +Subject: [PATCH 24/40] add support for registry credentials Signed-off-by: Ahree Hong --- @@ -49,7 +49,7 @@ index fe280e091..58f38ca34 100644 {{template "nodeLabelSettings" .}} {{- end -}} diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index f917fdfc9..04aa074a6 100644 +index 9848f47e8..374c7e313 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -33,6 +33,7 @@ type BottlerocketConfig struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0025-Add-support-for-configuring-NTP-servers-on-bottleroc.patch b/projects/kubernetes-sigs/cluster-api/patches/0025-Add-support-for-configuring-NTP-servers-on-bottleroc.patch index a33d426012..a9dd1b94cf 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0025-Add-support-for-configuring-NTP-servers-on-bottleroc.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0025-Add-support-for-configuring-NTP-servers-on-bottleroc.patch @@ -1,7 +1,7 @@ -From 5b3221144cf970a9a8b4087d4a8938c5a7603f11 Mon Sep 17 00:00:00 2001 +From e37cb2388fec1698f3dfa1375cfa5c48f7c5ca19 Mon Sep 17 00:00:00 2001 From: Abhinav Date: Wed, 1 Feb 2023 16:34:23 -0800 -Subject: [PATCH 25/36] Add support for configuring NTP servers on bottlerocket +Subject: [PATCH 25/40] Add support for configuring NTP servers on bottlerocket through CAPI Signed-off-by: Abhinav @@ -80,7 +80,7 @@ index 5ee1b0d45..223f49e5a 100644 { Name: "admin", diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 04aa074a6..70fb0f221 100644 +index 374c7e313..e21afb266 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -33,6 +33,7 @@ type BottlerocketConfig struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0026-set-hostname-for-BR-nodes.patch b/projects/kubernetes-sigs/cluster-api/patches/0026-set-hostname-for-BR-nodes.patch index 01ce5b114e..88d8b6ebce 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0026-set-hostname-for-BR-nodes.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0026-set-hostname-for-BR-nodes.patch @@ -1,7 +1,7 @@ -From e805807dd35cae3cc493030e892c0a853e1d8878 Mon Sep 17 00:00:00 2001 +From f8c83847a8a8cd1ebf0def626a2bd11f1660cde1 Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Tue, 7 Feb 2023 14:26:36 -0800 -Subject: [PATCH 26/36] set hostname for BR nodes +Subject: [PATCH 26/40] set hostname for BR nodes Signed-off-by: Ahree Hong --- @@ -174,7 +174,7 @@ index 223f49e5a..dd0422007 100644 for _, testcase := range testcases { t.Run(testcase.name, func(t *testing.T) { diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 70fb0f221..943a3ed81 100644 +index e21afb266..658f3a05e 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -34,6 +34,7 @@ type BottlerocketConfig struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0027-Add-bottlerocket-k8s-settings-support.patch b/projects/kubernetes-sigs/cluster-api/patches/0027-Add-bottlerocket-k8s-settings-support.patch index 8f37c198fa..6996b9291c 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0027-Add-bottlerocket-k8s-settings-support.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0027-Add-bottlerocket-k8s-settings-support.patch @@ -1,7 +1,7 @@ -From 39a4d0ff8d79e1dbf0131d57ed8c0b70b1eebee7 Mon Sep 17 00:00:00 2001 +From 3c0d51d3fde4e22bc504a7e1a7a4da3fc8f0d0f3 Mon Sep 17 00:00:00 2001 From: Abhinav Pandey Date: Thu, 2 Mar 2023 10:18:07 -0800 -Subject: [PATCH 27/36] Add bottlerocket k8s settings support +Subject: [PATCH 27/40] Add bottlerocket k8s settings support Signed-off-by: Abhinav Pandey --- @@ -1044,7 +1044,7 @@ index dd0422007..3463a2769 100644 g.Expect(string(b)).To(Equal(testcase.output)) }) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 943a3ed81..7a9e08eec 100644 +index 658f3a05e..cbab7c7a4 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -22,11 +22,13 @@ const ( diff --git a/projects/kubernetes-sigs/cluster-api/patches/0028-add-br-kernel.sysctl-settings.patch b/projects/kubernetes-sigs/cluster-api/patches/0028-add-br-kernel.sysctl-settings.patch index ad9089a46e..f3fcb65a0d 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0028-add-br-kernel.sysctl-settings.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0028-add-br-kernel.sysctl-settings.patch @@ -1,7 +1,7 @@ -From cc3801654ba851985582e7d36c34c7ffefa021f3 Mon Sep 17 00:00:00 2001 +From bfad801558b207d16831c4114687347a11f1a6e7 Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Tue, 7 Mar 2023 14:01:39 -0800 -Subject: [PATCH 28/36] add br kernel.sysctl settings +Subject: [PATCH 28/40] add br kernel.sysctl settings Signed-off-by: Ahree Hong --- @@ -264,7 +264,7 @@ index 3463a2769..fdc60204d 100644 for _, testcase := range testcases { t.Run(testcase.name, func(t *testing.T) { diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 7a9e08eec..17b1174e8 100644 +index cbab7c7a4..afd854f1c 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -55,10 +55,11 @@ type BottlerocketSettingsInput struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0029-add-boot-kernel-settings-for-BR.patch b/projects/kubernetes-sigs/cluster-api/patches/0029-add-boot-kernel-settings-for-BR.patch index 60e544376e..5172d12fa3 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0029-add-boot-kernel-settings-for-BR.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0029-add-boot-kernel-settings-for-BR.patch @@ -1,7 +1,7 @@ -From dbc65096d5353c4fe2dfd19104b19646f66a6a0a Mon Sep 17 00:00:00 2001 +From 65228b634cb0878708b9212cb3961cca648183bf Mon Sep 17 00:00:00 2001 From: Ahree Hong Date: Thu, 23 Mar 2023 01:51:16 -0700 -Subject: [PATCH 29/36] add boot kernel settings for BR +Subject: [PATCH 29/40] add boot kernel settings for BR Signed-off-by: Ahree Hong --- @@ -286,7 +286,7 @@ index fdc60204d..5846524be 100644 g.Expect(string(b)).To(Equal(testcase.output)) }) diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 17b1174e8..87e764833 100644 +index afd854f1c..7b7131829 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -57,6 +57,7 @@ type BottlerocketSettingsInput struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0030-Patch-haproxy-maxconn-value-to-avoid-ulimit-issue.patch b/projects/kubernetes-sigs/cluster-api/patches/0030-Patch-haproxy-maxconn-value-to-avoid-ulimit-issue.patch index 5d10af2250..b2568f77fe 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0030-Patch-haproxy-maxconn-value-to-avoid-ulimit-issue.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0030-Patch-haproxy-maxconn-value-to-avoid-ulimit-issue.patch @@ -1,7 +1,7 @@ -From 4105994f583aff03929a17512ec9d0306ca950b6 Mon Sep 17 00:00:00 2001 +From 7d26035c82acd889d48aef430e2ae3751c6a2693 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Sat, 6 May 2023 14:08:17 -0500 -Subject: [PATCH 30/36] Patch haproxy maxconn value to avoid ulimit issue +Subject: [PATCH 30/40] Patch haproxy maxconn value to avoid ulimit issue EKS-A uses haproxy 2.5 which errors if the maxconn value requires more FDs than allowed by the ulimit setting of docker. diff --git a/projects/kubernetes-sigs/cluster-api/patches/0031-Add-support-for-custom-cert-bundles-in-BR-21.patch b/projects/kubernetes-sigs/cluster-api/patches/0031-Add-support-for-custom-cert-bundles-in-BR-21.patch index 7b100d1274..5383072142 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0031-Add-support-for-custom-cert-bundles-in-BR-21.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0031-Add-support-for-custom-cert-bundles-in-BR-21.patch @@ -1,7 +1,7 @@ -From 788472642835fc40d1467d802c9ca22a090c3ca7 Mon Sep 17 00:00:00 2001 +From b1f3ba65b6aa86390b2d24590cf73fb55642db7a Mon Sep 17 00:00:00 2001 From: ahreehong <46465244+ahreehong@users.noreply.github.com> Date: Fri, 19 May 2023 16:29:08 -0400 -Subject: [PATCH 31/36] Add support for custom cert bundles in BR (#21) +Subject: [PATCH 31/40] Add support for custom cert bundles in BR (#21) * add support for custom cert bundles br @@ -343,7 +343,7 @@ index 5846524be..2ee2d942b 100644 for _, testcase := range testcases { t.Run(testcase.name, func(t *testing.T) { diff --git a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go -index 87e764833..6e3aaaa95 100644 +index 7b7131829..ce796f206 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go @@ -37,6 +37,7 @@ type BottlerocketConfig struct { diff --git a/projects/kubernetes-sigs/cluster-api/patches/0032-CAPI-Move-Cluster-Filter.patch b/projects/kubernetes-sigs/cluster-api/patches/0032-CAPI-Move-Cluster-Filter.patch index e828b61794..88d2e2918f 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0032-CAPI-Move-Cluster-Filter.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0032-CAPI-Move-Cluster-Filter.patch @@ -1,7 +1,7 @@ -From 8cb231254fb850314fcde6323a5ca4106d7e84a5 Mon Sep 17 00:00:00 2001 +From f5a4bd11d8938be8f1eabe6a38eb9ead93919380 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 16 May 2023 11:03:09 -0500 -Subject: [PATCH 32/36] CAPI Move Cluster Filter +Subject: [PATCH 32/40] CAPI Move Cluster Filter Signed-off-by: Vignesh Goutham Ganesh --- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0033-Move-objects-with-force-move-label-and-no-cluster-te.patch b/projects/kubernetes-sigs/cluster-api/patches/0033-Move-objects-with-force-move-label-and-no-cluster-te.patch index 661937a50a..c19da6fe60 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0033-Move-objects-with-force-move-label-and-no-cluster-te.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0033-Move-objects-with-force-move-label-and-no-cluster-te.patch @@ -1,7 +1,7 @@ -From eedf06153d70783b57b63ad4ba4f60f89e3657ff Mon Sep 17 00:00:00 2001 +From a2c9f146c96c9f136f87f00643d23f0f530b03e6 Mon Sep 17 00:00:00 2001 From: Vignesh Goutham Ganesh Date: Tue, 30 May 2023 10:14:31 -0500 -Subject: [PATCH 33/36] Move objects with force move label and no cluster +Subject: [PATCH 33/40] Move objects with force move label and no cluster tenants Signed-off-by: Vignesh Goutham Ganesh diff --git a/projects/kubernetes-sigs/cluster-api/patches/0034-allow-registry-mirror-configurations-to-be-mutable-f.patch b/projects/kubernetes-sigs/cluster-api/patches/0034-allow-registry-mirror-configurations-to-be-mutable-f.patch index b9136e6c76..1ed730539c 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0034-allow-registry-mirror-configurations-to-be-mutable-f.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0034-allow-registry-mirror-configurations-to-be-mutable-f.patch @@ -1,7 +1,7 @@ -From 7f05b7a462cfeb4be9e75701a0b3bce59af848c1 Mon Sep 17 00:00:00 2001 +From 28f1b39e466290d81c89995d000377b19940e098 Mon Sep 17 00:00:00 2001 From: Cavaughn Browne Date: Thu, 20 Jul 2023 11:05:49 -0500 -Subject: [PATCH 34/36] allow registry mirror configurations to be mutable for +Subject: [PATCH 34/40] allow registry mirror configurations to be mutable for BR --- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0035-Add-support-for-external-etcd-machines-in-Kind-mappe.patch b/projects/kubernetes-sigs/cluster-api/patches/0035-Add-support-for-external-etcd-machines-in-Kind-mappe.patch index c64b21c840..afca885a7d 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0035-Add-support-for-external-etcd-machines-in-Kind-mappe.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0035-Add-support-for-external-etcd-machines-in-Kind-mappe.patch @@ -1,7 +1,7 @@ -From 7c854c32b070690761243b6e1bc3e18b422791b4 Mon Sep 17 00:00:00 2001 +From bf6115fe46f48829e662acdf949cb75afbd5ee59 Mon Sep 17 00:00:00 2001 From: Prow Bot Date: Wed, 16 Aug 2023 19:58:01 -0700 -Subject: [PATCH 35/36] Add support for external etcd machines in Kind mapper +Subject: [PATCH 35/40] Add support for external etcd machines in Kind mapper --- .../client/cluster/objectgraph_test.go | 2 +- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0036-disable-cgroupns-private-to-fix-AL2.patch b/projects/kubernetes-sigs/cluster-api/patches/0036-disable-cgroupns-private-to-fix-AL2.patch index 18b5f19026..14fd206078 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0036-disable-cgroupns-private-to-fix-AL2.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0036-disable-cgroupns-private-to-fix-AL2.patch @@ -1,7 +1,7 @@ -From 8410ec7deb924a687594f29a77e44bd5457aed03 Mon Sep 17 00:00:00 2001 +From 40bb1813093b8026676a490430b9385d62e15e0d Mon Sep 17 00:00:00 2001 From: Jackson West Date: Sat, 19 Aug 2023 09:35:39 -0500 -Subject: [PATCH 36/36] disable cgroupns=private to fix AL2 +Subject: [PATCH 36/40] disable cgroupns=private to fix AL2 --- test/infrastructure/container/docker.go | 9 +++++---- diff --git a/projects/kubernetes-sigs/cluster-api/patches/0037-Add-support-for-in-place-upgrade-in-KCP.patch b/projects/kubernetes-sigs/cluster-api/patches/0037-Add-support-for-in-place-upgrade-in-KCP.patch index 8d1c525d77..2300fa4156 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0037-Add-support-for-in-place-upgrade-in-KCP.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0037-Add-support-for-in-place-upgrade-in-KCP.patch @@ -1,7 +1,7 @@ -From 039bc59ba1368f4dce9ce7840ff54d5fd9d398a0 Mon Sep 17 00:00:00 2001 +From 8f1487055c090fa4a05a028db71c7927918bcab4 Mon Sep 17 00:00:00 2001 From: Abhinav Pandey Date: Wed, 17 Jan 2024 09:28:18 -0800 -Subject: [PATCH] Add support for in-place upgrade in KCP +Subject: [PATCH 37/40] Add support for in-place upgrade in KCP --- .../kubeadm/api/v1beta1/kubeadm_control_plane_types.go | 8 ++++++++ @@ -101,5 +101,5 @@ index f39201995..1d0631456 100644 ) } -- -2.42.0 +2.34.1 diff --git a/projects/kubernetes-sigs/cluster-api/patches/0039-Add-support-for-in-place-upgrades-in-MachineDeployme.patch b/projects/kubernetes-sigs/cluster-api/patches/0038-Add-support-for-in-place-upgrades-in-MachineDeployme.patch similarity index 98% rename from projects/kubernetes-sigs/cluster-api/patches/0039-Add-support-for-in-place-upgrades-in-MachineDeployme.patch rename to projects/kubernetes-sigs/cluster-api/patches/0038-Add-support-for-in-place-upgrades-in-MachineDeployme.patch index 0702dff023..2420d2bd6c 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0039-Add-support-for-in-place-upgrades-in-MachineDeployme.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0038-Add-support-for-in-place-upgrades-in-MachineDeployme.patch @@ -1,7 +1,7 @@ -From 521849bb19b8a405a5a5e989e87e508e091739c6 Mon Sep 17 00:00:00 2001 +From 242810d000cb556e59d23b1354a73135078ee7f8 Mon Sep 17 00:00:00 2001 From: Abhinav Pandey Date: Wed, 24 Jan 2024 00:00:03 -0800 -Subject: [PATCH] Add support for in-place upgrades in MachineDeployments +Subject: [PATCH 38/40] Add support for in-place upgrades in MachineDeployments --- api/v1beta1/machinedeployment_types.go | 11 +- @@ -340,5 +340,5 @@ index 4ca1c64ca..64e72d45b 100644 func (in *InfrastructureClusterBuilder) DeepCopyInto(out *InfrastructureClusterBuilder) { *out = *in -- -2.42.0 +2.34.1 diff --git a/projects/kubernetes-sigs/cluster-api/patches/0038-Restart-controller-if-RESTMapping-outdated-cache-is-.patch b/projects/kubernetes-sigs/cluster-api/patches/0038-Restart-controller-if-RESTMapping-outdated-cache-is-.patch deleted file mode 100644 index 78c7fadd80..0000000000 --- a/projects/kubernetes-sigs/cluster-api/patches/0038-Restart-controller-if-RESTMapping-outdated-cache-is-.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 12158d086f242c6e7fa2930689fa01ef38ab9ece Mon Sep 17 00:00:00 2001 -From: Guillermo Gaston -Date: Sat, 20 Jan 2024 22:05:04 +0000 -Subject: [PATCH 37/37] Restart controller if RESTMapping outdated cache is - detected when reconciling external object - ---- - controllers/external/util.go | 28 +++++++- - controllers/external/util_test.go | 116 +++++++++++++++++++++++++++++- - 2 files changed, 140 insertions(+), 4 deletions(-) - -diff --git a/controllers/external/util.go b/controllers/external/util.go -index 5b6443c78..62ed07959 100644 ---- a/controllers/external/util.go -+++ b/controllers/external/util.go -@@ -19,13 +19,17 @@ package external - import ( - "context" - "strings" -+ "syscall" - - "github.com/pkg/errors" - corev1 "k8s.io/api/core/v1" -+ "k8s.io/apimachinery/pkg/api/meta" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" - "k8s.io/apiserver/pkg/storage/names" - "sigs.k8s.io/controller-runtime/pkg/client" -+ "sigs.k8s.io/controller-runtime/pkg/client/apiutil" -+ "sigs.k8s.io/controller-runtime/pkg/log" - - clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - ) -@@ -40,12 +44,34 @@ func Get(ctx context.Context, c client.Reader, ref *corev1.ObjectReference, name - obj.SetKind(ref.Kind) - obj.SetName(ref.Name) - key := client.ObjectKey{Name: obj.GetName(), Namespace: namespace} -- if err := c.Get(ctx, key, obj); err != nil { -+ err := c.Get(ctx, key, obj) -+ if isV1alpha4NotFoundFromDiscoveryError(err) { -+ logErrorAndGracefulShutdown( -+ ctx, -+ err, -+ "Client RESTMapper returned an error from an invalid cache referencing infrastructure.cluster.x-k8s.io/v1alpha4, exiting the program to force a new cache to be built", -+ ) -+ } -+ if err != nil { - return nil, errors.Wrapf(err, "failed to retrieve %s external object %q/%q", obj.GetKind(), key.Namespace, key.Name) - } - return obj, nil - } - -+func isV1alpha4NotFoundFromDiscoveryError(err error) bool { -+ discoverFailedErr := &apiutil.ErrResourceDiscoveryFailed{} -+ noResourceMatchErr := &meta.NoResourceMatchError{} -+ return errors.As(err, &discoverFailedErr) && -+ errors.As(err, &noResourceMatchErr) && // This is the error that ErrResourceDiscoveryFailed will unwrap when the original error is NotFound. -+ strings.Contains(err.Error(), "cluster.x-k8s.io/v1alpha4") -+} -+ -+func logErrorAndGracefulShutdown(ctx context.Context, err error, msg string) { -+ logger := log.FromContext(ctx) -+ logger.Error(err, msg) -+ syscall.Kill(syscall.Getpid(), syscall.SIGINT) -+} -+ - // Delete uses the client and reference to delete an external, unstructured object. - func Delete(ctx context.Context, c client.Writer, ref *corev1.ObjectReference) error { - obj := new(unstructured.Unstructured) -diff --git a/controllers/external/util_test.go b/controllers/external/util_test.go -index 012445478..570cd4dae 100644 ---- a/controllers/external/util_test.go -+++ b/controllers/external/util_test.go -@@ -17,6 +17,7 @@ limitations under the License. - package external - - import ( -+ "fmt" - "testing" - - . "github.com/onsi/gomega" -@@ -25,16 +26,16 @@ import ( - apierrors "k8s.io/apimachinery/pkg/api/errors" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" -+ "k8s.io/apimachinery/pkg/runtime/schema" - ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/client" -+ "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - "sigs.k8s.io/controller-runtime/pkg/client/fake" - - clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" - ) - --var ( -- ctx = ctrl.SetupSignalHandler() --) -+var ctx = ctrl.SetupSignalHandler() - - const ( - testClusterName = "test-cluster" -@@ -323,3 +324,112 @@ func TestCloneTemplateMissingSpecTemplate(t *testing.T) { - }) - g.Expect(err).To(HaveOccurred()) - } -+ -+func TestIsV1alpha4NotFoundFromDiscoveryError(t *testing.T) { -+ tests := []struct { -+ name string -+ err error -+ want bool -+ }{ -+ { -+ name: "the error we are looking for", -+ err: &apiutil.ErrResourceDiscoveryFailed{ -+ schema.GroupVersion{ -+ Group: "infrastructure.cluster.x-k8s.io", -+ Version: "v1alpha4", -+ }: apierrors.NewNotFound(schema.GroupResource{}, "infrastructure.cluster.x-k8s.io/v1alpha4"), -+ }, -+ want: true, -+ }, -+ { -+ name: "the error we are looking for infra api for but wrapped", -+ err: fmt.Errorf("failed to get restmapping: %w", -+ &apiutil.ErrResourceDiscoveryFailed{ -+ schema.GroupVersion{ -+ Group: "infrastructure.cluster.x-k8s.io", -+ Version: "v1alpha4", -+ }: apierrors.NewNotFound(schema.GroupResource{}, "infrastructure.cluster.x-k8s.io/v1alpha4"), -+ }, -+ ), -+ want: true, -+ }, -+ { -+ name: "the error we are looking for bootstrap api for but wrapped", -+ err: fmt.Errorf("failed to get restmapping: %w", -+ &apiutil.ErrResourceDiscoveryFailed{ -+ schema.GroupVersion{ -+ Group: "bootstrap.cluster.x-k8s.io", -+ Version: "v1beta1", -+ }: apierrors.NewNotFound(schema.GroupResource{}, "bootstrap.cluster.x-k8s.io/v1alpha4"), -+ }, -+ ), -+ want: true, -+ }, -+ { -+ name: "v1alpha4 not found with different group", -+ err: &apiutil.ErrResourceDiscoveryFailed{ -+ schema.GroupVersion{ -+ Group: "different.group", -+ Version: "v1alpha4", -+ }: apierrors.NewNotFound(schema.GroupResource{}, "different.group/v1alpha4"), -+ }, -+ want: false, -+ }, -+ { -+ name: "infrastructure.cluster.x-k8s.io not found error with different version", -+ err: &apiutil.ErrResourceDiscoveryFailed{ -+ schema.GroupVersion{ -+ Group: "infrastructure.cluster.x-k8s.io", -+ Version: "differentkind", -+ }: apierrors.NewNotFound(schema.GroupResource{}, "infrastructure.cluster.x-k8s.io/differentkind"), -+ }, -+ want: false, -+ }, -+ { -+ name: "infrastructure.cluster.x-k8s.io/v1alpha4 but different error that is not NotFound", -+ err: &apiutil.ErrResourceDiscoveryFailed{ -+ schema.GroupVersion{ -+ Group: "infrastructure.cluster.x-k8s.io", -+ Version: "v1alpha4", -+ }: errors.New("some other error"), -+ }, -+ want: false, -+ }, -+ { -+ name: "plain not found error", -+ err: &apierrors.StatusError{ -+ ErrStatus: metav1.Status{ -+ Reason: metav1.StatusReasonNotFound, -+ }, -+ }, -+ want: false, -+ }, -+ { -+ name: "infrastructure.cluster.x-k8s.io/v1alpha4 not found error", -+ err: &apierrors.StatusError{ -+ ErrStatus: metav1.Status{ -+ Reason: metav1.StatusReasonNotFound, -+ Message: "infrastructure.cluster.x-k8s.io/v1alpha4", -+ }, -+ }, -+ want: false, -+ }, -+ { -+ name: "not error", -+ err: nil, -+ want: false, -+ }, -+ { -+ name: "other error", -+ err: errors.New("some other error"), -+ want: false, -+ }, -+ } -+ -+ for _, test := range tests { -+ t.Run(test.name, func(t *testing.T) { -+ g := NewWithT(t) -+ g.Expect(isV1alpha4NotFoundFromDiscoveryError(test.err)).To(Equal(test.want)) -+ }) -+ } -+} --- -2.34.1 - diff --git a/projects/kubernetes-sigs/cluster-api/patches/0040-Fix-MD-controller-reconcilation-with-in-place.patch b/projects/kubernetes-sigs/cluster-api/patches/0039-Fix-MD-controller-reconcilation-with-in-place.patch similarity index 99% rename from projects/kubernetes-sigs/cluster-api/patches/0040-Fix-MD-controller-reconcilation-with-in-place.patch rename to projects/kubernetes-sigs/cluster-api/patches/0039-Fix-MD-controller-reconcilation-with-in-place.patch index f77c2c7dfd..d3debca6ab 100644 --- a/projects/kubernetes-sigs/cluster-api/patches/0040-Fix-MD-controller-reconcilation-with-in-place.patch +++ b/projects/kubernetes-sigs/cluster-api/patches/0039-Fix-MD-controller-reconcilation-with-in-place.patch @@ -1,7 +1,7 @@ -From 2f942c61ed01980f654a52322c198b8c8b863df9 Mon Sep 17 00:00:00 2001 +From 98ad3444a813a806b1a4336f4d0ec4f90cfdd51f Mon Sep 17 00:00:00 2001 From: Abhinav Pandey Date: Mon, 5 Feb 2024 23:45:36 -0800 -Subject: [PATCH] Fix MD controller reconcilation with in-place +Subject: [PATCH 39/40] Fix MD controller reconcilation with in-place --- .../machinedeployment_controller_test.go | 398 ++++++++++++++++++ @@ -662,5 +662,5 @@ index 203cd90f8..0f4bb48f3 100644 return 0, fmt.Errorf("failed to compute replicas: deployment strategy %v isn't supported", deployment.Spec.Strategy.Type) } -- -2.42.0 +2.34.1 diff --git a/projects/kubernetes-sigs/cluster-api/patches/0040-Bump-controller-runtime-to-v0.16.4.patch b/projects/kubernetes-sigs/cluster-api/patches/0040-Bump-controller-runtime-to-v0.16.4.patch new file mode 100644 index 0000000000..485af1bcff --- /dev/null +++ b/projects/kubernetes-sigs/cluster-api/patches/0040-Bump-controller-runtime-to-v0.16.4.patch @@ -0,0 +1,101 @@ +From 185cbc7b384eb524b938b86563890e57f23a1163 Mon Sep 17 00:00:00 2001 +From: Guillermo Gaston +Date: Fri, 9 Feb 2024 10:24:20 -0600 +Subject: [PATCH 40/40] Bump controller-runtime to v0.16.4 + +--- + 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, 9 insertions(+), 9 deletions(-) + +diff --git a/go.mod b/go.mod +index 5fd1ce90d..c4f3f779e 100644 +--- a/go.mod ++++ b/go.mod +@@ -46,7 +46,7 @@ require ( + k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 + k8s.io/kubectl v0.28.4 + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 +- sigs.k8s.io/controller-runtime v0.16.3 ++ sigs.k8s.io/controller-runtime v0.16.4 + sigs.k8s.io/yaml v1.4.0 + ) + +diff --git a/go.sum b/go.sum +index d8012dfe8..dd84b7595 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.4 h1:XMh7dF19MlyvMfQCHvH929YGg2WFrIuJ4N5sx3G7U+k= ++sigs.k8s.io/controller-runtime v0.16.4/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 9ef6f6fa0..91d24afb7 100644 +--- a/hack/tools/go.mod ++++ b/hack/tools/go.mod +@@ -22,7 +22,7 @@ require ( + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 + sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 + sigs.k8s.io/cluster-api/test v0.0.0-00010101000000-000000000000 +- sigs.k8s.io/controller-runtime v0.16.3 ++ sigs.k8s.io/controller-runtime v0.16.4 + sigs.k8s.io/controller-tools v0.13.0 + sigs.k8s.io/kubebuilder/docs/book/utils v0.0.0-20211028165026-57688c578b5d + sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 +diff --git a/hack/tools/go.sum b/hack/tools/go.sum +index 5fdaed1bd..aa8023fc1 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.4 h1:XMh7dF19MlyvMfQCHvH929YGg2WFrIuJ4N5sx3G7U+k= ++sigs.k8s.io/controller-runtime v0.16.4/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 320e9d4de..4f839280d 100644 +--- a/test/go.mod ++++ b/test/go.mod +@@ -32,7 +32,7 @@ require ( + k8s.io/klog/v2 v2.100.1 + k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 + sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 +- sigs.k8s.io/controller-runtime v0.16.3 ++ sigs.k8s.io/controller-runtime v0.16.4 + sigs.k8s.io/kind v0.20.0 + sigs.k8s.io/yaml v1.4.0 + ) +diff --git a/test/go.sum b/test/go.sum +index 88a2ba2a8..c63b7a13f 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.4 h1:XMh7dF19MlyvMfQCHvH929YGg2WFrIuJ4N5sx3G7U+k= ++sigs.k8s.io/controller-runtime v0.16.4/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.34.1 +