From 3778abf767d416ea1e680d2c965de51a66cceec8 Mon Sep 17 00:00:00 2001
From: Zhengyi Lai <zheng1@yunify.com>
Date: Sat, 13 Jun 2020 00:32:13 +0800
Subject: [PATCH] Cleanup namespace controller

---
 cmd/controller-manager/app/server.go             | 12 +-----------
 pkg/controller/namespace/namespace_controller.go | 15 ++++++---------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/cmd/controller-manager/app/server.go b/cmd/controller-manager/app/server.go
index 5163f513e..5ed428acb 100644
--- a/cmd/controller-manager/app/server.go
+++ b/cmd/controller-manager/app/server.go
@@ -40,7 +40,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/simple/client/devops"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
-	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/simple/client/s3"
 	"kubesphere.io/kubesphere/pkg/utils/term"
 	"os"
@@ -103,15 +102,6 @@ func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
 		return err
 	}
 
-	var openpitrixClient openpitrix.Client
-	if s.OpenPitrixOptions != nil && !s.OpenPitrixOptions.IsEmpty() {
-		openpitrixClient, err = openpitrix.NewClient(s.OpenPitrixOptions)
-		if err != nil {
-			klog.Errorf("Failed to create openpitrix client %v", err)
-			return err
-		}
-	}
-
 	var devopsClient devops.Interface
 	if s.DevopsOptions != nil && len(s.DevopsOptions.Host) != 0 {
 		devopsClient, err = jenkins.NewDevopsClient(s.DevopsOptions)
@@ -151,7 +141,7 @@ func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
 			klog.Fatal("Unable to create workspace controller")
 		}
 
-		err = namespace.Add(mgr, openpitrixClient)
+		err = namespace.Add(mgr)
 		if err != nil {
 			klog.Fatal("Unable to create namespace controller")
 		}
diff --git a/pkg/controller/namespace/namespace_controller.go b/pkg/controller/namespace/namespace_controller.go
index 793f5c654..37cb07334 100644
--- a/pkg/controller/namespace/namespace_controller.go
+++ b/pkg/controller/namespace/namespace_controller.go
@@ -27,7 +27,6 @@ import (
 	"k8s.io/klog"
 	"kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/constants"
-	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/utils/sliceutil"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
@@ -45,16 +44,15 @@ import (
 
 // Add creates a new Namespace Controller and adds it to the Manager with default RBAC. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
-func Add(mgr manager.Manager, openpitrixClient openpitrix.Client) error {
-	return add(mgr, newReconciler(mgr, openpitrixClient))
+func Add(mgr manager.Manager) error {
+	return add(mgr, newReconciler(mgr))
 }
 
 // newReconciler returns a new reconcile.Reconciler
-func newReconciler(mgr manager.Manager, openpitrixClient openpitrix.Client) reconcile.Reconciler {
+func newReconciler(mgr manager.Manager) reconcile.Reconciler {
 	return &ReconcileNamespace{
-		Client:           mgr.GetClient(),
-		scheme:           mgr.GetScheme(),
-		openpitrixClient: openpitrixClient,
+		Client: mgr.GetClient(),
+		scheme: mgr.GetScheme(),
 	}
 }
 
@@ -80,8 +78,7 @@ var _ reconcile.Reconciler = &ReconcileNamespace{}
 // ReconcileNamespace reconciles a Namespace object
 type ReconcileNamespace struct {
 	client.Client
-	openpitrixClient openpitrix.Client
-	scheme           *runtime.Scheme
+	scheme *runtime.Scheme
 }
 
 // Reconcile reads that state of the cluster for a Namespace object and makes changes based on the state read