From 579926cbf04faf5f31c1590da271706ae50fd4c3 Mon Sep 17 00:00:00 2001 From: lonelyCZ <531187475@qq.com> Date: Mon, 11 Jul 2022 09:40:10 +0800 Subject: [PATCH] karmadactl pretty-print the error and exit with an error Signed-off-by: lonelyCZ <531187475@qq.com> --- cmd/karmadactl/karmadactl.go | 9 ++++----- cmd/kubectl-karmada/kubectl-karmada.go | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/cmd/karmadactl/karmadactl.go b/cmd/karmadactl/karmadactl.go index 834ed77d6..5ffb1e75d 100644 --- a/cmd/karmadactl/karmadactl.go +++ b/cmd/karmadactl/karmadactl.go @@ -1,16 +1,15 @@ package main import ( - "os" - "k8s.io/component-base/cli" - _ "k8s.io/component-base/logs/json/register" // for JSON log format registration + "k8s.io/kubectl/pkg/cmd/util" "github.com/karmada-io/karmada/pkg/karmadactl" ) func main() { cmd := karmadactl.NewKarmadaCtlCommand("karmadactl", "karmadactl") - code := cli.Run(cmd) - os.Exit(code) + if err := cli.RunNoErrOutput(cmd); err != nil { + util.CheckErr(err) + } } diff --git a/cmd/kubectl-karmada/kubectl-karmada.go b/cmd/kubectl-karmada/kubectl-karmada.go index 834ed77d6..acdf41770 100644 --- a/cmd/kubectl-karmada/kubectl-karmada.go +++ b/cmd/kubectl-karmada/kubectl-karmada.go @@ -1,16 +1,15 @@ package main import ( - "os" - "k8s.io/component-base/cli" - _ "k8s.io/component-base/logs/json/register" // for JSON log format registration + "k8s.io/kubectl/pkg/cmd/util" "github.com/karmada-io/karmada/pkg/karmadactl" ) func main() { - cmd := karmadactl.NewKarmadaCtlCommand("karmadactl", "karmadactl") - code := cli.Run(cmd) - os.Exit(code) + cmd := karmadactl.NewKarmadaCtlCommand("karmada", "kubectl karmada") + if err := cli.RunNoErrOutput(cmd); err != nil { + util.CheckErr(err) + } }