Skip to content

Commit

Permalink
Merge pull request #1132 from threefoldtech/development-support-deplo…
Browse files Browse the repository at this point in the history
…ying-k8s-cluster-on-multible-nodes

deploy k8s workers on multible nodes
  • Loading branch information
Eslam-Nawara authored Jul 29, 2024
2 parents 35c3c20 + 2dfefb9 commit 835e3e4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
13 changes: 8 additions & 5 deletions grid-cli/cmd/deploy_kubernetes.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,18 @@ var deployKubernetesCmd = &cobra.Command{
disks,
nil,
rootfss,
uint64(len(workers)),
)
if err != nil {
log.Fatal().Err(err).Send()
}
workersNode = uint32(workersNodes[0].NodeID)
}
for i := 0; i < workerNumber; i++ {
workers[i].Node = workersNode
for i, node := range workersNodes {
workers[i].Node = uint32(node.NodeID)
}
} else {
for i := 0; i < workerNumber; i++ {
workers[i].Node = workersNode
}
}
cluster, err := command.DeployKubernetesCluster(cmd.Context(), t, master, workers, string(sshKey))
if err != nil {
Expand Down Expand Up @@ -291,5 +295,4 @@ func init() {
deployKubernetesCmd.Flags().Bool("ipv6", false, "assign public ipv6 for master")
deployKubernetesCmd.Flags().Bool("ygg", true, "assign yggdrasil ip for master")
deployKubernetesCmd.Flags().Bool("mycelium", true, "assign mycelium ip for master")

}
8 changes: 6 additions & 2 deletions grid-cli/internal/cmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"context"
"fmt"
"net"
"slices"

"github.com/pkg/errors"
"github.com/rs/zerolog/log"
Expand Down Expand Up @@ -57,9 +58,12 @@ func DeployKubernetesCluster(ctx context.Context, t deployer.TFPluginClient, mas
networkName := fmt.Sprintf("%snetwork", master.Name)
projectName := fmt.Sprintf("kubernetes/%s", master.Name)
networkNodes := []uint32{master.Node}
if len(workers) > 0 && workers[0].Node != master.Node {
networkNodes = append(networkNodes, workers[0].Node)
for _, worker := range workers {
if !slices.Contains(networkNodes, worker.Node) {
networkNodes = append(networkNodes, worker.Node)
}
}

network, err := buildNetwork(networkName, projectName, networkNodes, len(master.MyceliumIPSeed) != 0)
if err != nil {
return workloads.K8sCluster{}, err
Expand Down

0 comments on commit 835e3e4

Please sign in to comment.