From bc0250aa1c45f42a72071b293fa7e9bd2fd7732c Mon Sep 17 00:00:00 2001 From: lonelyCZ <531187475@qq.com> Date: Tue, 2 Nov 2021 22:29:49 +0800 Subject: [PATCH] Remove klog from karmadactl cordon Signed-off-by: lonelyCZ <531187475@qq.com> --- pkg/karmadactl/cordon.go | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkg/karmadactl/cordon.go b/pkg/karmadactl/cordon.go index a82755699..342ce3e7b 100644 --- a/pkg/karmadactl/cordon.go +++ b/pkg/karmadactl/cordon.go @@ -13,7 +13,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/strategicpatch" - "k8s.io/klog/v2" clusterv1alpha1 "github.com/karmada-io/karmada/pkg/apis/cluster/v1alpha1" karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned" @@ -225,37 +224,34 @@ func RunCordonOrUncordon(_ io.Writer, desired int, karmadaConfig KarmadaConfig, // Get control plane kube-apiserver client controlPlaneRestConfig, err := karmadaConfig.GetRestConfig(opts.KarmadaContext, opts.KubeConfig) if err != nil { - klog.Errorf("Failed to get control plane rest config. context: %s, kube-config: %s, error: %v", + return fmt.Errorf("failed to get control plane rest config. context: %s, kube-config: %s, error: %v", opts.KarmadaContext, opts.KubeConfig, err) - return err } controlPlaneKarmadaClient := karmadaclientset.NewForConfigOrDie(controlPlaneRestConfig) cluster, err := controlPlaneKarmadaClient.ClusterV1alpha1().Clusters().Get(context.TODO(), opts.ClusterName, metav1.GetOptions{}) if err != nil { - klog.Errorf("Failed to %s cluster. error: %v", cordonOrUncordon, err) + return err } cordonHelper := NewCordonHelper(cluster) if !cordonHelper.UpdateIfRequired(desired) { - klog.Infof("%s cluster %s", cluster.Name, alreadyStr(desired)) + fmt.Printf("%s cluster %s\n", cluster.Name, alreadyStr(desired)) return nil } if !opts.DryRun { err, patchErr := cordonHelper.PatchOrReplace(controlPlaneKarmadaClient) if patchErr != nil { - klog.Errorf("Failed to %s cluster. error: %v", cordonOrUncordon, patchErr) return patchErr } if err != nil { - klog.Errorf("Failed to %s cluster. error: %v", cordonOrUncordon, err) return err } } - klog.Infof("%s cluster %sed", cluster.Name, cordonOrUncordon) + fmt.Printf("%s cluster %sed\n", cluster.Name, cordonOrUncordon) return nil }