From 3f5cbcd4f984df3f7c54582a8c93c686c31939c4 Mon Sep 17 00:00:00 2001
From: Jeff <jeffzhang@yunify.com>
Date: Fri, 11 Oct 2019 20:58:49 +0800
Subject: [PATCH] fix controller manager bug

---
 cmd/controller-manager/app/server.go | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go
index 536a94f93..d51d63cfe 100644
--- a/cmd/controller-manager/app/server.go
+++ b/cmd/controller-manager/app/server.go
@@ -98,20 +98,21 @@ func Complete(s *options.KubeSphereControllerManagerOptions) *options.KubeSphere
 	return out
 }
 
-func CreateClientSet(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{}) error {
+func CreateClientSet(conf *controllerconfig.Config, stopCh <-chan struct{}) error {
 	csop := &client.ClientSetOptions{}
 
-	csop.SetKubernetesOptions(s.KubernetesOptions).
-		SetDevopsOptions(s.DevopsOptions).
-		SetS3Options(s.S3Options).
-		SetOpenPitrixOptions(s.OpenPitrixOptions)
+	csop.SetKubernetesOptions(conf.KubernetesOptions).
+		SetDevopsOptions(conf.DevopsOptions).
+		SetS3Options(conf.S3Options).
+		SetOpenPitrixOptions(conf.OpenPitrixOptions).
+		SetKubeSphereOptions(conf.KubeSphereOptions)
 	client.NewClientSetFactory(csop, stopCh)
 
 	return nil
 }
 
 func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{}) error {
-	err := CreateClientSet(s, stopCh)
+	err := CreateClientSet(controllerconfig.Get(), stopCh)
 	if err != nil {
 		klog.Error(err)
 		return err