format

cmd/controller-manager/app/controller_manager.go

@@ -59,8 +59,8 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"k8s.io/klog"
 	"k8s.io/client-go/informers"
+	"k8s.io/klog"
 )
 
 // NewControllerManagerCommand creates a *cobra.Command object with default

pkg/controller/controller.go

@@ -51,8 +51,8 @@ import (
 	scfeatures "github.com/kubernetes-incubator/service-catalog/pkg/features"
 	"github.com/kubernetes-incubator/service-catalog/pkg/filter"
 	"github.com/kubernetes-incubator/service-catalog/pkg/pretty"
-	"k8s.io/client-go/listers/core/v1"
 	v12 "k8s.io/client-go/informers/core/v1"
+	"k8s.io/client-go/listers/core/v1"
 )
 
 const (
@@ -116,7 +116,7 @@ func NewController(
 		bindingPollingQueue:         workqueue.NewNamedRateLimitingQueue(workqueue.NewItemExponentialFailureRateLimiter(pollingStartInterval, operationPollingMaximumBackoffDuration), "binding-poller"),
 		clusterIDConfigMapName:      clusterIDConfigMapName,
 		clusterIDConfigMapNamespace: clusterIDConfigMapNamespace,
-		brokerClientCreateFunc: brokerClientCreateFunc,
+		brokerClientCreateFunc:      brokerClientCreateFunc,
 	}
 	controller.brokerClientManager = NewBrokerClientManager(brokerClientCreateFunc)
 
@@ -234,7 +234,7 @@ type controller struct {
 	clusterIDLock               sync.RWMutex
 	instanceOperationRetryQueue instanceOperationBackoff
 	// BrokerClientManager holds all OSB clients for brokers.
-	brokerClientManager    *BrokerClientManager
+	brokerClientManager *BrokerClientManager
 
 	brokerClientCreateFunc osb.CreateFunc
 }
@@ -497,7 +497,6 @@ func (c *controller) getClusterServiceClassAndClusterServiceBroker(instance *v1b
 		}
 	}
 
-
 	brokerClient, err := c.clusterServiceBrokerClient(broker)
 	if err != nil {
 		return nil, "", nil, err
@@ -717,8 +716,6 @@ func (c *controller) getAuthCredentialsFromClusterServiceBroker(broker *v1beta1.
 	return nil, fmt.Errorf("empty auth info or unsupported auth mode: %s", authInfo)
 }
 
-
-
 // getAuthCredentialsFromServiceBroker returns the auth credentials, if any, or
 // returns an error. If the AuthInfo field is nil, empty values are returned.
 func (c *controller) getAuthCredentialsFromServiceBroker(broker *v1beta1.ServiceBroker) (*osb.AuthConfig, error) {

pkg/controller/controller_clusterservicebroker_test.go

@@ -854,10 +854,7 @@ func testReconcileClusterServiceBrokerWithAuth(t *testing.T, authInfo *v1beta1.C
 
 	broker := getTestClusterServiceBrokerWithAuth(authInfo)
 	if secret != nil {
-		//addGetSecretReaction(fakeKubeClient, secret)
 		fakeKubeClient.Core().Secrets(secret.Namespace).Create(secret)
-	} else {
-		//addGetSecretNotFoundReaction(fakeKubeClient)
 	}
 	testClusterServiceClass := getTestClusterServiceClass()
 	fakeClusterServiceBrokerClient.CatalogReaction = &fakeosb.CatalogReaction{

pkg/controller/controller_servicebroker_test.go

@@ -47,8 +47,6 @@ func TestShouldReconcileServiceBroker(t *testing.T) {
 	}
 }
 
-
-
 func getServiceBrokerReactor(broker *v1beta1.ServiceBroker) (string, string, clientgotesting.ReactionFunc) {
 	return "get", "servicebrokers", func(action clientgotesting.Action) (bool, runtime.Object, error) {
 		return true, broker, nil

pkg/controller/controller_test.go

@@ -45,10 +45,10 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/util/sets"
+	"k8s.io/client-go/informers"
 	clientgofake "k8s.io/client-go/kubernetes/fake"
 	clientgotesting "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/client-go/informers"
 )
 
 // NOTE:
@@ -2331,7 +2331,6 @@ func newTestController(t *testing.T, config fakeosb.FakeClientConfiguration) (
 	k8sInformerFactory := informers.NewSharedInformerFactory(fakeKubeClient, 0)
 	k8sInformers := k8sInformerFactory.Core().V1()
 
-
 	fakeRecorder := record.NewFakeRecorder(5)
 
 	// create a test controller