DevOps/truecharts
2
0
Fork 0
Code Issues Pull Requests Actions 30 Packages Projects Releases 1 Wiki Activity

fix(clustertool): Prevent empty extraargs to be added to cmd

Browse Source
This commit is contained in:
Kjeld Schouten
2024-11-11 14:18:14 +01:00
parent 8dbc67f32b
commit 5f54ea6a0f
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clustertool/pkg/gencmd/plain.go
+20 -3
View File
@@ -14,16 +14,33 @@ func GenPlain(command string, node string, extraArgs []string) []string {
commands := []string{} commands := []string{}
talosPath := embed.GetTalosExec() talosPath := embed.GetTalosExec()
log.Debug().Msg("Generating plain CMDs...")
if node == "" { if node == "" {
log.Debug().Msg("Cmd Nodes is empty, rendering cmds for all nodes...")
for _, noderef := range talassist.TalConfig.Nodes { for _, noderef := range talassist.TalConfig.Nodes {
cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress + " " + strings.Join(extraArgs, " ") log.Debug().Msgf("Rendering for node: %s", noderef)
cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress
if len(extraArgs) == 0 {
log.Debug().Msg("extraArgs is empty, not adding extra args to cmd")
} else {
log.Debug().Msgf("extraArgs not empty, adding extra args to cmd: %s", extraArgs)
cmd = cmd + " " + strings.Join(extraArgs, " ")
}
commands = append(commands, cmd) commands = append(commands, cmd)
} }
} else { } else {
cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + node + " " + strings.Join(extraArgs, " ") log.Debug().Msgf("Rendering for single node: %s", node)
cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + node
if len(extraArgs) == 0 {
log.Debug().Msg("extraArgs is empty, not adding extra args to cmd")
} else {
log.Debug().Msgf("extraArgs not empty, adding extra args to cmd: %s", extraArgs)
cmd = cmd + " " + strings.Join(extraArgs, " ")
}
commands = append(commands, cmd) commands = append(commands, cmd)
} }
log.Debug().Msgf("%s Command rendered: %s", command, commands) log.Debug().Msgf("%s Commands rendered: %s", command, commands)
return commands return commands
} }