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 #940 from lonelyCZ/remove-klog-error 

Clean klog errorf in karmadactl
This commit is contained in:
karmada-bot 2021-11-22 10:34:10 +08:00 committed by GitHub
parent 8d80b5971d 529c907d93
commit 42882cd8a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubectl-karmada/kubectl-karmada.go
View File

@ -1,7 +1,6 @@
package main package main
import ( import (
"fmt"
"os" "os"
"k8s.io/component-base/logs" "k8s.io/component-base/logs"
@ -14,7 +13,6 @@ func main() {
defer logs.FlushLogs() defer logs.FlushLogs()
if err := karmadactl.NewKarmadaCtlCommand(os.Stdout, "karmada", "kubectl karmada").Execute(); err != nil { if err := karmadactl.NewKarmadaCtlCommand(os.Stdout, "karmada", "kubectl karmada").Execute(); err != nil {
fmt.Fprintf(os.Stderr, "%v\n", err)
os.Exit(1) os.Exit(1)
} }
} }

6
pkg/karmadactl/get.go
View File

@ -219,7 +219,7 @@ func (g *CommandGetOptions) Run(karmadaConfig KarmadaConfig, cmd *cobra.Command,
} }
if err := g.getSecretTokenInKarmada(karmadaclient, g.Clusters[idx], clusterInfos); err != nil { if err := g.getSecretTokenInKarmada(karmadaclient, g.Clusters[idx], clusterInfos); err != nil {
return fmt.Errorf("Method getSecretTokenInKarmada get Secret info in karmada failed, err is: %w", err) return fmt.Errorf("method getSecretTokenInKarmada get Secret info in karmada failed, err is: %w", err)
} }
f := getFactory(g.Clusters[idx], clusterInfos) f := getFactory(g.Clusters[idx], clusterInfos)
go g.getObjInfo(&wg, &mux, f, g.Clusters[idx], &objs, &allErrs, args) go g.getObjInfo(&wg, &mux, f, g.Clusters[idx], &objs, &allErrs, args)
@ -402,11 +402,11 @@ type ClusterInfo struct {
func clusterInfoInit(g *CommandGetOptions, karmadaConfig KarmadaConfig, clusterInfos map[string]*ClusterInfo) (*rest.Config, error) { func clusterInfoInit(g *CommandGetOptions, karmadaConfig KarmadaConfig, clusterInfos map[string]*ClusterInfo) (*rest.Config, error) {
karmadaclient, err := karmadaConfig.GetRestConfig(g.KarmadaContext, g.KubeConfig) karmadaclient, err := karmadaConfig.GetRestConfig(g.KarmadaContext, g.KubeConfig)
if err != nil { if err != nil {
return nil, fmt.Errorf("Func GetRestConfig get karmada client failed, err is: %w", err) return nil, fmt.Errorf("func GetRestConfig get karmada client failed, err is: %w", err)
} }
if err := getClusterInKarmada(karmadaclient, clusterInfos); err != nil { if err := getClusterInKarmada(karmadaclient, clusterInfos); err != nil {
return nil, fmt.Errorf("Method getClusterInKarmada get cluster info in karmada failed, err is: %w", err) return nil, fmt.Errorf("method getClusterInKarmada get cluster info in karmada failed, err is: %w", err)
} }
if err := getRBInKarmada(g.Namespace, karmadaclient); err != nil { if err := getRBInKarmada(g.Namespace, karmadaclient); err != nil {

54
pkg/karmadactl/join.go
View File

@ -144,16 +144,14 @@ func RunJoin(cmdOut io.Writer, karmadaConfig KarmadaConfig, opts CommandJoinOpti
// Get control plane karmada-apiserver client // Get control plane karmada-apiserver client
controlPlaneRestConfig, err := karmadaConfig.GetRestConfig(opts.KarmadaContext, opts.KubeConfig) controlPlaneRestConfig, err := karmadaConfig.GetRestConfig(opts.KarmadaContext, opts.KubeConfig)
if err != nil { 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) opts.KarmadaContext, opts.KubeConfig, err)
return err
} }
// Get cluster config // Get cluster config
clusterConfig, err := karmadaConfig.GetRestConfig(opts.ClusterContext, opts.ClusterKubeConfig) clusterConfig, err := karmadaConfig.GetRestConfig(opts.ClusterContext, opts.ClusterKubeConfig)
if err != nil { if err != nil {
klog.V(1).Infof("failed to get joining cluster config. error: %v", err) return fmt.Errorf("failed to get joining cluster config. error: %v", err)
return err
} }
return JoinCluster(controlPlaneRestConfig, clusterConfig, opts) return JoinCluster(controlPlaneRestConfig, clusterConfig, opts)
@ -193,8 +191,7 @@ func JoinCluster(controlPlaneRestConfig, clusterConfig *rest.Config, opts Comman
} }
secret, err = util.CreateSecret(controlPlaneKubeClient, secret) secret, err = util.CreateSecret(controlPlaneKubeClient, secret)
if err != nil { if err != nil {
klog.Errorf("Failed to create secret in control plane. error: %v", err) return fmt.Errorf("failed to create secret in control plane. error: %v", err)
return err
} }
cluster, err := generateClusterInControllerPlane(controlPlaneRestConfig, clusterConfig, opts.ClusterName, *secret) cluster, err := generateClusterInControllerPlane(controlPlaneRestConfig, clusterConfig, opts.ClusterName, *secret)
@ -211,8 +208,7 @@ func JoinCluster(controlPlaneRestConfig, clusterConfig *rest.Config, opts Comman
} }
err = util.PatchSecret(controlPlaneKubeClient, secret.Namespace, secret.Name, types.MergePatchType, patchSecretBody) err = util.PatchSecret(controlPlaneKubeClient, secret.Namespace, secret.Name, types.MergePatchType, patchSecretBody)
if err != nil { if err != nil {
klog.Errorf("failed to patch secret %s/%s, error: %v", secret.Namespace, secret.Name, err) return fmt.Errorf("failed to patch secret %s/%s, error: %v", secret.Namespace, secret.Name, err)
return err
} }
return nil return nil
@ -263,8 +259,7 @@ func generateSecretInMemberCluster(clusterKubeClient kubeclient.Interface, clust
if apierrors.IsNotFound(err) { if apierrors.IsNotFound(err) {
return false, nil return false, nil
} }
klog.Errorf("Failed to retrieve service account(%s/%s) from cluster, err: %v", serviceAccountObj.Namespace, serviceAccountObj.Name, err) return false, fmt.Errorf("failed to retrieve service account(%s/%s) from cluster, err: %v", serviceAccountObj.Namespace, serviceAccountObj.Name, err)
return false, err
} }
clusterSecret, err = util.GetTargetSecret(clusterKubeClient, serviceAccount.Secrets, corev1.SecretTypeServiceAccountToken, clusterNamespace) clusterSecret, err = util.GetTargetSecret(clusterKubeClient, serviceAccount.Secrets, corev1.SecretTypeServiceAccountToken, clusterNamespace)
if err != nil { if err != nil {
@ -277,8 +272,7 @@ func generateSecretInMemberCluster(clusterKubeClient kubeclient.Interface, clust
return true, nil return true, nil
}) })
if err != nil { if err != nil {
klog.Errorf("Failed to get serviceAccount secret from cluster(%s), error: %v", clusterName, err) return nil, fmt.Errorf("failed to get serviceAccount secret from cluster(%s), error: %v", clusterName, err)
return nil, err
} }
return clusterSecret, nil return clusterSecret, nil
@ -301,8 +295,7 @@ func generateClusterInControllerPlane(controlPlaneConfig, clusterConfig *rest.Co
if clusterConfig.Proxy != nil { if clusterConfig.Proxy != nil {
url, err := clusterConfig.Proxy(nil) url, err := clusterConfig.Proxy(nil)
if err != nil { if err != nil {
klog.Errorf("clusterConfig.Proxy error, %v", err) return nil, fmt.Errorf("clusterConfig.Proxy error, %v", err)
return nil, err
} }
clusterObj.Spec.ProxyURL = url.String() clusterObj.Spec.ProxyURL = url.String()
} }
@ -310,8 +303,7 @@ func generateClusterInControllerPlane(controlPlaneConfig, clusterConfig *rest.Co
controlPlaneKarmadaClient := karmadaclientset.NewForConfigOrDie(controlPlaneConfig) controlPlaneKarmadaClient := karmadaclientset.NewForConfigOrDie(controlPlaneConfig)
cluster, err := CreateClusterObject(controlPlaneKarmadaClient, clusterObj, false) cluster, err := CreateClusterObject(controlPlaneKarmadaClient, clusterObj, false)
if err != nil { if err != nil {
klog.Errorf("failed to create cluster object. cluster name: %s, error: %v", clusterName, err) return nil, fmt.Errorf("failed to create cluster object. cluster name: %s, error: %v", clusterName, err)
return nil, err
} }
return cluster, nil return cluster, nil
@ -329,8 +321,7 @@ func ensureNamespaceExist(client kubeclient.Interface, namespace string, dryRun
exist, err := util.IsNamespaceExist(client, namespace) exist, err := util.IsNamespaceExist(client, namespace)
if err != nil { if err != nil {
klog.Errorf("failed to check if namespace exist. namespace: %s, error: %v", namespace, err) return nil, fmt.Errorf("failed to check if namespace exist. namespace: %s, error: %v", namespace, err)
return nil, err
} }
if exist { if exist {
klog.V(1).Infof("ensure namespace succeed as already exist. namespace: %s", namespace) klog.V(1).Infof("ensure namespace succeed as already exist. namespace: %s", namespace)
@ -339,8 +330,7 @@ func ensureNamespaceExist(client kubeclient.Interface, namespace string, dryRun
createdObj, err := util.CreateNamespace(client, namespaceObj) createdObj, err := util.CreateNamespace(client, namespaceObj)
if err != nil { if err != nil {
klog.Errorf("ensure namespace failed due to create failed. namespace: %s, error: %v", namespace, err) return nil, fmt.Errorf("ensure namespace failed due to create failed. namespace: %s, error: %v", namespace, err)
return nil, err
} }
return createdObj, nil return createdObj, nil
@ -355,8 +345,7 @@ func ensureServiceAccountExist(client kubeclient.Interface, serviceAccountObj *c
exist, err := util.IsServiceAccountExist(client, serviceAccountObj.Namespace, serviceAccountObj.Name) exist, err := util.IsServiceAccountExist(client, serviceAccountObj.Namespace, serviceAccountObj.Name)
if err != nil { if err != nil {
klog.Errorf("failed to check if service account exist. service account: %s/%s, error: %v", serviceAccountObj.Namespace, serviceAccountObj.Name, err) return nil, fmt.Errorf("failed to check if service account exist. service account: %s/%s, error: %v", serviceAccountObj.Namespace, serviceAccountObj.Name, err)
return nil, err
} }
if exist { if exist {
klog.V(1).Infof("ensure service account succeed as already exist. service account: %s/%s", serviceAccountObj.Namespace, serviceAccountObj.Name) klog.V(1).Infof("ensure service account succeed as already exist. service account: %s/%s", serviceAccountObj.Namespace, serviceAccountObj.Name)
@ -365,8 +354,7 @@ func ensureServiceAccountExist(client kubeclient.Interface, serviceAccountObj *c
createdObj, err := util.CreateServiceAccount(client, serviceAccountObj) createdObj, err := util.CreateServiceAccount(client, serviceAccountObj)
if err != nil { if err != nil {
klog.Errorf("ensure service account failed due to create failed. service account: %s/%s, error: %v", serviceAccountObj.Namespace, serviceAccountObj.Name, err) return nil, fmt.Errorf("ensure service account failed due to create failed. service account: %s/%s, error: %v", serviceAccountObj.Namespace, serviceAccountObj.Name, err)
return nil, err
} }
return createdObj, nil return createdObj, nil
@ -381,8 +369,7 @@ func ensureClusterRoleExist(client kubeclient.Interface, clusterRole *rbacv1.Clu
exist, err := util.IsClusterRoleExist(client, clusterRole.Name) exist, err := util.IsClusterRoleExist(client, clusterRole.Name)
if err != nil { if err != nil {
klog.Errorf("failed to check if ClusterRole exist. ClusterRole: %s, error: %v", clusterRole.Name, err) return nil, fmt.Errorf("failed to check if ClusterRole exist. ClusterRole: %s, error: %v", clusterRole.Name, err)
return nil, err
} }
if exist { if exist {
klog.V(1).Infof("ensure ClusterRole succeed as already exist. ClusterRole: %s", clusterRole.Name) klog.V(1).Infof("ensure ClusterRole succeed as already exist. ClusterRole: %s", clusterRole.Name)
@ -391,8 +378,7 @@ func ensureClusterRoleExist(client kubeclient.Interface, clusterRole *rbacv1.Clu
createdObj, err := util.CreateClusterRole(client, clusterRole) createdObj, err := util.CreateClusterRole(client, clusterRole)
if err != nil { if err != nil {
klog.Errorf("ensure ClusterRole failed due to create failed. ClusterRole: %s, error: %v", clusterRole.Name, err) return nil, fmt.Errorf("ensure ClusterRole failed due to create failed. ClusterRole: %s, error: %v", clusterRole.Name, err)
return nil, err
} }
return createdObj, nil return createdObj, nil
@ -407,8 +393,7 @@ func ensureClusterRoleBindingExist(client kubeclient.Interface, clusterRoleBindi
exist, err := util.IsClusterRoleBindingExist(client, clusterRoleBinding.Name) exist, err := util.IsClusterRoleBindingExist(client, clusterRoleBinding.Name)
if err != nil { if err != nil {
klog.Errorf("failed to check if ClusterRole exist. ClusterRole: %s, error: %v", clusterRoleBinding.Name, err) return nil, fmt.Errorf("failed to check if ClusterRole exist. ClusterRole: %s, error: %v", clusterRoleBinding.Name, err)
return nil, err
} }
if exist { if exist {
klog.V(1).Infof("ensure ClusterRole succeed as already exist. ClusterRole: %s", clusterRoleBinding.Name) klog.V(1).Infof("ensure ClusterRole succeed as already exist. ClusterRole: %s", clusterRoleBinding.Name)
@ -417,8 +402,7 @@ func ensureClusterRoleBindingExist(client kubeclient.Interface, clusterRoleBindi
createdObj, err := util.CreateClusterRoleBinding(client, clusterRoleBinding) createdObj, err := util.CreateClusterRoleBinding(client, clusterRoleBinding)
if err != nil { if err != nil {
klog.Errorf("ensure ClusterRole failed due to create failed. ClusterRole: %s, error: %v", clusterRoleBinding.Name, err) return nil, fmt.Errorf("ensure ClusterRole failed due to create failed. ClusterRole: %s, error: %v", clusterRoleBinding.Name, err)
return nil, err
} }
return createdObj, nil return createdObj, nil
@ -428,14 +412,12 @@ func ensureClusterRoleBindingExist(client kubeclient.Interface, clusterRoleBindi
func CreateClusterObject(controlPlaneClient *karmadaclientset.Clientset, clusterObj *clusterv1alpha1.Cluster, errorOnExisting bool) (*clusterv1alpha1.Cluster, error) { func CreateClusterObject(controlPlaneClient *karmadaclientset.Clientset, clusterObj *clusterv1alpha1.Cluster, errorOnExisting bool) (*clusterv1alpha1.Cluster, error) {
cluster, exist, err := GetCluster(controlPlaneClient, clusterObj.Name) cluster, exist, err := GetCluster(controlPlaneClient, clusterObj.Name)
if err != nil { if err != nil {
klog.Errorf("failed to create cluster(%s), error: %v", clusterObj.Name, err) return nil, fmt.Errorf("failed to create cluster(%s), error: %v", clusterObj.Name, err)
return nil, err
} }
if exist { if exist {
if errorOnExisting { if errorOnExisting {
klog.Errorf("failed to create cluster(%s) as it's already exist.", clusterObj.Name) return cluster, fmt.Errorf("failed to create cluster(%s) as it's already exist", clusterObj.Name)
return cluster, fmt.Errorf("cluster already exist")
} }
klog.V(1).Infof("create cluster(%s) succeed as already exist.", clusterObj.Name) klog.V(1).Infof("create cluster(%s) succeed as already exist.", clusterObj.Name)
return cluster, nil return cluster, nil