change cluster schema (#2026)

* change cluster schema

* change cluster schema

cmd/controller-manager/app/controllers.go

@@ -88,11 +88,13 @@ func AddControllers(
 		client.KubeSphere(),
 		kubesphereInformer.Devops().V1alpha1().S2iBinaries(),
 		kubesphereInformer.Devops().V1alpha1().S2iRuns())
+
 	devopsProjectController := devopsproject.NewController(client.Kubernetes(),
 		client.KubeSphere(), devopsClient,
 		informerFactory.KubernetesSharedInformerFactory().Core().V1().Namespaces(),
 		informerFactory.KubeSphereSharedInformerFactory().Devops().V1alpha3().DevOpsProjects(),
 	)
+
 	devopsPipelineController := pipeline.NewController(client.Kubernetes(),
 		client.KubeSphere(),
 		devopsClient,
@@ -120,9 +122,8 @@ func AddControllers(
 
 	clusterController := cluster.NewClusterController(
 		client.Kubernetes(),
+		client.Config(),
 		kubesphereInformer.Cluster().V1alpha1().Clusters(),
-		kubesphereInformer.Cluster().V1alpha1().Agents(),
-		client.KubeSphere().ClusterV1alpha1().Agents(),
 		client.KubeSphere().ClusterV1alpha1().Clusters())
 
 	controllers := map[string]manager.Runnable{

cmd/controller-manager/app/options/options.go

@@ -9,6 +9,7 @@ import (
 	kubesphereconfig "kubesphere.io/kubesphere/pkg/apiserver/config"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
 	"kubesphere.io/kubesphere/pkg/simple/client/k8s"
+	"kubesphere.io/kubesphere/pkg/simple/client/multicluster"
 	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/simple/client/s3"
 	"strings"
@@ -16,24 +17,28 @@ import (
 )
 
 type KubeSphereControllerManagerOptions struct {
-	KubernetesOptions *k8s.KubernetesOptions
-	DevopsOptions     *jenkins.Options
-	S3Options         *s3.Options
-	OpenPitrixOptions *openpitrix.Options
-	LeaderElection    *leaderelection.LeaderElectionConfig
+	KubernetesOptions   *k8s.KubernetesOptions
+	DevopsOptions       *jenkins.Options
+	S3Options           *s3.Options
+	OpenPitrixOptions   *openpitrix.Options
+	MultiClusterOptions *multicluster.Options
+	LeaderElect         bool
+	LeaderElection      *leaderelection.LeaderElectionConfig
 }
 
 func NewKubeSphereControllerManagerOptions() *KubeSphereControllerManagerOptions {
 	s := &KubeSphereControllerManagerOptions{
-		KubernetesOptions: k8s.NewKubernetesOptions(),
-		DevopsOptions:     jenkins.NewDevopsOptions(),
-		S3Options:         s3.NewS3Options(),
-		OpenPitrixOptions: openpitrix.NewOptions(),
+		KubernetesOptions:   k8s.NewKubernetesOptions(),
+		DevopsOptions:       jenkins.NewDevopsOptions(),
+		S3Options:           s3.NewS3Options(),
+		OpenPitrixOptions:   openpitrix.NewOptions(),
+		MultiClusterOptions: multicluster.NewOptions(),
 		LeaderElection: &leaderelection.LeaderElectionConfig{
 			LeaseDuration: 30 * time.Second,
 			RenewDeadline: 15 * time.Second,
 			RetryPeriod:   5 * time.Second,
 		},
+		LeaderElect: false,
 	}
 
 	return s
@@ -53,10 +58,15 @@ func (s *KubeSphereControllerManagerOptions) Flags() cliflag.NamedFlagSets {
 	s.DevopsOptions.AddFlags(fss.FlagSet("devops"), s.DevopsOptions)
 	s.S3Options.AddFlags(fss.FlagSet("s3"), s.S3Options)
 	s.OpenPitrixOptions.AddFlags(fss.FlagSet("openpitrix"), s.OpenPitrixOptions)
+	s.MultiClusterOptions.AddFlags(fss.FlagSet("multicluster"), s.MultiClusterOptions)
 
 	fs := fss.FlagSet("leaderelection")
 	s.bindLeaderElectionFlags(s.LeaderElection, fs)
 
+	fs.BoolVar(&s.LeaderElect, "leader-elect", s.LeaderElect, ""+
+		"Whether to enable leader election. This field should be enabled when controller manager"+
+		"deployed with multiple replicas.")
+
 	kfs := fss.FlagSet("klog")
 	local := flag.NewFlagSet("klog", flag.ExitOnError)
 	klog.InitFlags(local)

cmd/controller-manager/app/server.go

@@ -37,16 +37,17 @@ import (
 	"kubesphere.io/kubesphere/pkg/controller/namespace"
 	"kubesphere.io/kubesphere/pkg/controller/user"
 	"kubesphere.io/kubesphere/pkg/controller/workspace"
+	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
+	"sigs.k8s.io/controller-runtime/pkg/webhook"
+
 	"kubesphere.io/kubesphere/pkg/informers"
 	"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"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 	"sigs.k8s.io/controller-runtime/pkg/runtime/signals"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
 func NewControllerManagerCommand() *cobra.Command {
@@ -60,6 +61,7 @@ func NewControllerManagerCommand() *cobra.Command {
 			S3Options:         conf.S3Options,
 			OpenPitrixOptions: conf.OpenPitrixOptions,
 			LeaderElection:    s.LeaderElection,
+			LeaderElect:       s.LeaderElect,
 		}
 	}
 
@@ -175,6 +177,11 @@ func Run(s *options.KubeSphereControllerManagerOptions, stopCh <-chan struct{})
 		cancel()
 	}()
 
+	if !s.LeaderElect {
+		run(ctx)
+		return nil
+	}
+
 	id, err := os.Hostname()
 	if err != nil {
 		return err

cmd/ks-apiserver/app/options/options.go

@@ -17,6 +17,7 @@ import (
 	"kubesphere.io/kubesphere/pkg/simple/client/ldap"
 	esclient "kubesphere.io/kubesphere/pkg/simple/client/logging/elasticsearch"
 	"kubesphere.io/kubesphere/pkg/simple/client/monitoring/prometheus"
+	"kubesphere.io/kubesphere/pkg/simple/client/multicluster"
 	"kubesphere.io/kubesphere/pkg/simple/client/network"
 	"kubesphere.io/kubesphere/pkg/simple/client/openpitrix"
 	"kubesphere.io/kubesphere/pkg/simple/client/s3"
@@ -52,6 +53,7 @@ func NewServerRunOptions() *ServerRunOptions {
 			LdapOptions:           ldap.NewOptions(),
 			RedisOptions:          cache.NewRedisOptions(),
 			AuthenticationOptions: authoptions.NewAuthenticateOptions(),
+			MultiClusterOptions:   multicluster.NewOptions(),
 		},
 	}
 
@@ -74,6 +76,7 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
 	s.ServiceMeshOptions.AddFlags(fss.FlagSet("servicemesh"), s.ServiceMeshOptions)
 	s.MonitoringOptions.AddFlags(fss.FlagSet("monitoring"), s.MonitoringOptions)
 	s.LoggingOptions.AddFlags(fss.FlagSet("logging"), s.LoggingOptions)
+	s.MultiClusterOptions.AddFlags(fss.FlagSet("multicluster"), s.MultiClusterOptions)
 
 	fs = fss.FlagSet("klog")
 	local := flag.NewFlagSet("klog", flag.ExitOnError)