feat(clustertool): introduce tracing of command-slice and dont proces…

…s extraArgs for now
truecharts · Nov 7, 2024 · 7c3ecc5 · 7c3ecc5
1 parent d903946
commit 7c3ecc5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/clustertool/pkg/gencmd/apply.go b/clustertool/pkg/gencmd/apply.go
@@ -3,7 +3,6 @@ package gencmd
 import (
     "os"
     "path/filepath"
-    "strings"
 
     "github.com/rs/zerolog/log"
     "github.com/truecharts/public/clustertool/embed"
@@ -14,15 +13,13 @@ import (
 func GenApply(node string, extraArgs []string) []string {
 
     commands := []string{}
-    //extraFlags = append(extraFlags, "--preserve")
 
     talosPath := embed.GetTalosExec()
     if node == "" {
 
         for _, noderef := range talassist.TalConfig.Nodes {
-            // TODO add extraFlags
             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-config" + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress + " -f " + filepath.Join(helper.TalosGenerated, filename) // + " " + strings.Join(extraArgs, " ")
             commands = append(commands, cmd)
         }
     } else {
@@ -38,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-config" + " --talosconfig " + helper.TalosConfigFile + " -n " + node + " -f " + filepath.Join(helper.TalosGenerated, filename) // + " " + strings.Join(extraArgs, " ")
         commands = append(commands, cmd)
     }
     log.Debug().Msgf("Apply Commands rendered: %s", commands)

diff --git a/clustertool/pkg/gencmd/plain.go b/clustertool/pkg/gencmd/plain.go
@@ -1,8 +1,6 @@
 package gencmd
 
 import (
-    "strings"
-
     "github.com/rs/zerolog/log"
     "github.com/truecharts/public/clustertool/embed"
     "github.com/truecharts/public/clustertool/pkg/helper"
@@ -17,12 +15,11 @@ func GenPlain(command string, node string, extraArgs []string) []string {
     if node == "" {
 
         for _, noderef := range talassist.TalConfig.Nodes {
-            // TODO add extraFlags
-            cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress + " " + strings.Join(extraArgs, " ")
+            cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress // + " " + strings.Join(extraArgs, " ")
             commands = append(commands, cmd)
         }
     } else {
-        cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + node + " " + strings.Join(extraArgs, " ")
+        cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + node // + " " + strings.Join(extraArgs, " ")
         commands = append(commands, cmd)
     }
     log.Debug().Msgf("%s Command rendered: %s", command, commands)

diff --git a/clustertool/pkg/helper/runcmd.go b/clustertool/pkg/helper/runcmd.go
@@ -6,6 +6,8 @@ import (
     "os"
     "os/exec"
     "strings"
+
+    "github.com/rs/zerolog/log"
 )
 
 type filteredWriter struct {
@@ -33,6 +35,10 @@ func (fw *filteredWriter) Write(p []byte) (n int, err error) {
 
 func RunCommand(commandSlice []string, silent bool) (string, error) {
     filters := []string{"certificate signed by unknown authority", "bootstrap is not available yet"}
+    log.Trace().Msg("Command slice structure:")
+    for i, s := range commandSlice {
+        log.Trace().Msgf("Index: %d, Value: %s\n", i, s)
+    }
     cmd := exec.Command(commandSlice[0], commandSlice[1:]...)
 
     var stdoutBuf, stderrBuf bytes.Buffer