Disabling manual kubelet startup

Signed-off-by: Lazar Cvetković <[email protected]>

Author: cvetkovic

configs/k8s_ha/check_apiserver.sh

@@ -5,7 +5,7 @@ errorExit() {
     exit 1
 }
 
-curl --silent --max-time 2 --insecure https://localhost:8443/ -o /dev/null || errorExit "Error GET https://localhost:8443/"
+curl --silent --max-time 2 --insecure https://localhost:6443/ -o /dev/null || errorExit "Error GET https://localhost:6443/"
 if ip addr | grep -q 10.0.1.254; then
-    curl --silent --max-time 2 --insecure https://10.0.1.254:8443/ -o /dev/null || errorExit "Error GET https://10.0.1.254:8443/"
+    curl --silent --max-time 2 --insecure https://10.0.1.254:6443/ -o /dev/null || errorExit "Error GET https://10.0.1.254:6443/"
 fi

configs/k8s_ha/haproxy.cfg

@@ -32,7 +32,7 @@ defaults
 # apiserver frontend which proxys to the control plane nodes
 #---------------------------------------------------------------------
 frontend apiserver
-    bind *:8443
+    bind *:6443
     mode tcp
     option tcplog
     default_backend apiserverbackend

configs/setup/kube.json

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

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": 5
+	"LogVerbosity": 0
 }

scripts/cluster/create_multinode_cluster.go

@@ -41,9 +41,9 @@ func CreateMultinodeCluster(stockContainerd string, rawHaReplicaCount string) er
 		return err
 	}
 
-	if err := CreateMasterKubeletService(); err != nil {
+	/*if err := CreateMasterKubeletService(); err != nil {
 		return err
-	}
+	}*/
 
 	if err := DeployKubernetes(haReplicaCount); err != nil {
 		return err
@@ -103,16 +103,11 @@ EOF'`
 // Deploy Kubernetes
 func DeployKubernetes(haReplicaCount int) error {
 	utils.WaitPrintf("Deploying Kubernetes(version %s)", configs.Kube.K8sVersion)
-	masterNodeIp, iperr := utils.ExecShellCmd(`ip route | awk '{print $(NF)}' | awk '/^10\..*/'`)
-	if iperr != nil {
-		return iperr
-	}
 
 	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" `, configs.System.LogVerbosity, masterNodeIp, configs.Kube.K8sVersion, configs.Kube.PodNetworkCidr)
+--pod-network-cidr="%s" `, configs.System.LogVerbosity, configs.Kube.K8sVersion, configs.Kube.PodNetworkCidr)
 
 	if haReplicaCount > 0 {
 		command += fmt.Sprintf(`\
@@ -198,17 +193,29 @@ func ExtractMasterNodeInfo() error {
 		configs.Kube.ApiserverAdvertiseAddress,
 		configs.Kube.ApiserverPort,
 		configs.Kube.ApiserverToken,
-		configs.Kube.ApiserverDiscoveryToken)
+		configs.Kube.ApiserverDiscoveryToken,
+		configs.Kube.ApiserverCertificateKey)
 	_, err = masterKeyYamlFile.WriteString(masterKeyYaml)
 	if !utils.CheckErrorWithTagAndMsg(err, "Failed to create masterKey.yaml with master node information!\n") {
 		return err
 	}
 
-	utils.SuccessPrintf("Join cluster from worker nodes as a new control plane node with command: sudo kubeadm join %s:%s --token %s --discovery-token-ca-cert-hash %s --control-plane --certificate-key %s\n",
-		configs.Kube.ApiserverAdvertiseAddress, configs.Kube.ApiserverPort, configs.Kube.ApiserverToken, configs.Kube.ApiserverDiscoveryToken, configs.Kube.ApiserverCertificateKey)
+	utils.SuccessPrintf("Join cluster from worker nodes as a new control plane node with command: "+
+		"sudo kubeadm join %s:%s --token %s --discovery-token-ca-cert-hash %s --control-plane --certificate-key %s\n",
+		configs.Kube.ApiserverAdvertiseAddress,
+		configs.Kube.ApiserverPort,
+		configs.Kube.ApiserverToken,
+		configs.Kube.ApiserverDiscoveryToken,
+		configs.Kube.ApiserverCertificateKey,
+	)
 
-	utils.SuccessPrintf("Join cluster from worker nodes with command: sudo kubeadm join %s:%s --token %s --discovery-token-ca-cert-hash %s\n",
-		configs.Kube.ApiserverAdvertiseAddress, configs.Kube.ApiserverPort, configs.Kube.ApiserverToken, configs.Kube.ApiserverDiscoveryToken)
+	utils.SuccessPrintf("Join cluster from worker nodes with command: "+
+		"sudo kubeadm join %s:%s --token %s --discovery-token-ca-cert-hash %s\n",
+		configs.Kube.ApiserverAdvertiseAddress,
+		configs.Kube.ApiserverPort,
+		configs.Kube.ApiserverToken,
+		configs.Kube.ApiserverDiscoveryToken,
+	)
 
 	return nil
 }

scripts/utils/system.go

@@ -253,7 +253,7 @@ func PrepareEnvironment() error {
 func CleanEnvironment() error {
 	// Define task List
 	cleanTaskList := []func() error{
-		CleanUpTmpDir,
+		//CleanUpTmpDir,
 	}
 	// Execute task
 	for _, task := range cleanTaskList {