Add a CAPI patch to allow registry mirror configuration to be mutable (…

…#2336) * add a CAPI patch to allow registry mirror configuration changes * Update checksums
aws · Jul 20, 2023 · 9092d17 · 9092d17
1 parent eb5cca3
commit 9092d17
Show file tree

Hide file tree

Showing 35 changed files with 220 additions and 109 deletions.
diff --git a/projects/kubernetes-sigs/cluster-api/CHECKSUMS b/projects/kubernetes-sigs/cluster-api/CHECKSUMS
@@ -1,10 +1,10 @@
-fa0da15e88ac0c7f4904f66c83bdea9cd4a2c42af1902d1e2f8b588df24a6c63  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
-0b4b61c20418c27d0b01cc3bd0688da7a846531e1d400ecad9362b7369d78ff6  _output/bin/cluster-api/linux-amd64/clusterctl
-39904b6be4dd287a1bc05129ff2dfb86e7019f9ccc5a9037ef13832bb4671911  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
-36e297c10a4a1c62523c5543d63b20cc25dedfcf0ab05a0d9c495997b961ea48  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
-6960325d14c8a76cd1c8e1ef7d499dc9389946ffc60f17e776bcffb88bc2c377  _output/bin/cluster-api/linux-amd64/manager
-81c0f131d0fab5f736bbe30395bea6030e44307a645462754172909833733c3e  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
-1a191e2479a374d2ade23293e90aa3993174ba4eaef4f6f7c4c108fd4b458735  _output/bin/cluster-api/linux-arm64/clusterctl
-d07e2ede84ab59c0cb2e63b909bcce53414ccde9b2c869a6cac8aa7de0c705f5  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
-58616d19284020b66d3fd803e6e17b8b6989e1f9703644ac8de3252060c62d2d  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
-114fb081b916afbb90d630a30a03366050dd82c8471d8c4516ef8d5c0a94e1eb  _output/bin/cluster-api/linux-arm64/manager
+2121f9f2d640e80805bac00380be2487047474efed557ae4e7ddad64e3bd5aab  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
+56670cd869d1873ca3dcafda1d86ae99d6a15f87208c77b214577ea5d22b8b80  _output/bin/cluster-api/linux-amd64/clusterctl
+7f5dd8b550656192f2d8a09f8f3a29ff2002e37c762d9f3b86e4de5e8fd70999  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
+e7fea3cfb74edba0e1ff34fff0837a12b68511e763defb1aa0aff41b72b85cc0  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
+5def839a2076f9aaeb93262e8f486c76a2dcdaa80b31b2339b9708b22a824360  _output/bin/cluster-api/linux-amd64/manager
+0a925b51d0a6359963032771b2a4ba0f1bb1c1a458a771f73740b2afc233710a  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
+8c124b8b5632fd8531b66d6d57ddbb8e1a3a16c17b071e0fb26565068d7a46af  _output/bin/cluster-api/linux-arm64/clusterctl
+8c93d5079b878cdc70b59ead338c9abaa88c005eb518589a1f50854e7a0b9772  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
+190343f30008313cee0d3671a150ba936859da4a3b44fefefbcf5d798cc217f4  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
+0a130163cabc18241f3bd1e0fd3cb9e3e945ca82d55a39e30c8ee714a38df00e  _output/bin/cluster-api/linux-arm64/manager
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
@@ -1,7 +1,7 @@
-From d0cd142f16d9bed7549289271877c6f57ff165c2 Mon Sep 17 00:00:00 2001
+From c0d89ec2a34390253ed684c6f375e7c98309db66 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Fri, 11 Jun 2021 10:43:09 -0700
-Subject: [PATCH 01/33] Adding capi support for Bottlerocket
+Subject: [PATCH 01/34] Adding capi support for Bottlerocket
 
 Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
 
@@ -1846,5 +1846,5 @@ index f96cd8fa6..3588c8779 100644
  	k8s.io/cli-runtime v0.25.0 // indirect
  	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280
 -- 
-2.39.2
+2.40.0
 
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
@@ -1,7 +1,7 @@
-From c6be4ee2bee26d4385054c18654d91d941431a42 Mon Sep 17 00:00:00 2001
+From 2fe4c08c2a74571f00aef74c3cca5b8fb1c50235 Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Mon, 28 Jun 2021 13:44:50 -0700
-Subject: [PATCH 02/33] Add unstacked etcd support
+Subject: [PATCH 02/34] Add unstacked etcd support
 
 Unstacked etcd: API and config changes
 
@@ -1419,5 +1419,5 @@ index e6737ab7a..00da78f90 100644
  func GetClusterFromMetadata(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*clusterv1.Cluster, error) {
  	if obj.Labels[clusterv1.ClusterNameLabel] == "" {
 -- 
-2.39.2
+2.40.0
 
diff --git a/...ts/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch b/...ts/kubernetes-sigs/cluster-api/patches/0003-Unstacked-etcd-and-controlplane-upgrade.patch
@@ -1,7 +1,7 @@
-From d1d6d0c8020887f45676aaeb5f136b3cc4a31645 Mon Sep 17 00:00:00 2001
+From 849aa74da904a28b6778b06736e7eee0b9216475 Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Fri, 6 Aug 2021 17:16:39 -0700
-Subject: [PATCH 03/33] Unstacked etcd and controlplane upgrade
+Subject: [PATCH 03/34] Unstacked etcd and controlplane upgrade
 
 Rename controlplane upgrade annotation variable
 
@@ -295,5 +295,5 @@ index 9572a8ebd..7f2a32379 100644
  	}
 
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch b/...-sigs/cluster-api/patches/0004-Patch-config-path-in-kubevip-manifest-for-kubeadm-co.patch
@@ -1,7 +1,7 @@
-From 59325e633c55f4069939a25a7adb19a9ee782b29 Mon Sep 17 00:00:00 2001
+From 92d421ea3788679eb0fc877d3ca1b2c95341fcd1 Mon Sep 17 00:00:00 2001
 From: Guillermo Gaston <gaslor@amazon.com>
 Date: Thu, 19 Aug 2021 21:52:52 +0000
-Subject: [PATCH 04/33] Patch config path in kubevip manifest for kubeadm
+Subject: [PATCH 04/34] Patch config path in kubevip manifest for kubeadm
  control plane join with bottlerocket format
 
 cr: https://code.amazon.com/reviews/CR-55711271
@@ -27,5 +27,5 @@ index b93e1164b..aecbda8f4 100644
  	if err != nil {
  		return nil, errors.Wrapf(err, "failed to generate user data for machine joining control plane")
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch b/...-sigs/cluster-api/patches/0005-Make-pause-and-bottlerocket-bootstrap-images-updatab.patch
@@ -1,7 +1,7 @@
-From 8b3aab66a87bf74d77692c1ead68b07a6720abff Mon Sep 17 00:00:00 2001
+From 495362411dba1feef06cb85529549ee5d7381684 Mon Sep 17 00:00:00 2001
 From: Guillermo Gaston <gaslor@amazon.com>
 Date: Tue, 31 Aug 2021 15:56:28 +0000
-Subject: [PATCH 05/33] Make pause and bottlerocket bootstrap images updatable
+Subject: [PATCH 05/34] Make pause and bottlerocket bootstrap images updatable
  in validation webhook
 
 cr: https://code.amazon.com/reviews/CR-56335855
@@ -95,5 +95,5 @@ index 6ae774051..86c02c2e5 100644
  	before := &KubeadmControlPlane{
  		ObjectMeta: metav1.ObjectMeta{
 -- 
-2.39.2
+2.40.0
 
diff --git a/...etes-sigs/cluster-api/patches/0006-add-support-for-registry-mirror-for-bottlerocket.patch b/...etes-sigs/cluster-api/patches/0006-add-support-for-registry-mirror-for-bottlerocket.patch
@@ -1,7 +1,7 @@
-From dfca7fb3ee791f73c0da24c538c6f15c309be761 Mon Sep 17 00:00:00 2001
+From 4be5d1d84fa1c09cdfd0d0c2298f33639660a4b4 Mon Sep 17 00:00:00 2001
 From: Abhinav Pandey <abhnvp@amazon.com>
 Date: Tue, 21 Sep 2021 08:57:56 -0700
-Subject: [PATCH 06/33] add support for registry mirror for bottlerocket
+Subject: [PATCH 06/34] add support for registry mirror for bottlerocket
 
 ---
  api/v1alpha2/zz_generated.conversion.go       | 1007 +++++++++++++++++
@@ -1573,5 +1573,5 @@ index 5a1623e9f..5410d4145 100644
                                  description: SkipPhases is a list of phases to skip
                                    during command execution. The list of phases can
 -- 
-2.39.2
+2.40.0
 
diff --git a/...ernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch b/...ernetes-sigs/cluster-api/patches/0007-Fix-proxy-template-for-bottlerocket-bootstrap.patch
@@ -1,7 +1,7 @@
-From 28e12fd5f30ee4b2b9d8bc74a3a9da103c5fc628 Mon Sep 17 00:00:00 2001
+From 03ff70b8f2ff2a2ff5c9904962f5650170c7d65f Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Thu, 30 Sep 2021 14:04:36 -0700
-Subject: [PATCH 07/33] Fix proxy template for bottlerocket bootstrap
+Subject: [PATCH 07/34] 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
@@ -67,5 +67,5 @@ index f127ec4f1..9e4f8d4a5 100644
  		bottlerocketInput.RegistryMirrorCACert = base64.StdEncoding.EncodeToString([]byte(config.RegistryMirrorConfiguration.CACert))
  	}
 -- 
-2.39.2
+2.40.0
 
diff --git a/...ects/kubernetes-sigs/cluster-api/patches/0008-Update-core-conversion-spoke-versions.patch b/...ects/kubernetes-sigs/cluster-api/patches/0008-Update-core-conversion-spoke-versions.patch
@@ -1,7 +1,7 @@
-From 5f8e5cca7185f20566905f06744d84cdd0f8e055 Mon Sep 17 00:00:00 2001
+From c9a3b7612f28a88511db92cccdcdb306397e07ad Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Sun, 21 Nov 2021 01:16:11 -0800
-Subject: [PATCH 08/33] Update core conversion spoke versions
+Subject: [PATCH 08/34] Update core conversion spoke versions
 
 ---
  api/v1alpha3/conversion.go              | 12 ++++++++++++
@@ -116,5 +116,5 @@ index 1f0c12a79..0abe06592 100644
  }
 
 -- 
-2.39.2
+2.40.0
 
diff --git a/...rnetes-sigs/cluster-api/patches/0009-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch b/...rnetes-sigs/cluster-api/patches/0009-Add-bottlerocket-changes-to-capbk-v1alpha4-api.patch
@@ -1,7 +1,7 @@
-From 3fd5dedbbcf8e7dfeb3d9f6e11273eed554a8ccb Mon Sep 17 00:00:00 2001
+From 4f814782f004e84793f44b9dff84121abd44c57f Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Sun, 21 Nov 2021 20:59:58 -0800
-Subject: [PATCH 09/33] Add bottlerocket changes to capbk v1alpha4 api
+Subject: [PATCH 09/34] Add bottlerocket changes to capbk v1alpha4 api
 
 ---
  .../kubeadm/api/v1alpha4/kubeadm_types.go     |  72 ++++++++++
@@ -1113,5 +1113,5 @@ index 5410d4145..c96b0409c 100644
                            mounts:
                              description: Mounts specifies a list of mount points to
 -- 
-2.39.2
+2.40.0
 
diff --git a/...ects/kubernetes-sigs/cluster-api/patches/0010-Update-capbk-converions-spoke-version.patch b/...ects/kubernetes-sigs/cluster-api/patches/0010-Update-capbk-converions-spoke-version.patch
@@ -1,7 +1,7 @@
-From cc7f2f692c849cafc1433279f9d71d404c02f41f Mon Sep 17 00:00:00 2001
+From 775ddc4e4c581624fd5d4ebfccda55b4d789cb61 Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Sun, 21 Nov 2021 21:00:31 -0800
-Subject: [PATCH 10/33] Update capbk converions spoke version
+Subject: [PATCH 10/34] Update capbk converions spoke version
 
 ---
  .../api/v1alpha4/zz_generated.conversion.go   | 180 ++++++++++++++++++
@@ -938,5 +938,5 @@ index d849616cb..9b0c13356 100644
 +	return autoConvert_v1beta1_RegistryMirrorConfiguration_To_upstreamv1beta3_RegistryMirrorConfiguration(in, out, s)
 +}
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0011-Add-status.version-to-list-of-fields-to-ignore-for-u.patch b/...-sigs/cluster-api/patches/0011-Add-status.version-to-list-of-fields-to-ignore-for-u.patch
@@ -1,7 +1,7 @@
-From f1111a5b093b9648822f83156eda5f574aaa6c15 Mon Sep 17 00:00:00 2001
+From d373291a69930725c22d6a46a0c65af412b2030d Mon Sep 17 00:00:00 2001
 From: Vivek Koppuru <koppv@amazon.com>
 Date: Wed, 12 Jan 2022 19:04:15 -0800
-Subject: [PATCH 11/33] Add status.version to list of fields to ignore for
+Subject: [PATCH 11/34] Add status.version to list of fields to ignore for
  update
 
 ---
@@ -29,5 +29,5 @@ index 263bda967..1d0d4abfd 100644
 
  	allErrs := validateKubeadmControlPlaneSpec(in.Spec, in.Namespace, field.NewPath("spec"))
 -- 
-2.39.2
+2.40.0
 
diff --git a/...s/kubernetes-sigs/cluster-api/patches/0012-Add-node-labels-support-for-bottlerocket.patch b/...s/kubernetes-sigs/cluster-api/patches/0012-Add-node-labels-support-for-bottlerocket.patch
@@ -1,7 +1,7 @@
-From 961c12e38ed53c0376581828e225c70856f0b0f6 Mon Sep 17 00:00:00 2001
+From 43bc7ad89d92e9834e67d62dd01fcf0dd657154a Mon Sep 17 00:00:00 2001
 From: Vivek Koppuru <koppv@amazon.com>
 Date: Mon, 24 Jan 2022 00:46:44 -0800
-Subject: [PATCH 12/33] Add node labels support for bottlerocket
+Subject: [PATCH 12/34] Add node labels support for bottlerocket
 
 ---
  .../internal/bottlerocket/bootstrap.go        |  9 ++++++++
@@ -139,5 +139,5 @@ index b1fb19751..8a8c04c92 100644
  		if err != nil {
  			scope.Error(err, "Failed to generate cloud init for bottlerocket bootstrap control plane")
 -- 
-2.39.2
+2.40.0
 
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
@@ -1,7 +1,7 @@
-From 3a55406244b829ff8966767ebc4c8a0772d7c996 Mon Sep 17 00:00:00 2001
+From f3b44f5fe0276fb4d11c0530ae67b53e343fd615 Mon Sep 17 00:00:00 2001
 From: Daniel Budris <budris@amazon.com>
 Date: Fri, 17 Dec 2021 13:38:39 -0800
-Subject: [PATCH 13/33] Support worker node taints
+Subject: [PATCH 13/34] Support worker node taints
 
 seperate taints template into its own template
 
@@ -151,5 +151,5 @@ index 8a8c04c92..4b08e24c8 100644
  		if err != nil {
  			scope.Error(err, "Failed to create a worker bottlerocket join configuration")
 -- 
-2.39.2
+2.40.0
 
diff --git a/...kubernetes-sigs/cluster-api/patches/0014-support-bottle-rocket-control-plane-taints.patch b/...kubernetes-sigs/cluster-api/patches/0014-support-bottle-rocket-control-plane-taints.patch
@@ -1,7 +1,7 @@
-From d8efe24b24a195fb4455293aaf85d30f6b84c790 Mon Sep 17 00:00:00 2001
+From 80cfea83d2aada40e9b077ea059695236f60f05b Mon Sep 17 00:00:00 2001
 From: danbudris <budris@amazon.com>
 Date: Fri, 18 Feb 2022 09:24:32 -0500
-Subject: [PATCH 14/33] support bottle rocket control plane taints
+Subject: [PATCH 14/34] support bottle rocket control plane taints
 
 ---
  .../internal/controllers/kubeadmconfig_controller.go        | 6 ++++++
@@ -32,5 +32,5 @@ index 4b08e24c8..085ff3460 100644
  		if err != nil {
  			scope.Error(err, "Failed to generate cloud init for bottlerocket bootstrap control plane")
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0015-Support-configuring-bottlerocket-control-container-u.patch b/...-sigs/cluster-api/patches/0015-Support-configuring-bottlerocket-control-container-u.patch
@@ -1,7 +1,7 @@
-From e2e5e33f27607299010aca8855591aef518ce1b1 Mon Sep 17 00:00:00 2001
+From 5dd32522f412fcc524ea2d6c451dae46e639c668 Mon Sep 17 00:00:00 2001
 From: Michael Chu <chumich@amazon.com>
 Date: Mon, 28 Feb 2022 09:51:25 -0800
-Subject: [PATCH 15/33] Support configuring bottlerocket control container uri
+Subject: [PATCH 15/34] Support configuring bottlerocket control container uri
 
 Signed-off-by: Michael Chu <chumich@amazon.com>
 ---
@@ -1963,5 +1963,5 @@ index 63bbea586..0fede6ce6 100644
  				  extraArgs:
  				    bar: baz
 -- 
-2.39.2
+2.40.0
 
diff --git a/...rnetes-sigs/cluster-api/patches/0016-Change-format-for-storing-etcd-machine-address.patch b/...rnetes-sigs/cluster-api/patches/0016-Change-format-for-storing-etcd-machine-address.patch
@@ -1,7 +1,7 @@
-From a0a6207eac5c95922be35be2ad53253aec4fbc23 Mon Sep 17 00:00:00 2001
+From 57d97e27b69f2b8a76ac25d586b79b8a33399013 Mon Sep 17 00:00:00 2001
 From: Rajashree Mandaogane <mandaor@amazon.com>
 Date: Thu, 3 Mar 2022 15:01:35 -0800
-Subject: [PATCH 16/33] Change format for storing etcd machine address
+Subject: [PATCH 16/34] 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
@@ -39,5 +39,5 @@ index 03806a1b7..4181ca366 100644
  						Type: clusterv1.ClusterSecretType,
  					}
 -- 
-2.39.2
+2.40.0
 
diff --git a/.../kubernetes-sigs/cluster-api/patches/0017-Parse-provider-id-from-kubelet-extra-args.patch b/.../kubernetes-sigs/cluster-api/patches/0017-Parse-provider-id-from-kubelet-extra-args.patch
@@ -1,7 +1,7 @@
-From a96d24c8ec5b89d2afca82c5582cc212afc31b86 Mon Sep 17 00:00:00 2001
+From 17d0638ab508ff679b0a3472e64936d432522301 Mon Sep 17 00:00:00 2001
 From: Vignesh Goutham Ganesh <vgg@amazon.com>
 Date: Wed, 8 Jun 2022 10:27:26 -0700
-Subject: [PATCH 17/33] Parse provider-id from kubelet extra args
+Subject: [PATCH 17/34] Parse provider-id from kubelet extra args
 
 Signed-off-by: Vignesh Goutham Ganesh <vgg@amazon.com>
 ---
@@ -44,5 +44,5 @@ index e635308ea..3a760d51a 100644
  	if config.BottlerocketControl.ImageRepository != "" && config.BottlerocketControl.ImageTag != "" {
  		bottlerocketInput.ControlContainerSource = fmt.Sprintf("%s:%s", config.BottlerocketControl.ImageRepository, config.BottlerocketControl.ImageTag)
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0018-Add-bottlerocket-control-image-on-nodes-joining-a-ne.patch b/...-sigs/cluster-api/patches/0018-Add-bottlerocket-control-image-on-nodes-joining-a-ne.patch
@@ -1,7 +1,7 @@
-From ea40f8c005979e272ab1c4bae2b2932937bf2ad2 Mon Sep 17 00:00:00 2001
+From 3a9ee48150a557205f355b169f0f87cf5b58c4ef Mon Sep 17 00:00:00 2001
 From: Victor Pineda <vgonzla@amazon.com>
 Date: Sun, 19 Jun 2022 10:39:50 -0700
-Subject: [PATCH 18/33] Add bottlerocket control image on nodes joining a new
+Subject: [PATCH 18/34] Add bottlerocket control image on nodes joining a new
  cluster
 
 ---
@@ -21,5 +21,5 @@ index bc5561a56..2d536dd33 100644
  		if scope.Config.Spec.JoinConfiguration.Proxy.HTTPSProxy != "" {
  			bottlerocketConfig.ProxyConfiguration = scope.Config.Spec.JoinConfiguration.Proxy
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0019-Add-feature-to-specifiy-additional-host-containers-i.patch b/...-sigs/cluster-api/patches/0019-Add-feature-to-specifiy-additional-host-containers-i.patch
@@ -1,7 +1,7 @@
-From bd0a44b4e066fa31a26659cd30c9355b0bb574e3 Mon Sep 17 00:00:00 2001
+From f8f9f309f7675eeaf307d24734922002a176e2f0 Mon Sep 17 00:00:00 2001
 From: Victor Pineda <vgonzla@amazon.com>
 Date: Tue, 21 Jun 2022 07:50:19 -0700
-Subject: [PATCH 19/33] Add feature to specifiy additional host containers in
+Subject: [PATCH 19/34] Add feature to specifiy additional host containers in
  BR
 
 Host containers are a feature within BR that allows us to pull images
@@ -1149,5 +1149,5 @@ index e11d335ee..1cf471a08 100644
                                  description: 'CACertPath is the path to the SSL certificate
                                    authority used to secure comunications between node
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0020-Add-bottlerocket-custom-bootstrap-containers-config-.patch b/...-sigs/cluster-api/patches/0020-Add-bottlerocket-custom-bootstrap-containers-config-.patch
@@ -1,7 +1,7 @@
-From 2bb5a488f548e9fbe5b57b4bf25935efc3002d8d Mon Sep 17 00:00:00 2001
+From bc1f8c5c3404c93dab8efde2f96897edc3f6f172 Mon Sep 17 00:00:00 2001
 From: Jiayi Wang <jiayiwang7@yahoo.com>
 Date: Mon, 21 Nov 2022 17:31:22 -0500
-Subject: [PATCH 20/33] Add bottlerocket custom bootstrap containers config
+Subject: [PATCH 20/34] Add bottlerocket custom bootstrap containers config
  option
 
 ---
@@ -949,5 +949,5 @@ index 1cf471a08..235ff121f 100644
                                  description: BottlerocketCustomHostContainers contains
                                    the information of any additional images that we
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0021-Support-configuring-bottlerocket-admin-container-ima.patch b/...-sigs/cluster-api/patches/0021-Support-configuring-bottlerocket-admin-container-ima.patch
@@ -1,7 +1,7 @@
-From 2dfe5145dd2974e171514ede28cc360a142e1964 Mon Sep 17 00:00:00 2001
+From 7e35426496b6857c389e86444d8b7a31b0121b28 Mon Sep 17 00:00:00 2001
 From: Jiayi Wang <jiayiwang7@yahoo.com>
 Date: Wed, 23 Nov 2022 09:26:28 -0500
-Subject: [PATCH 21/33] Support configuring bottlerocket admin container image
+Subject: [PATCH 21/34] Support configuring bottlerocket admin container image
 
 ---
  .../api/v1alpha4/zz_generated.conversion.go   |  2 +
@@ -540,5 +540,5 @@ index 235ff121f..e435df3e1 100644
                                  description: BottlerocketBootstrap holds the image
                                    source for kubeadm bootstrap container This is only
 -- 
-2.39.2
+2.40.0
 
diff --git a/...-sigs/cluster-api/patches/0022-Make-bottlerocket-admin-control-custom-bootstrap-con.patch b/...-sigs/cluster-api/patches/0022-Make-bottlerocket-admin-control-custom-bootstrap-con.patch
@@ -1,7 +1,7 @@
-From 3b881cb7b8efc2eb7b2fd6ec0b529acd0338952d Mon Sep 17 00:00:00 2001
+From 9e50bbd5b2c8148d2aab683257724f60d22c7045 Mon Sep 17 00:00:00 2001
 From: Jiayi Wang <jiayiwang7@yahoo.com>
 Date: Thu, 5 Jan 2023 14:56:09 -0500
-Subject: [PATCH 22/33] Make bottlerocket admin, control, custom bootstrap
+Subject: [PATCH 22/34] Make bottlerocket admin, control, custom bootstrap
  container images updatable in webhook
 
 ---
@@ -113,5 +113,5 @@ index 86c02c2e5..38caa9e1e 100644
 
  	for _, tt := range tests {
 -- 
-2.39.2
+2.40.0