From b22da790eaa08aebac20d9fd80a210c54fd54a4f Mon Sep 17 00:00:00 2001 From: guoyao <1015105054@qq.com> Date: Mon, 8 Nov 2021 17:03:05 +0800 Subject: [PATCH] cleanup some codes Signed-off-by: guoyao <1015105054@qq.com> --- cmd/controller-manager/app/controllermanager.go | 3 +-- hack/local-up-karmada.sh | 2 +- pkg/karmadactl/cordon.go | 2 +- pkg/karmadactl/get_flags.go | 1 - pkg/scheduler/scheduler.go | 1 + pkg/util/worker.go | 5 ++--- 6 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cmd/controller-manager/app/controllermanager.go b/cmd/controller-manager/app/controllermanager.go index fbe132a4e..800e4ddd2 100644 --- a/cmd/controller-manager/app/controllermanager.go +++ b/cmd/controller-manager/app/controllermanager.go @@ -7,6 +7,7 @@ import ( "os" "github.com/spf13/cobra" + utilerrors "k8s.io/apimachinery/pkg/util/errors" "k8s.io/client-go/discovery" "k8s.io/client-go/dynamic" kubeclientset "k8s.io/client-go/kubernetes" @@ -37,8 +38,6 @@ import ( "github.com/karmada-io/karmada/pkg/util/overridemanager" "github.com/karmada-io/karmada/pkg/version" "github.com/karmada-io/karmada/pkg/version/sharedcommand" - - utilerrors "k8s.io/apimachinery/pkg/util/errors" ) // NewControllerManagerCommand creates a *cobra.Command object with default parameters diff --git a/hack/local-up-karmada.sh b/hack/local-up-karmada.sh index 257a526db..f164260bd 100755 --- a/hack/local-up-karmada.sh +++ b/hack/local-up-karmada.sh @@ -149,7 +149,7 @@ function print_success() { echo "Please use 'kubectl config use-context karmada-host/karmada-apiserver' to switch the host and control plane cluster." echo -e "\nTo manage your member clusters, run:" echo -e " export KUBECONFIG=${MEMBER_CLUSTER_KUBECONFIG}" - echo "Please use 'kubectl config use-context member1/member2/member3' to switch to the different member cluster." + echo "Please use 'kubectl config use-context member1/member2/member3' to switch to the different member cluster." } print_success diff --git a/pkg/karmadactl/cordon.go b/pkg/karmadactl/cordon.go index dedbdeab8..b59286777 100644 --- a/pkg/karmadactl/cordon.go +++ b/pkg/karmadactl/cordon.go @@ -65,7 +65,7 @@ func NewCmdCordon(cmdOut io.Writer, karmadaConfig KarmadaConfig, cmdStr string) return cmd } -// NewCmdUncordon defines the `cordon` command that mark cluster as schedulable. +// NewCmdUncordon defines the `uncordon` command that mark cluster as schedulable. func NewCmdUncordon(cmdOut io.Writer, karmadaConfig KarmadaConfig, cmdStr string) *cobra.Command { opts := CommandCordonOption{} cmd := &cobra.Command{ diff --git a/pkg/karmadactl/get_flags.go b/pkg/karmadactl/get_flags.go index b6742b454..369d6df3e 100644 --- a/pkg/karmadactl/get_flags.go +++ b/pkg/karmadactl/get_flags.go @@ -15,7 +15,6 @@ import ( "time" "github.com/spf13/pflag" - "k8s.io/apimachinery/pkg/api/meta" "k8s.io/client-go/discovery" diskcached "k8s.io/client-go/discovery/cached/disk" diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 9e14234bf..7425a4d6c 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -902,6 +902,7 @@ func (s *Scheduler) establishEstimatorConnections() { clusterList, err := s.KarmadaClient.ClusterV1alpha1().Clusters().List(context.TODO(), metav1.ListOptions{}) if err != nil { klog.Errorf("Cannot list all clusters when establish all cluster estimator connections: %v", err) + return } for i := range clusterList.Items { if err = estimatorclient.EstablishConnection(clusterList.Items[i].Name, s.schedulerEstimatorCache, s.schedulerEstimatorPort); err != nil { diff --git a/pkg/util/worker.go b/pkg/util/worker.go index be1c4deb3..89cc1b2d3 100644 --- a/pkg/util/worker.go +++ b/pkg/util/worker.go @@ -1,11 +1,10 @@ package util import ( - "k8s.io/client-go/util/workqueue" - "k8s.io/klog/v2" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/util/workqueue" + "k8s.io/klog/v2" ) const (