Swap capi CRD race condition patch for CR bump (#2916)

The bug has been fixed in controller-runtime so now we don't need to
detect the error and restart the pod. This CR bump is already merged in
capi 1.6, once the new patch is out in a couple weeks, we can remove
this new patch and update capi.

projects/kubernetes-sigs/cluster-api/ATTRIBUTION.txt

@@ -230,7 +230,7 @@ https://github.com/kubernetes-sigs/apiserver-network-proxy
 ** sigs.k8s.io/cluster-api; version v1.6.0 --
 https://github.com/kubernetes-sigs/cluster-api
 
-** sigs.k8s.io/controller-runtime; version v0.16.3 --
+** sigs.k8s.io/controller-runtime; version v0.16.4 --
 https://github.com/kubernetes-sigs/controller-runtime
 
 ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd --

projects/kubernetes-sigs/cluster-api/CAPD_ATTRIBUTION.txt

@@ -200,7 +200,7 @@ https://github.com/kubernetes-sigs/cluster-api
 ** sigs.k8s.io/cluster-api/test/infrastructure/kind; version v1.6.0 --
 https://github.com/kubernetes-sigs/cluster-api
 
-** sigs.k8s.io/controller-runtime; version v0.16.3 --
+** sigs.k8s.io/controller-runtime; version v0.16.4 --
 https://github.com/kubernetes-sigs/controller-runtime
 
 ** sigs.k8s.io/json; version v0.0.0-20221116044647-bc3834ca7abd --

projects/kubernetes-sigs/cluster-api/CHECKSUMS

@@ -1,10 +1,10 @@
-8c6814e71455f04a01c777e89569329741d9387807e5b91dc815617fe20d67c7  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
-6bd73fb5bee185b91b272a9f3f2c9c4d7077fd6da4d6a0e6db7561904dfc9b33  _output/bin/cluster-api/linux-amd64/clusterctl
-ed5501705c6ccb97e907fc4c18e1574c99630e3dd431ff523955a20f1b853660  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
-bbb18893f45e21e78a2ae1a258d3b3fdce82107e68eccde2e715c43d08467645  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
-1402840915c98e6a2f77f59ac4cf937bfe132becfc6339697cce6c290d09bf44  _output/bin/cluster-api/linux-amd64/manager
-d2f847bf7c171a54ad1243012199331e4af24a806214855f7a10002212f8b003  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
-ed833ad71a6ca16bd079ddd5f3f4b269a42c5f2ad09fc5800d2f995373f9f279  _output/bin/cluster-api/linux-arm64/clusterctl
-0d69cc496f5e0505f5df8d8547adea467d19c2ec2647532f1cc131f73776617c  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
-1ff1af6845ecce1bff573d6d0389dcd312906bf3cb0f70e6367cf291235ea1fd  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
-b203a1e7f093f8c90563744b66340cd24aa327e2f8a6985a0d946cfa71390dbf  _output/bin/cluster-api/linux-arm64/manager
+edb650666212458d2933b237cc8e971a28c325ad991aa7867a6700a9955a1836  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
+8bf3a6e1497a0bc7365b48696e6310fcadef949eeb50b77a8e8769622b6451e4  _output/bin/cluster-api/linux-amd64/clusterctl
+09a9e9ce38948db589e036bce31fa566454b4a0cf4a39bb63226b7d2c95c43d4  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
+3be6e1f055c662f872cb4059ce4489659db439312a4eb0326f16142322008f27  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
+64e208ec15e035c6818af46e4a097f890db3b1473f31c59d1d5a6b564f97aa83  _output/bin/cluster-api/linux-amd64/manager
+78195694b39ddbac6a08be081b0ca457c8c795731d370fd86d918ef966987b52  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
+aebe6f8a5af764f6f9bad56bab9bd811ce85e3bd2cec1effcc60c816aa96026d  _output/bin/cluster-api/linux-arm64/clusterctl
+0c6aed4aaf5c128759db833844c0663cb9a80d07975598f7f0176bfac045ebbc  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
+a7da98ce118f366689f05e36ef9f163e2395509a4e75b4139d8f147a6c1e9e0e  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
+1375fa164a8b2679d4c3801101954ad8522ea34ab1f9c7db1df752cf34d6ff71  _output/bin/cluster-api/linux-arm64/manager

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 <[email protected]>
 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 <[email protected]>
 
@@ -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 @@

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 <[email protected]>
 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
 

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 <[email protected]>
 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
 

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 <[email protected]>
 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

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 <[email protected]>
 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

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 <[email protected]>
 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 (

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 <[email protected]>
 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 (

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 <[email protected]>
 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 ++++++

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 <[email protected]>
 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 ++++++++++

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 <[email protected]>
 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 ++++++++++++++++++

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 <[email protected]>
 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
 
 ---

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 <[email protected]>
 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 {

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 <[email protected]>
 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 {

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 <[email protected]>
 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 ++++++

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 <[email protected]>
 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 <[email protected]>
 ---
@@ -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 (

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 <[email protected]>
 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

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 <[email protected]>
 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 <[email protected]>
 ---
@@ -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 {

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 <[email protected]>
 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
 
 ---

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 <[email protected]>
 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 (

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 <[email protected]>
 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 (

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 <[email protected]>
 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 (

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 <[email protected]>
 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
 
 ---

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 <[email protected]>
 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
 
 ---

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 <[email protected]>
 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 <[email protected]>
 ---
@@ -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 {

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 <[email protected]>
 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 <[email protected]>
@@ -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 {