Adding new method to create controoler with clientset.

Author: brahmaroutu

Diff for: controller/controller.go

@@ -121,7 +121,10 @@ func NewDefaultObjectStorageController(identity string, leaderLockName string, t
 
 func NewObjectStorageController(identity string, leaderLockName string, threads int, limiter workqueue.RateLimiter) (*ObjectStorageController, error) {
 	cfg, err := func() (*rest.Config, error) {
-		kubeConfig := viper.GetString("kube-config")
+		kubeConfig := viper.GetString("kubeconfig")
+		if kubeConfig == "" {
+			kubeConfig = os.Getenv("KUBECONFIG")
+		}
 
 		if kubeConfig != "" {
 			return clientcmd.BuildConfigFromFlags("", kubeConfig)
@@ -140,8 +143,12 @@ func NewObjectStorageController(identity string, leaderLockName string, threads
 	if err != nil {
 		return nil, err
 	}
+	return NewObjectStorageControllerWithClientset(identity, leaderLockName, threads, limiter, kubeClient, bucketClient)
+}
 
+func NewObjectStorageControllerWithClientset(identity string, leaderLockName string, threads int, limiter workqueue.RateLimiter, kubeClient kubeclientset.Interface, bucketClient bucketclientset.Interface) (*ObjectStorageController, error) {
 	id := identity
+	var err error
 	if id == "" {
 		id, err = os.Hostname()
 		if err != nil {
@@ -225,7 +232,7 @@ func (c *ObjectStorageController) Run(ctx context.Context) error {
 				c.runController(ctx)
 			},
 			OnStoppedLeading: func() {
-				glog.Fatal("stopped leading")
+				glog.Infof("stopped leading")
 			},
 			OnNewLeader: func(identity string) {
 				glog.V(3).Infof("new leader detected, current leader: %s", identity)
@@ -416,7 +423,7 @@ func (c *ObjectStorageController) runController(ctx context.Context) {
 		defer utilruntime.HandleCrash()
 		defer c.queue.ShutDown()
 
-		glog.V(3).Infof("Starting %s controller", name)
+		glog.V(1).Infof("Starting %s controller", name)
 		go ctrlr.Run(ctx.Done())
 
 		if !cache.WaitForCacheSync(ctx.Done(), ctrlr.HasSynced) {