karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #907 from lonelyCZ/remove-cordon-log 

Remove klog from karmadactl cordon
This commit is contained in:
karmada-bot 2021-11-03 11:10:28 +08:00 committed by GitHub
parent a53f673599 bc0250aa1c
commit a6fd93fd23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/karmadactl/cordon.go
View File

@ -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
}