Development support deploying k8s workers on multiple nodes

grid-cli/cmd/deploy_kubernetes.go

@@ -94,7 +94,7 @@ var deployKubernetesCmd = &cobra.Command{
 			return err
 		}
 
-		workersNode, err := cmd.Flags().GetUint32("workers-node")
+		workersNode, err := cmd.Flags().GetUintSlice("workers-node")
 		if err != nil {
 			return err
 		}
@@ -169,7 +169,6 @@ var deployKubernetesCmd = &cobra.Command{
 			filter, disks, rootfss := filters.BuildK8sFilter(
 				master,
 				masterFarm,
-				1,
 			)
 			nodes, err := deployer.FilterNodes(
 				cmd.Context(),
@@ -186,12 +185,10 @@ var deployKubernetesCmd = &cobra.Command{
 			masterNode = uint32(nodes[0].NodeID)
 		}
 		master.Node = masterNode
-		if workersNode == 0 && len(workers) > 0 {
-
+		if len(workersNode) < workerNumber && workerNumber > 0 {
 			filter, disks, rootfss := filters.BuildK8sFilter(
 				workers[0],
 				workersFarm,
-				uint(len(workers)),
 			)
 			workersNodes, err := deployer.FilterNodes(
 				cmd.Context(),
@@ -200,19 +197,18 @@ var deployKubernetesCmd = &cobra.Command{
 				disks,
 				nil,
 				rootfss,
-				uint64(len(workers)),
+				uint64(workerNumber-len(workersNode)),
 			)
 			if err != nil {
 				log.Fatal().Err(err).Send()
 			}
-			for i, node := range workersNodes {
-				workers[i].Node = uint32(node.NodeID)
-			}
-		} else {
-			for i := 0; i < workerNumber; i++ {
-				workers[i].Node = workersNode
+			for i := 0; i < len(workersNodes); i++ {
+				workersNode = append(workersNode, uint(workersNodes[i].NodeID))
 			}
 		}
+		for i := 0; i < workerNumber; i++ {
+			workers[i].Node = uint32(workersNode[i])
+		}
 		cluster, err := command.DeployKubernetesCluster(cmd.Context(), t, master, workers, string(sshKey))
 		if err != nil {
 			log.Fatal().Err(err).Send()
@@ -283,7 +279,7 @@ func init() {
 	deployKubernetesCmd.Flags().Int("workers-cpu", 1, "workers number of cpu units")
 	deployKubernetesCmd.Flags().Int("workers-memory", 1, "workers memory size in gb")
 	deployKubernetesCmd.Flags().Int("workers-disk", 2, "workers disk size in gb")
-	deployKubernetesCmd.Flags().Uint32("workers-node", 0, "node id workers should be deployed on")
+	deployKubernetesCmd.Flags().UintSlice("workers-node", []uint{0}, "node id workers should be deployed on")
 	deployKubernetesCmd.Flags().Uint64("workers-farm", 1, "farm id workers should be deployed on")
 	deployKubernetesCmd.MarkFlagsMutuallyExclusive("workers-node", "workers-farm")
 	deployKubernetesCmd.Flags().Bool("workers-ipv4", false, "assign public ipv4 for workers")

grid-cli/internal/filters/filters.go

@@ -7,21 +7,17 @@ import (
 )
 
 // BuildK8sFilter build a filter for a k8s node
-func BuildK8sFilter(k8sNode workloads.K8sNode, farmID uint64, k8sNodesNum uint) (types.NodeFilter, []uint64, []uint64) {
-	freeMRUs := uint64(k8sNode.Memory*int(k8sNodesNum)) / 1024
-	freeSRUs := uint64(k8sNode.DiskSize * int(k8sNodesNum))
+func BuildK8sFilter(k8sNode workloads.K8sNode, farmID uint64) (types.NodeFilter, []uint64, []uint64) {
+	freeMRUs := uint64(k8sNode.Memory) / 1024
+	freeSRUs := uint64(k8sNode.DiskSize)
 	freeIPs := uint64(0)
-	if k8sNode.PublicIP {
-		freeIPs = uint64(k8sNodesNum)
-	}
 
-	disks := make([]uint64, k8sNodesNum)
-	rootfss := make([]uint64, k8sNodesNum)
-	for i := 0; i < int(k8sNodesNum); i++ {
-		disks = append(disks, *convertGBToBytes(uint64(k8sNode.DiskSize)))
-		// k8s rootfs is either 2 or 0.5
-		rootfss = append(rootfss, *convertGBToBytes(uint64(2)))
+	if k8sNode.PublicIP {
+		freeIPs = uint64(1)
 	}
+	disks := []uint64{*convertGBToBytes(uint64(k8sNode.DiskSize))}
+	// k8s rootfs is either 2 or 0.5
+	rootfss := []uint64{*convertGBToBytes(uint64(2))}
 
 	return buildGenericFilter(&freeMRUs, &freeSRUs, nil, &freeIPs, []uint64{farmID}, nil), disks, rootfss
 }