github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: allow specifying kubelet-args when adding a new node to the cluster

Browse Source 
Kubelet arguments are useful for specifying settings such as supported sysctl fields.
This commit is contained in:
Jose Diaz-Gonzalez
2025-11-16 23:53:02 -05:00
parent f38d8cfadb
commit f33d3d852f
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/scheduler-k3s/src/subcommands/subcommands.go
View File

@@ -59,10 +59,11 @@ func main() {
allowUknownHosts := args.Bool("insecure-allow-unknown-hosts", false, "insecure-allow-unknown-hosts: allow unknown hosts") allowUknownHosts := args.Bool("insecure-allow-unknown-hosts", false, "insecure-allow-unknown-hosts: allow unknown hosts")
taintScheduling := args.Bool("taint-scheduling", false, "taint-scheduling: add a taint against scheduling app workloads") taintScheduling := args.Bool("taint-scheduling", false, "taint-scheduling: add a taint against scheduling app workloads")
serverIP := args.String("server-ip", "", "server-ip: IP address of the dokku server node") serverIP := args.String("server-ip", "", "server-ip: IP address of the dokku server node")
kubeletArgs := args.StringToString("kubelet-args", map[string]string{}, "kubelet-args: a key=value map of kubelet arguments")
role := args.String("role", "worker", "role: [ server | worker ]") role := args.String("role", "worker", "role: [ server | worker ]")
args.Parse(os.Args[2:]) args.Parse(os.Args[2:])
remoteHost := args.Arg(0) remoteHost := args.Arg(0)
err = scheduler_k3s.CommandClusterAdd(*role, remoteHost, *serverIP, *allowUknownHosts, *taintScheduling) err = scheduler_k3s.CommandClusterAdd(*role, remoteHost, *serverIP, *allowUknownHosts, *taintScheduling, *kubeletArgs)
case "cluster-list": case "cluster-list":
args := flag.NewFlagSet("scheduler-k3s:cluster-list", flag.ExitOnError) args := flag.NewFlagSet("scheduler-k3s:cluster-list", flag.ExitOnError)
format := args.String("format", "stdout", "format: [ stdout | json ]") format := args.String("format", "stdout", "format: [ stdout | json ]")

6
plugins/scheduler-k3s/subcommands.go
View File

@@ -400,7 +400,7 @@ func CommandInitialize(ingressClass string, serverIP string, taintScheduling boo
} }
// CommandClusterAdd adds a server to the k3s cluster // CommandClusterAdd adds a server to the k3s cluster
func CommandClusterAdd(role string, remoteHost string, serverIP string, allowUknownHosts bool, taintScheduling bool) error { func CommandClusterAdd(role string, remoteHost string, serverIP string, allowUknownHosts bool, taintScheduling bool, kubeletArgs map[string]string) error {
if err := isK3sInstalled(); err != nil { if err := isK3sInstalled(); err != nil {
return fmt.Errorf("k3s not installed, cannot add node to cluster: %w", err) return fmt.Errorf("k3s not installed, cannot add node to cluster: %w", err)
} }
@@ -665,6 +665,10 @@ export INSTALL_K3S_VERSION=%s
args = append(args, "--node-taint", "CriticalAddonsOnly=true:NoSchedule") args = append(args, "--node-taint", "CriticalAddonsOnly=true:NoSchedule")
} }
for key, value := range kubeletArgs {
args = append(args, "--kubelet-arg", fmt.Sprintf("%s=%s", key, value))
}
common.LogInfo2Quiet(fmt.Sprintf("Adding %s k3s cluster", nodeName)) common.LogInfo2Quiet(fmt.Sprintf("Adding %s k3s cluster", nodeName))
joinCmd, err := common.CallSshCommand(common.SshCommandInput{ joinCmd, err := common.CallSshCommand(common.SshCommandInput{
Command: "/tmp/k3s-installer-executor.sh", Command: "/tmp/k3s-installer-executor.sh",