diff --git a/components/cli/pkg/kubectl/apply.go b/components/cli/pkg/kubectl/apply.go index 5952b331..9d56feba 100644 --- a/components/cli/pkg/kubectl/apply.go +++ b/components/cli/pkg/kubectl/apply.go @@ -33,6 +33,7 @@ func ApplyFileWithNamespace(file, namespace string) error { file, "-n", namespace, ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } diff --git a/components/cli/pkg/kubectl/create.go b/components/cli/pkg/kubectl/create.go index 38e3503f..42d115d1 100644 --- a/components/cli/pkg/kubectl/create.go +++ b/components/cli/pkg/kubectl/create.go @@ -44,6 +44,7 @@ func CreateFile(file string) error { "-f", file, ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } @@ -58,6 +59,7 @@ func CreateConfigMapWithNamespace(name, confFile, namespace string) error { confFile, "-n", namespace, ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } @@ -86,6 +88,7 @@ func CreateClusterRoleBinding(clusterRole, user string) error { "--user", user, ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } diff --git a/components/cli/pkg/kubectl/delete.go b/components/cli/pkg/kubectl/delete.go index 7b26e93b..6b644590 100644 --- a/components/cli/pkg/kubectl/delete.go +++ b/components/cli/pkg/kubectl/delete.go @@ -34,6 +34,7 @@ func DeleteFileWithNamespace(file, namespace string) error { "--ignore-not-found", "-n", namespace, ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } @@ -46,6 +47,7 @@ func DeleteFile(file string) error { file, "--ignore-not-found", ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } diff --git a/components/cli/pkg/kubectl/describe.go b/components/cli/pkg/kubectl/describe.go index e1bea4c1..bf661cb4 100644 --- a/components/cli/pkg/kubectl/describe.go +++ b/components/cli/pkg/kubectl/describe.go @@ -20,8 +20,6 @@ package kubectl import ( - "bufio" - "fmt" "os/exec" "github.com/cellery-io/sdk/components/cli/pkg/constants" @@ -35,27 +33,6 @@ func Describe(cellName string) error { cellName, ) displayVerboseOutput(cmd) - stdoutReader, _ := cmd.StdoutPipe() - stdoutScanner := bufio.NewScanner(stdoutReader) - go func() { - for stdoutScanner.Scan() { - fmt.Println(stdoutScanner.Text()) - } - }() - stderrReader, _ := cmd.StderrPipe() - stderrScanner := bufio.NewScanner(stderrReader) - go func() { - for stderrScanner.Scan() { - fmt.Println(stderrScanner.Text()) - } - }() - err := cmd.Start() - if err != nil { - return err - } - err = cmd.Wait() - if err != nil { - return err - } - return nil + _, err := printCommandOutput(cmd) + return err } diff --git a/components/cli/pkg/kubectl/get.go b/components/cli/pkg/kubectl/get.go index d6073456..3faf24bf 100644 --- a/components/cli/pkg/kubectl/get.go +++ b/components/cli/pkg/kubectl/get.go @@ -38,6 +38,7 @@ func GetDeploymentNames(namespace string) ([]string, error) { "-n", namespace, ) out, err := cmd.Output() + displayVerboseOutput(cmd) if err != nil { return nil, err } @@ -45,8 +46,15 @@ func GetDeploymentNames(namespace string) ([]string, error) { } func GetMasterNodeName() (string, error) { - cmd := exec.Command(constants.KUBECTL, "get", "node", "--selector", "node-role.kubernetes.io/master", - "-o", "json") + cmd := exec.Command(constants.KUBECTL, + "get", + "node", + "--selector", + "node-role.kubernetes.io/master", + "-o", + "json", + ) + displayVerboseOutput(cmd) out, err := cmd.Output() if err != nil { return "", err @@ -70,6 +78,7 @@ func GetNodes() (Node, error) { "-o", "json", ) + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr out, err := cmd.Output() jsonOutput := Node{} diff --git a/components/cli/pkg/kubectl/label.go b/components/cli/pkg/kubectl/label.go index b17bcac3..5d9140c7 100644 --- a/components/cli/pkg/kubectl/label.go +++ b/components/cli/pkg/kubectl/label.go @@ -45,7 +45,7 @@ func ApplyLable(itemType, itemName, labelName string, overWrite bool) error { labelName, ) } - + displayVerboseOutput(cmd) cmd.Stderr = os.Stderr return cmd.Run() } diff --git a/components/cli/pkg/kubectl/wait.go b/components/cli/pkg/kubectl/wait.go index 9c1e623a..e9eb8a77 100644 --- a/components/cli/pkg/kubectl/wait.go +++ b/components/cli/pkg/kubectl/wait.go @@ -47,7 +47,12 @@ func WaitForCondition(condition string, timeoutSeconds int, resourceName string, func WaitForCluster(timeout time.Duration) error { exitCode := 0 for start := time.Now(); time.Since(start) < timeout; { - cmd := exec.Command(constants.KUBECTL, "get", "nodes", "--request-timeout=10s") + cmd := exec.Command(constants.KUBECTL, + "get", + "nodes", + "--request-timeout=10s", + ) + displayVerboseOutput(cmd) err := cmd.Run() if err != nil { if exitError, ok := err.(*exec.ExitError); ok {