Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development support deploying k8s workers on multiple nodes #1136

Merged
merged 20 commits into from
Aug 1, 2024
Merged

Development support deploying k8s workers on multiple nodes #1136

Changes from 4 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
b9d2275
feat: add feature to allow user to add multiple nodes to deploy workers
Nabil-Salah Jul 29, 2024
a83df54
feat: add feature to allow user to add multiple nodes to deploy workers
Nabil-Salah Jul 29, 2024
4d3254a
fix: using int slice parser
Nabil-Salah Jul 30, 2024
ba94e3f
fix: using int slice parser
Nabil-Salah Jul 30, 2024
392c9e3
fix: assign unassigned workers only
Nabil-Salah Jul 30, 2024
b682830
fix: assign unassigned workers only
Nabil-Salah Jul 30, 2024
e6d571d
fix: code refactor
Nabil-Salah Jul 30, 2024
80ee888
fix: code refactor
Nabil-Salah Jul 30, 2024
4ae5668
fix: assign remaining workers to one node
Nabil-Salah Jul 31, 2024
621807a
fix: assign unassigned worker to one node
Nabil-Salah Jul 31, 2024
f48a222
fix: assign unassigned worker to one node
Nabil-Salah Jul 31, 2024
1e3a698
fix: assign unassigned worker to one node
Nabil-Salah Jul 31, 2024
372a5e9
fix: building filter to be on one node
Nabil-Salah Jul 31, 2024
834e204
fix: renaming and initial value
Nabil-Salah Aug 1, 2024
aa6041c
fix: renaming and initial value
Nabil-Salah Aug 1, 2024
8814423
update: kubernetes docs and removed unreached condition
Nabil-Salah Aug 1, 2024
c3bd4e1
update: used range loops
Nabil-Salah Aug 1, 2024
778c463
update: used range loops
Nabil-Salah Aug 1, 2024
00fdba8
fix: wallet connector broken link in tfcmd readme
Nabil-Salah Aug 1, 2024
ddd1c77
fix: skipping extra given nodes
Nabil-Salah Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions grid-cli/cmd/deploy_kubernetes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ var deployKubernetesCmd = &cobra.Command{
return err
}

workersNode, err := cmd.Flags().GetUint32("workers-node")
Nabil-Salah marked this conversation as resolved.
Show resolved Hide resolved
workersNode, err := cmd.Flags().GetUintSlice("workers-node")
if err != nil {
return err
}
Expand Down Expand Up @@ -186,7 +186,7 @@ var deployKubernetesCmd = &cobra.Command{
masterNode = uint32(nodes[0].NodeID)
}
master.Node = masterNode
if workersNode == 0 && len(workers) > 0 {
if len(workersNode) < len(workers) {

filter, disks, rootfss := filters.BuildK8sFilter(
Nabil-Salah marked this conversation as resolved.
Show resolved Hide resolved
workers[0],
Nabil-Salah marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -210,7 +210,7 @@ var deployKubernetesCmd = &cobra.Command{
}
} else {
for i := 0; i < workerNumber; i++ {
workers[i].Node = workersNode
workers[i].Node = uint32(workersNode[i%len(workersNode)])
Nabil-Salah marked this conversation as resolved.
Show resolved Hide resolved
}
}
cluster, err := command.DeployKubernetesCluster(cmd.Context(), t, master, workers, string(sshKey))
Expand Down Expand Up @@ -283,7 +283,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")
Nabil-Salah marked this conversation as resolved.
Show resolved Hide resolved
deployKubernetesCmd.Flags().UintSlice("workers-node", make([]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")
Expand Down
Loading