Change of API Server port

Signed-off-by: Lazar Cvetković <l.cvetkovic.997@gmail.com>

Author: cvetkovic

config/kube.json

@@ -9,5 +9,5 @@
     "ApiserverDiscoveryToken": "",
     "ApiserverCertificateKey": "",
     "CPHAEndpoint": "10.0.1.254",
-    "CPHAPort": "8443"
+    "CPHAPort": "6443"
 }

scripts/setup/create_multinode.sh

@@ -58,6 +58,11 @@ if [ "$#" -lt $CONTROL_PLANE_REPLICAS ]; then
     exit 1
 fi
 
+if [ "$CONTROL_PLANE_REPLICAS" != 1 ] && [ "$CONTROL_PLANE_REPLICAS" != 3 ] && [ "$CONTROL_PLANE_REPLICAS" != 5 ]; then
+    echo "Number of control plane replicas can only be 1, 3, or 5."
+    exit 1
+fi
+
 server_exec() {
     ssh -oStrictHostKeyChecking=no -p 22 "$1" "$2";
 }
@@ -157,7 +162,7 @@ function setup_workers() {
             setup_vhive_firecracker_daemon $node
         fi
 
-        if [ $2 -eq "MASTER" ]; then
+        if [ "$2" = "MASTER" ]; then
             server_exec $node "sudo ${MASTER_LOGIN_TOKEN}"
             echo "Backup master node $node has joined the cluster."
         else
@@ -170,12 +175,12 @@ function setup_workers() {
         echo "Stretching node capacity for $node."
         server_exec $node "echo \"maxPods: ${PODS_PER_NODE}\" > >(sudo tee -a /var/lib/kubelet/config.yaml >/dev/null)"
         server_exec $node "echo \"containerLogMaxSize: 512Mi\" > >(sudo tee -a /var/lib/kubelet/config.yaml >/dev/null)"
-        server_exec $node 'sudo systemctl restart kubelet'
+        server_exec $node 'sudo systemctl daemon-reload && sudo systemctl restart kubelet'
         server_exec $node 'sleep 10'
 
         # Rejoin has to be performed although errors will be thrown. Otherwise, restarting the kubelet will cause the node unreachable for some reason
 
-        if [ $2 -eq "MASTER" ]; then
+        if [ "$2" = "MASTER" ]; then
             server_exec $node "sudo ${MASTER_LOGIN_TOKEN} > /dev/null 2>&1"
             echo "Backup master node $node joined the cluster (again :P)."
         else
@@ -187,13 +192,14 @@ function setup_workers() {
     NODE_COUNTER=1
     for node in "$@"
     do
-        # Set up API Server load balancer arguments
+        # Set up API Server load balancer arguments - Less than because 1 CP is the "main" master node already
         HA_SETTING=""
-        if [ "$NODE_COUNTER" -le $CONTROL_PLANE_REPLICAS ]; then
+        if [ "$NODE_COUNTER" -lt $CONTROL_PLANE_REPLICAS ]; then
             HA_SETTING="MASTER"
         fi
 
         internal_setup "$node" $HA_SETTING &
+        let NODE_COUNTER++
     done
 
     wait
@@ -285,7 +291,7 @@ function copy_k8s_certificates() {
         namespace_info=$(server_exec $MASTER_NODE "kubectl get namespaces")
     done
 
-    echo "Master node $MASTER_NODE finalised."
+    echo "Master node $MASTER_NODE finalized."
 
     # Copy API server certificates from master to each worker node
     copy_k8s_certificates "$@"

scripts/setup/setup.cfg

@@ -1,8 +1,8 @@
-VHIVE_BRANCH='k8s_ha_mode'
-LOADER_BRANCH='ha_k8s'
+VHIVE_BRANCH='main'
+LOADER_BRANCH='main'
 CLUSTER_MODE='container' # choose from {container, firecracker, firecracker_snapshots}
 PODS_PER_NODE=240
 DEPLOY_PROMETHEUS=false
 
-# High-availability K8s control plane (default: 1, recommendation: 3 or 5)
-CONTROL_PLANE_REPLICAS=3
+# K8s control plane replicas (default: 1, for high-availability use 3 or 5)
+CONTROL_PLANE_REPLICAS=1