From 8f0ebceb3aab9e4dd582e516adcb0f4d31d377fa Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Mon, 29 Jan 2024 14:28:55 -0800 Subject: [PATCH] Remove CAPI kube-vip hostPath patch --- .../0001-Adding-capi-support-for-Bottlerocket.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 00ee17bd36..bd48888fe3 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 @@ -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)