From dcd3b5002bfe48bfed9e1022d0b9a50dc929332a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lazar=20Cvetkovi=C4=87?= Date: Mon, 19 Feb 2024 15:55:39 +0100 Subject: [PATCH] Kubeadm fix with VRRP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Lazar Cvetković --- configs/k8s_ha/keepalived_backup.conf | 2 +- configs/setup/system.json | 2 +- scripts/cluster/create_multinode_cluster.go | 12 +++++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/configs/k8s_ha/keepalived_backup.conf b/configs/k8s_ha/keepalived_backup.conf index 57fe34a3e..c35332558 100644 --- a/configs/k8s_ha/keepalived_backup.conf +++ b/configs/k8s_ha/keepalived_backup.conf @@ -15,7 +15,7 @@ vrrp_instance VI_1 { state BACKUP interface $INTERFACE_NAME virtual_router_id 51 - priority 101 + priority 100 authentication { auth_type PASS auth_pass 42 diff --git a/configs/setup/system.json b/configs/setup/system.json index 8230367ce..3d9640c4b 100644 --- a/configs/setup/system.json +++ b/configs/setup/system.json @@ -15,5 +15,5 @@ "PmuToolsRepoUrl": "https://github.com/vhive-serverless/pmu-tools", "ProtocVersion": "3.19.4", "ProtocDownloadUrlTemplate": "https://github.com/protocolbuffers/protobuf/releases/download/v%s/protoc-%s-linux-x86_64.zip", - "LogVerbosity": 0 + "LogVerbosity": 5 } \ No newline at end of file diff --git a/scripts/cluster/create_multinode_cluster.go b/scripts/cluster/create_multinode_cluster.go index 234928820..695f24e63 100644 --- a/scripts/cluster/create_multinode_cluster.go +++ b/scripts/cluster/create_multinode_cluster.go @@ -108,21 +108,19 @@ func DeployKubernetes(haReplicaCount int) error { return iperr } - command := `sudo kubeadm init --v=%d \ + command := fmt.Sprintf(`sudo kubeadm init --v=%d \ --apiserver-advertise-address=%s \ --cri-socket /run/containerd/containerd.sock \ --kubernetes-version %s \ ---pod-network-cidr="%s" ` - args := []any{configs.System.LogVerbosity, masterNodeIp, configs.Kube.K8sVersion, configs.Kube.PodNetworkCidr} +--pod-network-cidr="%s" `, configs.System.LogVerbosity, masterNodeIp, configs.Kube.K8sVersion, configs.Kube.PodNetworkCidr) if haReplicaCount > 0 { - command += ` \ + command += fmt.Sprintf(`\ --control-plane-endpoint "%s:%s" \ ---upload-certs` - args = append(args, configs.Kube.CPHAEndpoint, configs.Kube.CPHAPort) +--upload-certs`, configs.Kube.CPHAEndpoint, configs.Kube.CPHAPort) } - shellCmd := fmt.Sprintf(command, args) + shellCmd := command if len(configs.Kube.AlternativeImageRepo) > 0 { shellCmd = fmt.Sprintf(shellCmd+"--image-repository %s ", configs.Kube.AlternativeImageRepo) }