From 92d421ea3788679eb0fc877d3ca1b2c95341fcd1 Mon Sep 17 00:00:00 2001 From: Guillermo Gaston Date: Thu, 19 Aug 2021 21:52:52 +0000 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 --- .../kubeadm/internal/bottlerocket/controlplane_join.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/bootstrap/kubeadm/internal/bottlerocket/controlplane_join.go b/bootstrap/kubeadm/internal/bottlerocket/controlplane_join.go index b93e1164b..aecbda8f4 100644 --- a/bootstrap/kubeadm/internal/bottlerocket/controlplane_join.go +++ b/bootstrap/kubeadm/internal/bottlerocket/controlplane_join.go @@ -21,6 +21,12 @@ func NewJoinControlPlane(input *cloudinit.ControlPlaneJoinInput, config *Bottler input.WriteFiles = input.Certificates.AsFiles() input.ControlPlane = true input.WriteFiles = append(input.WriteFiles, input.AdditionalFiles...) + var err error + input.WriteFiles, err = patchKubeVipFile(input.WriteFiles) + if err != nil { + return nil, errors.Wrap(err, "failed to patch kube-vip manifest file for control plane join") + } + bootstrapContainerUserData, err := generateBootstrapContainerUserData("JoinControlplane", controlPlaneJoinBottlerocketInit, input) if err != nil { return nil, errors.Wrapf(err, "failed to generate user data for machine joining control plane") -- 2.40.0