Remove CAPI kube-vip hostPath patch (#2857)

projects/kubernetes-sigs/cluster-api/CHECKSUMS

@@ -1,10 +1,10 @@
-c41e0f0c010778bd4e58a0a0a178bfdeb46aa577463fada22edc1556cda22ef3  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
-aec039e14780ce88905c2ca2fd12a17c57a31e23826bfdad61a57cfa74267fb1  _output/bin/cluster-api/linux-amd64/clusterctl
-5f1f43710ef83f73a3c7bc876923e272b77a5e78ae5d0facf9ee4c1fc674b7a7  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
-81016bffc0fdeb51357058fc8b4174c1f2249c622828b371cb94f0f45ae151c0  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
-47655605a13d38602093ab58739e9554b9f8e7d188889d57fe8fe0cec2e85514  _output/bin/cluster-api/linux-amd64/manager
-d58e72383fca3165c10ac3e5581bacbbdb5e943caf6253c755412e6c87867ffa  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
-78f607c2b42274a16b6e56b996b662fe7cc604aa4515e9cbce355fb5d51dde02  _output/bin/cluster-api/linux-arm64/clusterctl
-214b88577ef74c689205f4b3d267ef327a19264062d9a2772302dfcdd83620de  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
-4cd4f6d3b6f5decaec7238eff88f0e1337644a7e46bb1a7fdca7c38590fa09ec  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
-b4a626bf552386b0bcca67d9727daee818035bfecb4176a8a981828a6440c728  _output/bin/cluster-api/linux-arm64/manager
+f811c939a189e7a7fd010b562772b31ab41ea89f7d7fef62ccfe0eaec426c2d7  _output/bin/cluster-api/linux-amd64/cluster-api-provider-docker-manager
+70df9fd1aa946e28972a01ab20584fa753690cb82f32b53078e96e4b208264b3  _output/bin/cluster-api/linux-amd64/clusterctl
+4cba0727e70d7b36c8fae703368e25af563c27f0581df590abaca1d35791468a  _output/bin/cluster-api/linux-amd64/kubeadm-bootstrap-manager
+533ec4d8f8a6c4a6d4d7901364b835b66ccf297542dd8ba42a156bd7c29856ab  _output/bin/cluster-api/linux-amd64/kubeadm-control-plane-manager
+c3067304e11f86c32b6102c8f4eca162b061bf7fe9ec5238612c0d319c365ff7  _output/bin/cluster-api/linux-amd64/manager
+ce1293eebed5d88aa52f3659b27ae3b8ec6c4deabcc85fcd2395fdb390f56629  _output/bin/cluster-api/linux-arm64/cluster-api-provider-docker-manager
+bb466daeb28432f5d6bdb2cf44bfe3ef0053063e9ee5b3525bef6275ceda83ae  _output/bin/cluster-api/linux-arm64/clusterctl
+4d23467cc94990c1e40d56f4e7b80eb6ba803b98bff17f26a0085299a91b4f9d  _output/bin/cluster-api/linux-arm64/kubeadm-bootstrap-manager
+9ca3047acc1af624bf61f70f7567241e9842516f7e4b91cd36786f10cd02f2e3  _output/bin/cluster-api/linux-arm64/kubeadm-control-plane-manager
+5b7a4584dda565296253b64938e03d7fc56f12bb5e943277acbcb383ac44805a  _output/bin/cluster-api/linux-arm64/manager

projects/kubernetes-sigs/cluster-api/patches/0001-Adding-capi-support-for-Bottlerocket.patch

@@ -34,7 +34,7 @@ Remove userdata logging for bottlerocket
  ...strap.cluster.x-k8s.io_kubeadmconfigs.yaml | 174 ++++++++++++++++
  ...uster.x-k8s.io_kubeadmconfigtemplates.yaml | 186 ++++++++++++++++++
  .../internal/bottlerocket/bootstrap.go        |  45 +++++
- .../internal/bottlerocket/bottlerocket.go     | 177 +++++++++++++++++
+ .../internal/bottlerocket/bottlerocket.go     | 176 +++++++++++++++++
  .../bottlerocket/bottlerocket_test.go         | 141 +++++++++++++
  .../bottlerocket/controlplane_init.go         |  47 +++++
  .../bottlerocket/controlplane_join.go         |  30 +++
@@ -46,7 +46,7 @@ Remove userdata logging for bottlerocket
  .../controllers/kubeadmconfig_controller.go   |  73 +++++++
  ...cluster.x-k8s.io_kubeadmcontrolplanes.yaml | 186 ++++++++++++++++++
  ...x-k8s.io_kubeadmcontrolplanetemplates.yaml |  99 ++++++++++
- 17 files changed, 1296 insertions(+), 2 deletions(-)
+ 17 files changed, 1295 insertions(+), 2 deletions(-)
  create mode 100644 bootstrap/kubeadm/internal/bottlerocket/bootstrap.go
  create mode 100644 bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go
  create mode 100644 bootstrap/kubeadm/internal/bottlerocket/bottlerocket_test.go
@@ -722,7 +722,7 @@ new file mode 100644
 index 000000000..350965204
 --- /dev/null
 +++ b/bootstrap/kubeadm/internal/bottlerocket/bottlerocket.go
-@@ -0,0 +1,177 @@
+@@ -0,0 +1,176 @@
 +package bottlerocket
 +
 +import (
@@ -887,7 +887,6 @@ index 000000000..350965204
 +			// Patch the spec.Volume mount path
 +			f := corev1.HostPathFile
 +			pod.Spec.Volumes[0].HostPath.Type = &f
-+			pod.Spec.Volumes[0].HostPath.Path = "/var/lib/kubeadm/admin.conf"
 +
 +			// Marshall back into yaml and override
 +			patchedYaml, err := yaml.Marshal(pod)