Merge pull request kubernetes#78232 from SataQiu/fix-golint-20190523

k8s-ci-robot · web-flow · commit 501092c7d01b · 2019-05-29T00:53:02.000-07:00
Fix golint failures of pkg/controller/namespace/deletion pkg/controller/serviceaccount
diff --git a/hack/.golint_failures b/hack/.golint_failures
@@ -70,7 +70,6 @@ pkg/controller/job
 pkg/controller/job/config/v1alpha1
 pkg/controller/namespace
 pkg/controller/namespace/config/v1alpha1
-pkg/controller/namespace/deletion
 pkg/controller/nodeipam/config/v1alpha1
 pkg/controller/nodelifecycle/config/v1alpha1
 pkg/controller/podautoscaler
@@ -87,7 +86,6 @@ pkg/controller/resourcequota/config/v1alpha1
 pkg/controller/route
 pkg/controller/service
 pkg/controller/service/config/v1alpha1
-pkg/controller/serviceaccount
 pkg/controller/serviceaccount/config/v1alpha1
 pkg/controller/statefulset
 pkg/controller/ttl
diff --git a/pkg/controller/namespace/deletion/namespaced_resources_deleter.go b/pkg/controller/namespace/deletion/namespaced_resources_deleter.go
@@ -37,11 +37,12 @@ import (
 	v1clientset "k8s.io/client-go/kubernetes/typed/core/v1"
 )
 
-// Interface to delete a namespace with all resources in it.
+// NamespacedResourcesDeleterInterface is the interface to delete a namespace with all resources in it.
 type NamespacedResourcesDeleterInterface interface {
 	Delete(nsName string) error
 }
 
+// NewNamespacedResourcesDeleter returns a new NamespacedResourcesDeleter.
 func NewNamespacedResourcesDeleter(nsClient v1clientset.NamespaceInterface,
 	dynamicClient dynamic.Interface, podsGetter v1clientset.PodsGetter,
 	discoverResourcesFn func() ([]*metav1.APIResourceList, error),
diff --git a/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go b/pkg/controller/namespace/deletion/namespaced_resources_deleter_test.go
@@ -213,7 +213,7 @@ func TestRetryOnConflictError(t *testing.T) {
 	retryOnce := func(namespace *v1.Namespace) (*v1.Namespace, error) {
 		numTries++
 		if numTries <= 1 {
-			return namespace, errors.NewConflict(api.Resource("namespaces"), namespace.Name, fmt.Errorf("ERROR!"))
+			return namespace, errors.NewConflict(api.Resource("namespaces"), namespace.Name, fmt.Errorf("ERROR"))
 		}
 		return namespace, nil
 	}
diff --git a/pkg/controller/serviceaccount/serviceaccounts_controller.go b/pkg/controller/serviceaccount/serviceaccounts_controller.go
@@ -52,6 +52,7 @@ type ServiceAccountsControllerOptions struct {
 	NamespaceResync time.Duration
 }
 
+// DefaultServiceAccountsControllerOptions returns the default options for creating a ServiceAccountsController.
 func DefaultServiceAccountsControllerOptions() ServiceAccountsControllerOptions {
 	return ServiceAccountsControllerOptions{
 		ServiceAccounts: []v1.ServiceAccount{
@@ -108,6 +109,7 @@ type ServiceAccountsController struct {
 	queue workqueue.RateLimitingInterface
 }
 
+// Run runs the ServiceAccountsController blocks until receiving signal from stopCh.
 func (c *ServiceAccountsController) Run(workers int, stopCh <-chan struct{}) {
 	defer utilruntime.HandleCrash()
 	defer c.queue.ShutDown()
diff --git a/pkg/controller/serviceaccount/tokens_controller.go b/pkg/controller/serviceaccount/tokens_controller.go
@@ -162,7 +162,7 @@ type TokensController struct {
 	maxRetries int
 }
 
-// Runs controller blocks until stopCh is closed
+// Run runs controller blocks until stopCh is closed
 func (e *TokensController) Run(workers int, stopCh <-chan struct{}) {
 	// Shut down queues
 	defer utilruntime.HandleCrash()

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,12 @@ import (`
`37`	`37`	`v1clientset "k8s.io/client-go/kubernetes/typed/core/v1"`
`38`	`38`	`)`
`39`	`39`
`40`		`-// Interface to delete a namespace with all resources in it.`
	`40`	`+// NamespacedResourcesDeleterInterface is the interface to delete a namespace with all resources in it.`
`41`	`41`	`type NamespacedResourcesDeleterInterface interface {`
`42`	`42`	`Delete(nsName string) error`
`43`	`43`	`}`
`44`	`44`
	`45`	`+// NewNamespacedResourcesDeleter returns a new NamespacedResourcesDeleter.`
`45`	`46`	`func NewNamespacedResourcesDeleter(nsClient v1clientset.NamespaceInterface,`
`46`	`47`	`dynamicClient dynamic.Interface, podsGetter v1clientset.PodsGetter,`
`47`	`48`	`discoverResourcesFn func() ([]*metav1.APIResourceList, error),`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ func TestRetryOnConflictError(t *testing.T) {`
`213`	`213`	`retryOnce := func(namespace v1.Namespace) (v1.Namespace, error) {`
`214`	`214`	`numTries++`
`215`	`215`	`if numTries <= 1 {`
`216`		`- return namespace, errors.NewConflict(api.Resource("namespaces"), namespace.Name, fmt.Errorf("ERROR!"))`
	`216`	`+ return namespace, errors.NewConflict(api.Resource("namespaces"), namespace.Name, fmt.Errorf("ERROR"))`
`217`	`217`	`}`
`218`	`218`	`return namespace, nil`
`219`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ type ServiceAccountsControllerOptions struct {`
`52`	`52`	`NamespaceResync time.Duration`
`53`	`53`	`}`
`54`	`54`
	`55`	`+// DefaultServiceAccountsControllerOptions returns the default options for creating a ServiceAccountsController.`
`55`	`56`	`func DefaultServiceAccountsControllerOptions() ServiceAccountsControllerOptions {`
`56`	`57`	`return ServiceAccountsControllerOptions{`
`57`	`58`	`ServiceAccounts: []v1.ServiceAccount{`
`@@ -108,6 +109,7 @@ type ServiceAccountsController struct {`
`108`	`109`	`queue workqueue.RateLimitingInterface`
`109`	`110`	`}`
`110`	`111`
	`112`	`+// Run runs the ServiceAccountsController blocks until receiving signal from stopCh.`
`111`	`113`	`func (c *ServiceAccountsController) Run(workers int, stopCh <-chan struct{}) {`
`112`	`114`	`defer utilruntime.HandleCrash()`
`113`	`115`	`defer c.queue.ShutDown()`
Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,7 @@ type TokensController struct {`
`162`	`162`	`maxRetries int`
`163`	`163`	`}`
`164`	`164`
`165`		`-// Runs controller blocks until stopCh is closed`
	`165`	`+// Run runs controller blocks until stopCh is closed`
`166`	`166`	`func (e *TokensController) Run(workers int, stopCh <-chan struct{}) {`
`167`	`167`	`// Shut down queues`
`168`	`168`	`defer utilruntime.HandleCrash()`