From 97c02652bcba1c4be3f9ca6b3d355bdee4315847 Mon Sep 17 00:00:00 2001 From: live77 <535157110@qq.com> Date: Mon, 6 Dec 2021 22:04:22 +0800 Subject: [PATCH] fix code format --- cmd/controller-manager/app/controllers.go | 55 ++++++++-------- cmd/controller-manager/app/options/options.go | 6 +- .../app/options/options_test.go | 65 ++++++++++--------- .../helmcategory/helm_category_controller.go | 3 +- .../helmrepo/helm_repo_controller.go | 3 +- .../quota/resourcequota_controller.go | 8 +-- 6 files changed, 72 insertions(+), 68 deletions(-) diff --git a/cmd/controller-manager/app/controllers.go b/cmd/controller-manager/app/controllers.go index 35f049cb8..7273328cf 100644 --- a/cmd/controller-manager/app/controllers.go +++ b/cmd/controller-manager/app/controllers.go @@ -18,10 +18,16 @@ package app import ( "fmt" + "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/client-go/tools/cache" "k8s.io/klog" + ctrl "sigs.k8s.io/controller-runtime" + runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/manager" + "sigs.k8s.io/kubefed/pkg/controller/util" + "kubesphere.io/kubesphere/cmd/controller-manager/app/options" "kubesphere.io/kubesphere/pkg/controller/application" "kubesphere.io/kubesphere/pkg/controller/helm" @@ -42,10 +48,6 @@ import ( "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins" ldapclient "kubesphere.io/kubesphere/pkg/simple/client/ldap" "kubesphere.io/kubesphere/pkg/simple/client/s3" - ctrl "sigs.k8s.io/controller-runtime" - runtimeclient "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/manager" - "sigs.k8s.io/kubefed/pkg/controller/util" "kubesphere.io/kubesphere/pkg/controller/storage/snapshotclass" @@ -72,7 +74,7 @@ import ( ippoolclient "kubesphere.io/kubesphere/pkg/simple/client/network/ippool" ) -var allControllers = []string { +var allControllers = []string{ "user", "workspacetemplate", "workspace", @@ -178,37 +180,37 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i KubeconfigClient: kubeconfigClient, AuthenticationOptions: cmOptions.AuthenticationOptions, } - addControllerWithSetup(mgr,"user", userController) + addControllerWithSetup(mgr, "user", userController) } // "workspacetemplate" controller if cmOptions.IsControllerEnabled("workspacetemplate") { workspaceTemplateReconciler := &workspacetemplate.Reconciler{MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable} - addControllerWithSetup(mgr,"workspacetemplate", workspaceTemplateReconciler) + addControllerWithSetup(mgr, "workspacetemplate", workspaceTemplateReconciler) } // "workspace" controller if cmOptions.IsControllerEnabled("workspace") { workspaceReconciler := &workspace.Reconciler{} - addControllerWithSetup(mgr,"workspace", workspaceReconciler) + addControllerWithSetup(mgr, "workspace", workspaceReconciler) } // "workspacerole" controller if cmOptions.IsControllerEnabled("workspacerole") { workspaceRoleReconciler := &workspacerole.Reconciler{MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable} - addControllerWithSetup(mgr,"workspacerole", workspaceRoleReconciler) + addControllerWithSetup(mgr, "workspacerole", workspaceRoleReconciler) } // "workspacerolebinding" controller if cmOptions.IsControllerEnabled("workspacerolebinding") { workspaceRoleBindingReconciler := &workspacerolebinding.Reconciler{MultiClusterEnabled: cmOptions.MultiClusterOptions.Enable} - addControllerWithSetup(mgr,"workspacerolebinding", workspaceRoleBindingReconciler) + addControllerWithSetup(mgr, "workspacerolebinding", workspaceRoleBindingReconciler) } // "namespace" controller if cmOptions.IsControllerEnabled("namespace") { namespaceReconciler := &namespace.Reconciler{} - addControllerWithSetup(mgr,"namespace", namespaceReconciler) + addControllerWithSetup(mgr, "namespace", namespaceReconciler) } // "helmrepo" controller @@ -239,29 +241,29 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i // "helmapplicationversion" controller if cmOptions.IsControllerEnabled("helmapplicationversion") { reconcileHelmAppVersion := (&helmapplication.ReconcileHelmApplicationVersion{}) - addControllerWithSetup(mgr, "helmapplicationversion",reconcileHelmAppVersion) + addControllerWithSetup(mgr, "helmapplicationversion", reconcileHelmAppVersion) } } // "helmrelease" controller if cmOptions.IsControllerEnabled("helmrelease") { reconcileHelmRelease := &helmrelease.ReconcileHelmRelease{ - // nil interface is valid value. - StorageClient: opS3Client, - KsFactory: informerFactory.KubeSphereSharedInformerFactory(), - MultiClusterEnable: cmOptions.MultiClusterOptions.Enable, - WaitTime: cmOptions.OpenPitrixOptions.ReleaseControllerOptions.WaitTime, - MaxConcurrent: cmOptions.OpenPitrixOptions.ReleaseControllerOptions.MaxConcurrent, - StopChan: stopCh, - } - addControllerWithSetup(mgr, "helmrelease",reconcileHelmRelease) + // nil interface is valid value. + StorageClient: opS3Client, + KsFactory: informerFactory.KubeSphereSharedInformerFactory(), + MultiClusterEnable: cmOptions.MultiClusterOptions.Enable, + WaitTime: cmOptions.OpenPitrixOptions.ReleaseControllerOptions.WaitTime, + MaxConcurrent: cmOptions.OpenPitrixOptions.ReleaseControllerOptions.MaxConcurrent, + StopChan: stopCh, + } + addControllerWithSetup(mgr, "helmrelease", reconcileHelmRelease) } // "helm" controller if cmOptions.IsControllerEnabled("helm") { if !cmOptions.GatewayOptions.IsEmpty() { helmReconciler := &helm.Reconciler{GatewayOptions: cmOptions.GatewayOptions} - addControllerWithSetup(mgr, "helm",helmReconciler) + addControllerWithSetup(mgr, "helm", helmReconciler) } } @@ -274,21 +276,21 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i Mapper: mgr.GetRESTMapper(), ApplicationSelector: selector, } - addControllerWithSetup(mgr, "application",applicationReconciler) + addControllerWithSetup(mgr, "application", applicationReconciler) } // "serviceaccount" controller if cmOptions.IsControllerEnabled("serviceaccount") { saReconciler := &serviceaccount.Reconciler{} - addControllerWithSetup(mgr, "serviceaccount",saReconciler) + addControllerWithSetup(mgr, "serviceaccount", saReconciler) } // "resourcequota" controller if cmOptions.IsControllerEnabled("resourcequota") { resourceQuotaReconciler := "a.Reconciler{ MaxConcurrentReconciles: quota.DefaultMaxConcurrentReconciles, - ResyncPeriod: quota.DefaultResyncPeriod, - InformerFactory: informerFactory.KubernetesSharedInformerFactory(), + ResyncPeriod: quota.DefaultResyncPeriod, + InformerFactory: informerFactory.KubernetesSharedInformerFactory(), } addControllerWithSetup(mgr, "resourcequota", resourceQuotaReconciler) } @@ -516,7 +518,6 @@ func addAllControllers(mgr manager.Manager, client k8s.Client, informerFactory i return nil } - var addSuccessfullyControllers = sets.NewString() type setupableController interface { diff --git a/cmd/controller-manager/app/options/options.go b/cmd/controller-manager/app/options/options.go index afe88566e..f7bcbadd4 100644 --- a/cmd/controller-manager/app/options/options.go +++ b/cmd/controller-manager/app/options/options.go @@ -19,10 +19,11 @@ package options import ( "flag" "fmt" - "k8s.io/apimachinery/pkg/util/sets" "strings" "time" + "k8s.io/apimachinery/pkg/util/sets" + "kubesphere.io/kubesphere/pkg/apiserver/authentication" "k8s.io/apimachinery/pkg/labels" @@ -190,7 +191,7 @@ func (o *KubeSphereControllerManagerOptions) IsControllerEnabled(name string) bo if ctrl == name { return true } - if ctrl == "-" + name { + if ctrl == "-"+name { return false } if ctrl == "*" { @@ -216,4 +217,3 @@ func (s *KubeSphereControllerManagerOptions) bindLeaderElectionFlags(l *leaderel "The duration the clients should wait between attempting acquisition and renewal "+ "of a leadership. This is only applicable if leader election is enabled.") } - diff --git a/cmd/controller-manager/app/options/options_test.go b/cmd/controller-manager/app/options/options_test.go index e03796758..a3f0692af 100644 --- a/cmd/controller-manager/app/options/options_test.go +++ b/cmd/controller-manager/app/options/options_test.go @@ -1,59 +1,60 @@ package options import ( - "github.com/stretchr/testify/assert" "testing" + + "github.com/stretchr/testify/assert" ) // ref: https://github.com/kubernetes/kubernetes/blob/master/staging/src/k8s.io/controller-manager/app/helper_test.go func TestIsControllerEnabled(t *testing.T) { testcases := []struct { - name string - controllerName string + name string + controllerName string controllerFlags []string - expected bool + expected bool }{ { - name: "on by name", - controllerName: "bravo", - controllerFlags: []string{"alpha", "bravo", "-charlie"}, - expected: true, + name: "on by name", + controllerName: "bravo", + controllerFlags: []string{"alpha", "bravo", "-charlie"}, + expected: true, }, { - name: "off by name", - controllerName: "charlie", - controllerFlags: []string{"alpha", "bravo", "-charlie"}, - expected: false, + name: "off by name", + controllerName: "charlie", + controllerFlags: []string{"alpha", "bravo", "-charlie"}, + expected: false, }, { - name: "on by default", - controllerName: "alpha", - controllerFlags: []string{"*"}, - expected: true, + name: "on by default", + controllerName: "alpha", + controllerFlags: []string{"*"}, + expected: true, }, { - name: "on by star, not off by name", - controllerName: "alpha", - controllerFlags: []string{"*", "-charlie"}, - expected: true, + name: "on by star, not off by name", + controllerName: "alpha", + controllerFlags: []string{"*", "-charlie"}, + expected: true, }, { - name: "off by name with star", - controllerName: "charlie", - controllerFlags: []string{"*", "-charlie"}, - expected: false, + name: "off by name with star", + controllerName: "charlie", + controllerFlags: []string{"*", "-charlie"}, + expected: false, }, { - name: "off then on", - controllerName: "alpha", - controllerFlags: []string{"-alpha", "alpha"}, - expected: false, + name: "off then on", + controllerName: "alpha", + controllerFlags: []string{"-alpha", "alpha"}, + expected: false, }, { - name: "on then off", - controllerName: "alpha", - controllerFlags: []string{"alpha", "-alpha"}, - expected: true, + name: "on then off", + controllerName: "alpha", + controllerFlags: []string{"alpha", "-alpha"}, + expected: true, }, } diff --git a/pkg/controller/openpitrix/helmcategory/helm_category_controller.go b/pkg/controller/openpitrix/helmcategory/helm_category_controller.go index b3b81ff77..696348b1f 100644 --- a/pkg/controller/openpitrix/helmcategory/helm_category_controller.go +++ b/pkg/controller/openpitrix/helmcategory/helm_category_controller.go @@ -18,9 +18,10 @@ package helmcategory import ( "context" - ctrl "sigs.k8s.io/controller-runtime" "time" + ctrl "sigs.k8s.io/controller-runtime" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go index cb2828195..0410ea4c8 100644 --- a/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go +++ b/pkg/controller/openpitrix/helmrepo/helm_repo_controller.go @@ -19,9 +19,10 @@ package helmrepo import ( "context" "math" - ctrl "sigs.k8s.io/controller-runtime" "time" + ctrl "sigs.k8s.io/controller-runtime" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/pkg/controller/quota/resourcequota_controller.go b/pkg/controller/quota/resourcequota_controller.go index 36bb7c1de..123e0eeae 100644 --- a/pkg/controller/quota/resourcequota_controller.go +++ b/pkg/controller/quota/resourcequota_controller.go @@ -68,17 +68,17 @@ const ( // Reconciler reconciles a Workspace object type Reconciler struct { client.Client - logger logr.Logger - recorder record.EventRecorder + logger logr.Logger + recorder record.EventRecorder // Knows how to calculate usage registry quotav1.Registry MaxConcurrentReconciles int // Controls full recalculation of quota usage - ResyncPeriod time.Duration + ResyncPeriod time.Duration InformerFactory k8sinformers.SharedInformerFactory - scheme *runtime.Scheme + scheme *runtime.Scheme } func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {