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

fix(clustertool): correct machineconfig apply command

Browse Source
This commit is contained in:
Kjeld Schouten
2024-11-07 11:27:46 +01:00
parent 7c3ecc54a4
commit c70e1b4698
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
clustertool/cmd/adv_testcmd.go
+1 -4
View File
@@ -3,9 +3,7 @@ package cmd
import (
"strings"
"github.com/rs/zerolog/log"
"github.com/spf13/cobra"
"github.com/truecharts/public/clustertool/pkg/gencmd"
"github.com/truecharts/public/clustertool/pkg/initfiles"
"github.com/truecharts/public/clustertool/pkg/talassist"
)
@@ -25,8 +23,7 @@ var testcmd = &cobra.Command{
// if err != nil {
// log.Info().Msg("Error:", err)
// }
cmds := gencmd.GenApply("", []string{})
log.Info().Msgf("%s", cmds[0])
RunApply(false, "", []string{})
},
}
clustertool/pkg/gencmd/apply.go
+2 -2
View File
@@ -19,7 +19,7 @@ func GenApply(node string, extraArgs []string) []string {
for _, noderef := range talassist.TalConfig.Nodes {
filename := talassist.TalConfig.ClusterName + "-" + noderef.Hostname + ".yaml"
cmd := talosPath + " " + "apply-config" + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress + " -f " + filepath.Join(helper.TalosGenerated, filename) // + " " + strings.Join(extraArgs, " ")
cmd := talosPath + " " + "apply machineconfig" + " -f " + filepath.Join(helper.TalosGenerated, filename) + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress // + " " + strings.Join(extraArgs, " ")
commands = append(commands, cmd)
}
} else {
@@ -35,7 +35,7 @@ func GenApply(node string, extraArgs []string) []string {
}
filename := talassist.TalConfig.ClusterName + "-" + nodename + ".yaml"
cmd := talosPath + " " + "apply-config" + " --talosconfig " + helper.TalosConfigFile + " -n " + node + " -f " + filepath.Join(helper.TalosGenerated, filename) // + " " + strings.Join(extraArgs, " ")
cmd := talosPath + " " + "apply machineconfig" + " -f " + filepath.Join(helper.TalosGenerated, filename) + " --talosconfig " + helper.TalosConfigFile + " -n " + node // + " " + strings.Join(extraArgs, " ")
commands = append(commands, cmd)
}
log.Debug().Msgf("Apply Commands rendered: %s", commands)
clustertool/pkg/gencmd/execcmd.go
+1 -1
View File
@@ -12,7 +12,7 @@ import (
func ExecCmd(cmd string) {
argslice := strings.Split(cmd, " ")
// log.Info().Msgf("Running: %s\n", argslice[0:])
log.Trace().Msgf("command", argslice[:])
// log.Info().Msg("test", strings.Join(argslice, " "))
out, err := helper.RunCommand(argslice, false)