admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup namespace controller

Browse Source
This commit is contained in:
Zhengyi Lai
2020-06-13 00:32:13 +08:00
parent cf162559e3
commit 3778abf767
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/controller-manager/app/server.go
View File

@@ -40,7 +40,6 @@ import (
"kubesphere.io/kubesphere/pkg/simple/client/devops" "kubesphere.io/kubesphere/pkg/simple/client/devops"
"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins" "kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
"kubesphere.io/kubesphere/pkg/simple/client/k8s" "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/simple/client/s3"
"kubesphere.io/kubesphere/pkg/utils/term" "kubesphere.io/kubesphere/pkg/utils/term"
"os" "os"
@@ -103,15 +102,6 @@ func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
return err 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 var devopsClient devops.Interface
if s.DevopsOptions != nil && len(s.DevopsOptions.Host) != 0 { if s.DevopsOptions != nil && len(s.DevopsOptions.Host) != 0 {
devopsClient, err = jenkins.NewDevopsClient(s.DevopsOptions) 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") klog.Fatal("Unable to create workspace controller")
} }
err = namespace.Add(mgr, openpitrixClient) err = namespace.Add(mgr)
if err != nil { if err != nil {
klog.Fatal("Unable to create namespace controller") klog.Fatal("Unable to create namespace controller")
} }

15
pkg/controller/namespace/namespace_controller.go
View File

@@ -27,7 +27,6 @@ import (
"k8s.io/klog" "k8s.io/klog"
"kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1" "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
"kubesphere.io/kubesphere/pkg/constants" "kubesphere.io/kubesphere/pkg/constants"
"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
"kubesphere.io/kubesphere/pkg/utils/sliceutil" "kubesphere.io/kubesphere/pkg/utils/sliceutil"
"sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller" "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 // 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. // and Start it when the Manager is Started.
func Add(mgr manager.Manager, openpitrixClient openpitrix.Client) error { func Add(mgr manager.Manager) error {
return add(mgr, newReconciler(mgr, openpitrixClient)) return add(mgr, newReconciler(mgr))
} }
// newReconciler returns a new reconcile.Reconciler // 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{ return &ReconcileNamespace{
Client: mgr.GetClient(), Client: mgr.GetClient(),
scheme: mgr.GetScheme(), scheme: mgr.GetScheme(),
openpitrixClient: openpitrixClient,
} }
} }
@@ -80,8 +78,7 @@ var _ reconcile.Reconciler = &ReconcileNamespace{}
// ReconcileNamespace reconciles a Namespace object // ReconcileNamespace reconciles a Namespace object
type ReconcileNamespace struct { type ReconcileNamespace struct {
client.Client 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 // Reconcile reads that state of the cluster for a Namespace object and makes changes based on the state read