support sync cluster without scout

pkg/ctrlmgr/manager.go

@@ -22,6 +22,12 @@ import (
 	"time"
 
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/healthz"
+	hnc "sigs.k8s.io/hierarchical-namespaces/api/v1alpha2"
 
 	"github.com/kubecube-io/kubecube/pkg/apis"
 	"github.com/kubecube-io/kubecube/pkg/clog"
@@ -32,12 +38,6 @@ import (
 	"github.com/kubecube-io/kubecube/pkg/utils/exit"
 	"github.com/kubecube-io/kubecube/pkg/utils/informer"
 	"github.com/kubecube-io/kubecube/pkg/utils/worker"
-	"k8s.io/apimachinery/pkg/runtime"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
-	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/healthz"
-	hnc "sigs.k8s.io/hierarchical-namespaces/api/v1alpha2"
 )
 
 var scheme = runtime.NewScheme()
@@ -77,7 +77,7 @@ func NewCtrlMgrWithOpts(options *Config) *ControllerManager {
 		clog.Fatal("unable to set up controller manager: %v", err)
 	}
 
-	syncMgr, err := multicluster.NewSyncMgr(cfg)
+	syncMgr, err := multicluster.NewSyncMgr(cfg, true)
 	if err != nil {
 		clog.Fatal("unable to set up subsidiary sync manager: %v", err)
 	}

pkg/multicluster/sync.go

@@ -36,12 +36,13 @@ import (
 
 // SyncMgr only running when process as subsidiary
 type SyncMgr struct {
-	cache    cache.Cache
-	Informer cache.Informer
-	Worker   worker.Interface
+	cache       cache.Cache
+	Informer    cache.Informer
+	Worker      worker.Interface
+	isWithScout bool
 }
 
-func NewSyncMgr(config *rest.Config) (*SyncMgr, error) {
+func NewSyncMgr(config *rest.Config, isWithScout bool) (*SyncMgr, error) {
 	scheme := runtime.NewScheme()
 	utilruntime.Must(apis.AddToScheme(scheme))
 
@@ -56,7 +57,7 @@ func NewSyncMgr(config *rest.Config) (*SyncMgr, error) {
 		return nil, err
 	}
 
-	return &SyncMgr{cache: c, Informer: informer}, nil
+	return &SyncMgr{cache: c, Informer: informer, isWithScout: isWithScout}, nil
 }
 
 func (m *SyncMgr) Start(ctx context.Context) error {
@@ -135,17 +136,25 @@ func (m *SyncMgr) ReconcileCluster(key worker.QueueKey) error {
 		return err
 	}
 
-	err = AddInternalClusterWithScout(*cluster)
-	if err != nil {
-		clog.Error("add internal cluster %v failed: %v", cluster.Name, err)
-		return err
-	}
+	if m.isWithScout {
+		err = AddInternalClusterWithScout(*cluster)
+		if err != nil {
+			clog.Error("add internal cluster %v failed: %v", cluster.Name, err)
+			return err
+		}
 
-	// start to scout for warden
-	err = ManagerImpl.ScoutFor(context.Background(), cluster.Name)
-	if err != nil {
-		clog.Error("scout for %v warden failed: %v", cluster.Name, err)
-		return err
+		// start to scout for warden
+		err = ManagerImpl.ScoutFor(context.Background(), cluster.Name)
+		if err != nil {
+			clog.Error("scout for %v warden failed: %v", cluster.Name, err)
+			return err
+		}
+	} else {
+		err = AddInternalCluster(*cluster)
+		if err != nil {
+			clog.Error("add internal cluster %v failed: %v", cluster.Name, err)
+			return err
+		}
 	}
 
 	return nil