Merge remote-tracking branch 'upstream/dev' into dev

# Conflicts:
#	pkg/apis/iam/v1alpha2/user_types.go

pkg/apis/addtoscheme_cluster_v1alpha1.go

@@ -1,7 +1,7 @@
 package apis
 
 import (
-	"kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	"kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 )
 
 func init() {

pkg/apis/cluster/group.go

@@ -0,0 +1 @@
+package cluster

pkg/apis/cluster/v1alpha1/agent_types.go

@@ -20,6 +20,12 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const (
+	ResourceKindAgent      = "Agent"
+	ResourcesSingularAgent = "agent"
+	ResourcesPluralAgent   = "agents"
+)
+
 // EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 // NOTE: json tags are required.  Any new fields you add must have json tags for the fields to be serialized.
 
@@ -46,7 +52,7 @@ type AgentSpec struct {
 
 	// Indicates that the agent is paused.
 	// +optional
-	Paused bool
+	Paused bool `json:"paused,omitempty"`
 }
 
 type AgentConditionType string
@@ -76,8 +82,6 @@ type AgentCondition struct {
 
 // AgentStatus defines the observed state of Agent
 type AgentStatus struct {
-	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
-	// Important: Run "make" to regenerate code after modifying this file
 
 	// Represents the latest available observations of a agent's current state.
 	Conditions []AgentCondition `json:"conditions,omitempty"`
@@ -86,12 +90,15 @@ type AgentStatus struct {
 	Ping uint64 `json:"ping,omitempty"`
 
 	// Issued new kubeconfig by proxy server
-	KubeConfig []byte
+	KubeConfig []byte `json:"kubeconfig,omitempty"`
 }
 
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +k8s:openapi-gen=true
+// +genclient:nonNamespaced
+// +kubebuilder:printcolumn:name="Paused",type="bool",JSONPath=".spec.Paused"
+// +kubebuilder:resource:scope=Cluster
 
 // Agent is the Schema for the agents API
 type Agent struct {

pkg/apis/cluster/v1alpha1/cluster_types.go

@@ -0,0 +1,100 @@
+package v1alpha1
+
+import (
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	ResourceKindCluster      = "Cluster"
+	ResourcesSingularCluster = "cluster"
+	ResourcesPluralCluster   = "clusters"
+
+	IsHostCluster = "cluster.kubesphere.io/is-host-cluster"
+)
+
+type ClusterSpec struct {
+
+	// Join cluster as a kubefed cluster
+	// +optional
+	Federated bool `json:"federated,omitempty"`
+
+	// Desired state of the cluster
+	Active bool `json:"active,omitempty"`
+
+	// Provider of the cluster, this field is just for description
+	// +optional
+	Provider string `json:"provider,omitempty"`
+}
+
+type ClusterConditionType string
+
+const (
+	// Cluster agent is initialized and waiting for connecting
+	ClusterInitialized ClusterConditionType = "Initialized"
+
+	// Cluster agent is available
+	ClusterAgentAvailable ClusterConditionType = "AgentAvailable"
+
+	// Cluster has been one of federated clusters
+	ClusterFederated ClusterConditionType = "Federated"
+)
+
+type ClusterCondition struct {
+	// Type of the condition
+	Type ClusterConditionType `json:"type"`
+	// Status of the condition, one of True, False, Unknown.
+	Status v1.ConditionStatus `json:"status"`
+	// The last time this condition was updated.
+	LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
+	// Last time the condition transitioned from one status to another.
+	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
+	// The reason for the condition's last transition.
+	Reason string `json:"reason,omitempty"`
+	// A human readable message indicating details about the transition.
+	Message string `json:"message,omitempty"`
+}
+
+type ClusterStatus struct {
+
+	// Represents the latest available observations of a cluster's current state.
+	Conditions []ClusterCondition `json:"conditions,omitempty"`
+
+	// GitVersion of the kubernetes cluster, this field is set by cluster controller
+	// +optional
+	KubernetesVersion string `json:"version,omitempty"`
+
+	//
+	NodeCount int `json:"count,omitempty"`
+}
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +k8s:openapi-gen=true
+// +genclient:nonNamespaced
+// +groupName
+// +kubebuilder:printcolumn:name="Federated",type="bool",JSONPath=".spec.Federated"
+// +kubebuilder:printcolumn:name="Provider",type="string",JSONPath=".spec.Provider"
+// +kubebuilder:printcolumn:name="Active",type="bool",JSONPath=".spec.Active"
+// +kubebuilder:resource:scope=Cluster
+
+// Cluster is the schema for the clusters API
+type Cluster struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec   ClusterSpec   `json:"spec,omitempty"`
+	Status ClusterStatus `json:"status,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type ClusterList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+	Items           []Cluster `json:"items"`
+}
+
+func init() {
+	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
+}

pkg/apis/cluster/v1alpha1/doc.go

@@ -0,0 +1,8 @@
+// Package v1alpha1 contains API Schema definitions for the tower v1alpha1 API group
+// +k8s:openapi-gen=true
+// +k8s:deepcopy-gen=package,register
+// +k8s:conversion-gen=kubesphere.io/kubesphere/pkg/apis/cluster
+// +k8s:defaulter-gen=TypeMeta
+// +groupName=cluster.kubesphere.io
+
+package v1alpha1

pkg/apis/cluster/v1alpha1/register.go

@@ -17,7 +17,7 @@ limitations under the License.
 // +k8s:openapi-gen=true
 // +k8s:deepcopy-gen=package,register
 // +k8s:defaulter-gen=TypeMeta
-// +groupName=tower.kubesphere.io
+// +groupName=cluster.kubesphere.io
 package v1alpha1
 
 import (
@@ -27,7 +27,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: "tower.kubesphere.io", Version: "v1alpha1"}
+	SchemeGroupVersion = schema.GroupVersion{Group: "cluster.kubesphere.io", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}

pkg/apis/cluster/v1alpha1/zz_generated.deepcopy.go

@@ -141,3 +141,116 @@ func (in *AgentStatus) DeepCopy() *AgentStatus {
 	in.DeepCopyInto(out)
 	return out
 }
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *Cluster) DeepCopyInto(out *Cluster) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
+	out.Spec = in.Spec
+	in.Status.DeepCopyInto(&out.Status)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
+func (in *Cluster) DeepCopy() *Cluster {
+	if in == nil {
+		return nil
+	}
+	out := new(Cluster)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *Cluster) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterCondition) DeepCopyInto(out *ClusterCondition) {
+	*out = *in
+	in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
+	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterCondition.
+func (in *ClusterCondition) DeepCopy() *ClusterCondition {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterCondition)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterList) DeepCopyInto(out *ClusterList) {
+	*out = *in
+	out.TypeMeta = in.TypeMeta
+	in.ListMeta.DeepCopyInto(&out.ListMeta)
+	if in.Items != nil {
+		in, out := &in.Items, &out.Items
+		*out = make([]Cluster, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterList.
+func (in *ClusterList) DeepCopy() *ClusterList {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterList)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object.
+func (in *ClusterList) DeepCopyObject() runtime.Object {
+	if c := in.DeepCopy(); c != nil {
+		return c
+	}
+	return nil
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec.
+func (in *ClusterSpec) DeepCopy() *ClusterSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *ClusterStatus) DeepCopyInto(out *ClusterStatus) {
+	*out = *in
+	if in.Conditions != nil {
+		in, out := &in.Conditions, &out.Conditions
+		*out = make([]ClusterCondition, len(*in))
+		for i := range *in {
+			(*in)[i].DeepCopyInto(&(*out)[i])
+		}
+	}
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterStatus.
+func (in *ClusterStatus) DeepCopy() *ClusterStatus {
+	if in == nil {
+		return nil
+	}
+	out := new(ClusterStatus)
+	in.DeepCopyInto(out)
+	return out
+}

pkg/apis/servicemesh/v1alpha2/servicepolicy_types.go

@@ -47,7 +47,7 @@ type DestinationRuleSpecTemplate struct {
 
 	// Metadata of the virtual services created from this template
 	// +optional
-	metav1.ObjectMeta
+	metav1.ObjectMeta `json:"metadata,omitempty"`
 
 	// Spec indicates the behavior of a destination rule.
 	// +optional
@@ -68,42 +68,42 @@ const (
 // StrategyCondition describes current state of a strategy.
 type ServicePolicyCondition struct {
 	// Type of strategy condition, Complete or Failed.
-	Type ServicePolicyConditionType
+	Type ServicePolicyConditionType `json:"type,omitempty"`
 
 	// Status of the condition, one of True, False, Unknown
-	Status apiextensions.ConditionStatus
+	Status apiextensions.ConditionStatus `json:"status,omitempty"`
 
 	// Last time the condition was checked.
 	// +optional
-	LastProbeTime metav1.Time
+	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
 
 	// Last time the condition transit from one status to another
 	// +optional
-	LastTransitionTime metav1.Time
+	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
 
 	// reason for the condition's last transition
-	Reason string
+	Reason string `json:"reason,omitempty"`
 
 	// Human readable message indicating details about last transition.
 	// +optinal
-	Message string
+	Message string `json:"message,omitempty"`
 }
 
 // ServicePolicyStatus defines the observed state of ServicePolicy
 type ServicePolicyStatus struct {
 	// The latest available observations of an object's current state.
 	// +optional
-	Conditions []ServicePolicyCondition
+	Conditions []ServicePolicyCondition `json:"conditions,omitempty"`
 
 	// Represents time when the strategy was acknowledged by the controller.
 	// It is represented in RFC3339 form and is in UTC.
 	// +optional
-	StartTime *metav1.Time
+	StartTime *metav1.Time `json:"startTime,omitempty"`
 
 	// Represents time when the strategy was completed.
 	// It is represented in RFC3339 form and is in UTC.
 	// +optional
-	CompletionTime *metav1.Time
+	CompletionTime *metav1.Time `json:"completionTime,omitempty"`
 }
 
 // +genclient

pkg/apis/servicemesh/v1alpha2/strategy_types.go

@@ -103,17 +103,17 @@ type StrategyStatus struct {
 
 	// The latest available observations of an object's current state.
 	// +optional
-	Conditions []StrategyCondition
+	Conditions []StrategyCondition `json:"conditions,omitempty"`
 
 	// Represents time when the strategy was acknowledged by the controller.
 	// It is represented in RFC3339 form and is in UTC.
 	// +optional
-	StartTime *metav1.Time
+	StartTime *metav1.Time `json:"startTime,omitempty"`
 
 	// Represents time when the strategy was completed.
 	// It is represented in RFC3339 form and is in UTC.
 	// +optional
-	CompletionTime *metav1.Time
+	CompletionTime *metav1.Time `json:"completionTime,omitempty"`
 }
 
 type StrategyConditionType string
@@ -130,25 +130,25 @@ const (
 // StrategyCondition describes current state of a strategy.
 type StrategyCondition struct {
 	// Type of strategy condition, Complete or Failed.
-	Type StrategyConditionType
+	Type StrategyConditionType `json:"type,omitempty"`
 
 	// Status of the condition, one of True, False, Unknown
-	Status apiextensions.ConditionStatus
+	Status apiextensions.ConditionStatus `json:"status,omitempty"`
 
 	// Last time the condition was checked.
 	// +optional
-	LastProbeTime metav1.Time
+	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
 
 	// Last time the condition transit from one status to another
 	// +optional
-	LastTransitionTime metav1.Time
+	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
 
 	// reason for the condition's last transition
-	Reason string
+	Reason string `json:"reason,omitempty"`
 
 	// Human readable message indicating details about last transition.
 	// +optinal
-	Message string
+	Message string `json:"message,omitempty"`
 }
 
 // +genclient

pkg/apis/tower/group.go

@@ -1 +0,0 @@
-package tower

pkg/apis/tower/v1alpha1/doc.go

@@ -1,8 +0,0 @@
-// Package v1alpha2 contains API Schema definitions for the tower v1alpha1 API group
-// +k8s:openapi-gen=true
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=kubesphere.io/tower/pkg/apis/tower
-// +k8s:defaulter-gen=TypeMeta
-// +groupName=tower.kubesphere.io
-
-package v1alpha1

pkg/apiserver/apiserver.go

@@ -185,7 +185,9 @@ func (s *APIServer) buildHandlerChain() {
 
 	handler := s.Server.Handler
 	handler = filters.WithKubeAPIServer(handler, s.KubernetesClient.Config(), &errorResponder{})
-	handler = filters.WithMultipleClusterDispatcher(handler, dispatch.NewClusterDispatch(s.InformerFactory.KubeSphereSharedInformerFactory().Tower().V1alpha1().Agents().Lister()))
+
+	clusterDispatcher := dispatch.NewClusterDispatch(s.InformerFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Agents().Lister(), s.InformerFactory.KubeSphereSharedInformerFactory().Cluster().V1alpha1().Clusters().Lister())
+	handler = filters.WithMultipleClusterDispatcher(handler, clusterDispatcher)
 
 	excludedPaths := []string{"/oauth/*", "/kapis/config.kubesphere.io/*"}
 	pathAuthorizer, _ := path.NewAuthorizer(excludedPaths)

pkg/apiserver/config/config.go

@@ -2,11 +2,8 @@ package config
 
 import (
 	"fmt"
-	"github.com/emicklei/go-restful"
 	"github.com/spf13/viper"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	authoptions "kubesphere.io/kubesphere/pkg/apiserver/authentication/options"
-	"kubesphere.io/kubesphere/pkg/apiserver/runtime"
 	"kubesphere.io/kubesphere/pkg/simple/client/alerting"
 	"kubesphere.io/kubesphere/pkg/simple/client/cache"
 	"kubesphere.io/kubesphere/pkg/simple/client/devops/jenkins"
@@ -20,7 +17,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/simple/client/s3"
 	"kubesphere.io/kubesphere/pkg/simple/client/servicemesh"
 	"kubesphere.io/kubesphere/pkg/simple/client/sonarqube"
-	"net/http"
 	"reflect"
 	"strings"
 )
@@ -126,26 +122,6 @@ func TryLoadFromDisk() (*Config, error) {
 	return conf, nil
 }
 
-// InstallAPI installs api for config
-func (conf *Config) InstallAPI(c *restful.Container) {
-	ws := runtime.NewWebService(schema.GroupVersion{
-		Group:   "",
-		Version: "v1alpha1",
-	})
-
-	ws.Route(ws.GET("/configz").
-		To(func(request *restful.Request, response *restful.Response) {
-			conf.stripEmptyOptions()
-			response.WriteAsJson(conf.ToMap())
-		}).
-		Doc("Get system components configuration").
-		Produces(restful.MIME_JSON).
-		Writes(Config{}).
-		Returns(http.StatusOK, "ok", Config{}))
-
-	c.Add(ws)
-}
-
 // convertToMap simply converts config to map[string]bool
 // to hide sensitive information
 func (conf *Config) ToMap() map[string]bool {

pkg/apiserver/dispatch/dispatch.go

@@ -6,39 +6,59 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/util/proxy"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	"k8s.io/klog"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/apiserver/request"
-	"kubesphere.io/kubesphere/pkg/client/listers/tower/v1alpha1"
+	"kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
 	"net/http"
 	"strings"
 )
 
-const defaultMultipleClusterAgentNamespace = "kubesphere-system"
-
 // Dispatcher defines how to forward request to designated cluster based on cluster name
 type Dispatcher interface {
 	Dispatch(w http.ResponseWriter, req *http.Request, handler http.Handler)
 }
 
 type clusterDispatch struct {
-	agentLister v1alpha1.AgentLister
+	agentLister   v1alpha1.AgentLister
+	clusterLister v1alpha1.ClusterLister
 }
 
-func NewClusterDispatch(agentLister v1alpha1.AgentLister) Dispatcher {
+func NewClusterDispatch(agentLister v1alpha1.AgentLister, clusterLister v1alpha1.ClusterLister) Dispatcher {
 	return &clusterDispatch{
-		agentLister: agentLister,
+		agentLister:   agentLister,
+		clusterLister: clusterLister,
 	}
 }
 
 func (c *clusterDispatch) Dispatch(w http.ResponseWriter, req *http.Request, handler http.Handler) {
 
 	info, _ := request.RequestInfoFrom(req.Context())
-	if info.Cluster == "" { // fallback to host cluster if cluster name if empty
+
+	if len(info.Cluster) == 0 {
+		klog.Warningf("Request with empty cluster, %v", req.URL)
+		http.Error(w, fmt.Sprintf("Bad request, empty cluster"), http.StatusBadRequest)
+		return
+	}
+
+	cluster, err := c.clusterLister.Get(info.Cluster)
+	if err != nil {
+		if errors.IsNotFound(err) {
+			http.Error(w, fmt.Sprintf("cluster %s not found", info.Cluster), http.StatusNotFound)
+		} else {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+		}
+		return
+	}
+
+	// request cluster is host cluster, no need go through agent
+	if isClusterHostCluster(cluster) {
+		req.URL.Path = strings.Replace(req.URL.Path, fmt.Sprintf("/clusters/%s", info.Cluster), "", 1)
 		handler.ServeHTTP(w, req)
 		return
 	}
 
-	agent, err := c.agentLister.Agents(defaultMultipleClusterAgentNamespace).Get(info.Cluster)
+	agent, err := c.agentLister.Get(info.Cluster)
 	if err != nil {
 		if errors.IsNotFound(err) {
 			http.Error(w, fmt.Sprintf("cluster %s not found", info.Cluster), http.StatusNotFound)
@@ -65,9 +85,20 @@ func (c *clusterDispatch) Error(w http.ResponseWriter, req *http.Request, err er
 	responsewriters.InternalError(w, req, err)
 }
 
-func isAgentReady(agent *towerv1alpha1.Agent) bool {
+func isAgentReady(agent *clusterv1alpha1.Agent) bool {
 	for _, condition := range agent.Status.Conditions {
-		if condition.Type == towerv1alpha1.AgentConnected && condition.Status == corev1.ConditionTrue {
+		if condition.Type == clusterv1alpha1.AgentConnected && condition.Status == corev1.ConditionTrue {
+			return true
+		}
+	}
+
+	return false
+}
+
+//
+func isClusterHostCluster(cluster *clusterv1alpha1.Cluster) bool {
+	for key, value := range cluster.Annotations {
+		if key == clusterv1alpha1.IsHostCluster && value == "true" {
 			return true
 		}
 	}

pkg/apiserver/filters/kubeapiserver.go

@@ -1,7 +1,7 @@
 package filters
 
 import (
-	"fmt"
+	"k8s.io/apimachinery/pkg/util/proxy"
 	"k8s.io/apiserver/pkg/endpoints/handlers/responsewriters"
 	"k8s.io/client-go/rest"
 	"k8s.io/klog"
@@ -9,9 +9,6 @@ import (
 	"kubesphere.io/kubesphere/pkg/server/errors"
 	"net/http"
 	"net/url"
-	"strings"
-
-	"k8s.io/apimachinery/pkg/util/proxy"
 )
 
 // WithKubeAPIServer proxy request to kubernetes service if requests path starts with /api
@@ -35,8 +32,6 @@ func WithKubeAPIServer(handler http.Handler, config *rest.Config, failed proxy.E
 			s := *req.URL
 			s.Host = kubernetes.Host
 			s.Scheme = kubernetes.Scheme
-			// remove cluster path
-			s.Path = strings.Replace(s.Path, fmt.Sprintf("/clusters/%s", info.Cluster), "", 1)
 
 			httpProxy := proxy.NewUpgradeAwareHandler(&s, defaultTransport, true, false, failed)
 			httpProxy.ServeHTTP(w, req)

pkg/apiserver/request/requestinfo.go

@@ -78,8 +78,8 @@ type RequestInfoFactory struct {
 // /kapis/{api-group}/{version}/namespaces/{namespace}/{resource}
 // /kapis/{api-group}/{version}/namespaces/{namespace}/{resource}/{resourceName}
 // With workspaces:
-// /kapis/{api-group}/{version}/clusters/{cluster}/namespaces/{namespace}/{resource}
-// /kapis/{api-group}/{version}/clusters/{cluster}/namespaces/{namespace}/{resource}/{resourceName}
+// /kapis/clusters/{cluster}/{api-group}/{version}/namespaces/{namespace}/{resource}
+// /kapis/clusters/{cluster}/{api-group}/{version}/namespaces/{namespace}/{resource}/{resourceName}
 //
 func (r *RequestInfoFactory) NewRequestInfo(req *http.Request) (*RequestInfo, error) {
 
@@ -111,6 +111,16 @@ func (r *RequestInfoFactory) NewRequestInfo(req *http.Request) (*RequestInfo, er
 	requestInfo.APIPrefix = currentParts[0]
 	currentParts = currentParts[1:]
 
+	// URL forms: /clusters/{cluster}/*
+	if currentParts[0] == "clusters" {
+		if len(currentParts) > 1 {
+			requestInfo.Cluster = currentParts[1]
+		}
+		if len(currentParts) > 2 {
+			currentParts = currentParts[2:]
+		}
+	}
+
 	if !r.GrouplessAPIPrefixes.Has(requestInfo.APIPrefix) {
 		// one part (APIPrefix) has already been consumed, so this is actually "do we have four parts?"
 		if len(currentParts) < 3 {
@@ -150,16 +160,6 @@ func (r *RequestInfoFactory) NewRequestInfo(req *http.Request) (*RequestInfo, er
 		}
 	}
 
-	// URL forms: /clusters/{cluster}/*
-	if currentParts[0] == "clusters" {
-		if len(currentParts) > 1 {
-			requestInfo.Cluster = currentParts[1]
-		}
-		if len(currentParts) > 2 {
-			currentParts = currentParts[2:]
-		}
-	}
-
 	// URL forms: /workspaces/{workspace}/*
 	if currentParts[0] == "workspaces" {
 		if len(currentParts) > 1 {

pkg/apiserver/request/requestinfo_test.go

@@ -59,40 +59,18 @@ func TestRequestInfoFactory_NewRequestInfo(t *testing.T) {
 			expectedKubernetesRequest: false,
 		},
 		{
-			name:                      "list cluster roles",
-			url:                       "/apis/rbac.authorization.k8s.io/v1/clusters/cluster1/clusterroles",
+			name:                      "list clusterRoles of cluster gondor",
+			url:                       "/apis/clusters/gondor/rbac.authorization.k8s.io/v1/clusterroles",
 			method:                    http.MethodGet,
 			expectedErr:               nil,
 			expectedVerb:              "list",
 			expectedResource:          "clusterroles",
 			expectedIsResourceRequest: true,
-			expectedCluster:           "cluster1",
+			expectedCluster:           "gondor",
 			expectedKubernetesRequest: true,
 		},
 		{
-			name:                      "list cluster nodes",
-			url:                       "/api/v1/clusters/cluster1/nodes",
-			method:                    http.MethodGet,
-			expectedErr:               nil,
-			expectedVerb:              "list",
-			expectedResource:          "nodes",
-			expectedIsResourceRequest: true,
-			expectedCluster:           "cluster1",
-			expectedKubernetesRequest: true,
-		},
-		{
-			name:                      "list cluster nodes",
-			url:                       "/api/v1/clusters/cluster1/nodes",
-			method:                    http.MethodGet,
-			expectedErr:               nil,
-			expectedVerb:              "list",
-			expectedResource:          "nodes",
-			expectedIsResourceRequest: true,
-			expectedCluster:           "cluster1",
-			expectedKubernetesRequest: true,
-		},
-		{
-			name:                      "list cluster nodes",
+			name:                      "list nodes",
 			url:                       "/api/v1/nodes",
 			method:                    http.MethodGet,
 			expectedErr:               nil,
@@ -103,15 +81,26 @@ func TestRequestInfoFactory_NewRequestInfo(t *testing.T) {
 			expectedKubernetesRequest: true,
 		},
 		{
-			name:                      "list roles",
-			url:                       "/apis/rbac.authorization.k8s.io/v1/clusters/cluster1/namespaces/namespace1/roles",
+			name:                      "list nodes of cluster gondor",
+			url:                       "/api/clusters/gondor/v1/nodes",
+			method:                    http.MethodGet,
+			expectedErr:               nil,
+			expectedVerb:              "list",
+			expectedResource:          "nodes",
+			expectedIsResourceRequest: true,
+			expectedCluster:           "gondor",
+			expectedKubernetesRequest: true,
+		},
+		{
+			name:                      "list roles of cluster gondor",
+			url:                       "/apis/clusters/gondor/rbac.authorization.k8s.io/v1/namespaces/namespace1/roles",
 			method:                    http.MethodGet,
 			expectedErr:               nil,
 			expectedVerb:              "list",
 			expectedResource:          "roles",
 			expectedIsResourceRequest: true,
 			expectedNamespace:         "namespace1",
-			expectedCluster:           "cluster1",
+			expectedCluster:           "gondor",
 			expectedKubernetesRequest: true,
 		},
 		{
@@ -139,17 +128,41 @@ func TestRequestInfoFactory_NewRequestInfo(t *testing.T) {
 			expectedKubernetesRequest: false,
 		},
 		{
-			name:                      "list namespaces",
-			url:                       "/kapis/resources.kubesphere.io/v1alpha3/clusters/cluster1/workspaces/workspace1/namespaces",
+			name:                      "list namespaces of cluster gondor",
+			url:                       "/kapis/clusters/gondor/resources.kubesphere.io/v1alpha3/workspaces/workspace1/namespaces",
 			method:                    http.MethodGet,
 			expectedErr:               nil,
 			expectedVerb:              "list",
 			expectedResource:          "namespaces",
 			expectedIsResourceRequest: true,
 			expectedWorkspace:         "workspace1",
-			expectedCluster:           "cluster1",
+			expectedCluster:           "gondor",
 			expectedKubernetesRequest: false,
 		},
+		{
+			name:                      "list clusters",
+			url:                       "/apis/cluster.kubesphere.io/v1alpha1/clusters",
+			method:                    http.MethodGet,
+			expectedErr:               nil,
+			expectedVerb:              "list",
+			expectedResource:          "clusters",
+			expectedIsResourceRequest: true,
+			expectedWorkspace:         "",
+			expectedCluster:           "",
+			expectedKubernetesRequest: true,
+		},
+		{
+			name:                      "get cluster gondor",
+			url:                       "/apis/cluster.kubesphere.io/v1alpha1/clusters/gondor",
+			method:                    http.MethodGet,
+			expectedErr:               nil,
+			expectedVerb:              "get",
+			expectedResource:          "clusters",
+			expectedIsResourceRequest: true,
+			expectedWorkspace:         "",
+			expectedCluster:           "",
+			expectedKubernetesRequest: true,
+		},
 		{
 			name:                      "random query",
 			url:                       "/foo/bar",

pkg/client/clientset/versioned/clientset.go

@@ -24,34 +24,39 @@ import (
 	discovery "k8s.io/client-go/discovery"
 	rest "k8s.io/client-go/rest"
 	flowcontrol "k8s.io/client-go/util/flowcontrol"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1"
 	devopsv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/devops/v1alpha1"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/iam/v1alpha2"
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/network/v1alpha1"
 	servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2"
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tenant/v1alpha1"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tower/v1alpha1"
 )
 
 type Interface interface {
 	Discovery() discovery.DiscoveryInterface
+	ClusterV1alpha1() clusterv1alpha1.ClusterV1alpha1Interface
 	DevopsV1alpha1() devopsv1alpha1.DevopsV1alpha1Interface
 	IamV1alpha2() iamv1alpha2.IamV1alpha2Interface
 	NetworkV1alpha1() networkv1alpha1.NetworkV1alpha1Interface
 	ServicemeshV1alpha2() servicemeshv1alpha2.ServicemeshV1alpha2Interface
 	TenantV1alpha1() tenantv1alpha1.TenantV1alpha1Interface
-	TowerV1alpha1() towerv1alpha1.TowerV1alpha1Interface
 }
 
 // Clientset contains the clients for groups. Each group has exactly one
 // version included in a Clientset.
 type Clientset struct {
 	*discovery.DiscoveryClient
+	clusterV1alpha1     *clusterv1alpha1.ClusterV1alpha1Client
 	devopsV1alpha1      *devopsv1alpha1.DevopsV1alpha1Client
 	iamV1alpha2         *iamv1alpha2.IamV1alpha2Client
 	networkV1alpha1     *networkv1alpha1.NetworkV1alpha1Client
 	servicemeshV1alpha2 *servicemeshv1alpha2.ServicemeshV1alpha2Client
 	tenantV1alpha1      *tenantv1alpha1.TenantV1alpha1Client
-	towerV1alpha1       *towerv1alpha1.TowerV1alpha1Client
+}
+
+// ClusterV1alpha1 retrieves the ClusterV1alpha1Client
+func (c *Clientset) ClusterV1alpha1() clusterv1alpha1.ClusterV1alpha1Interface {
+	return c.clusterV1alpha1
 }
 
 // DevopsV1alpha1 retrieves the DevopsV1alpha1Client
@@ -79,11 +84,6 @@ func (c *Clientset) TenantV1alpha1() tenantv1alpha1.TenantV1alpha1Interface {
 	return c.tenantV1alpha1
 }
 
-// TowerV1alpha1 retrieves the TowerV1alpha1Client
-func (c *Clientset) TowerV1alpha1() towerv1alpha1.TowerV1alpha1Interface {
-	return c.towerV1alpha1
-}
-
 // Discovery retrieves the DiscoveryClient
 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
 	if c == nil {
@@ -105,6 +105,10 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	}
 	var cs Clientset
 	var err error
+	cs.clusterV1alpha1, err = clusterv1alpha1.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 	cs.devopsV1alpha1, err = devopsv1alpha1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
@@ -125,10 +129,6 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
-	cs.towerV1alpha1, err = towerv1alpha1.NewForConfig(&configShallowCopy)
-	if err != nil {
-		return nil, err
-	}
 
 	cs.DiscoveryClient, err = discovery.NewDiscoveryClientForConfig(&configShallowCopy)
 	if err != nil {
@@ -141,12 +141,12 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 // panics if there is an error in the config.
 func NewForConfigOrDie(c *rest.Config) *Clientset {
 	var cs Clientset
+	cs.clusterV1alpha1 = clusterv1alpha1.NewForConfigOrDie(c)
 	cs.devopsV1alpha1 = devopsv1alpha1.NewForConfigOrDie(c)
 	cs.iamV1alpha2 = iamv1alpha2.NewForConfigOrDie(c)
 	cs.networkV1alpha1 = networkv1alpha1.NewForConfigOrDie(c)
 	cs.servicemeshV1alpha2 = servicemeshv1alpha2.NewForConfigOrDie(c)
 	cs.tenantV1alpha1 = tenantv1alpha1.NewForConfigOrDie(c)
-	cs.towerV1alpha1 = towerv1alpha1.NewForConfigOrDie(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClientForConfigOrDie(c)
 	return &cs
@@ -155,12 +155,12 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
 // New creates a new Clientset for the given RESTClient.
 func New(c rest.Interface) *Clientset {
 	var cs Clientset
+	cs.clusterV1alpha1 = clusterv1alpha1.New(c)
 	cs.devopsV1alpha1 = devopsv1alpha1.New(c)
 	cs.iamV1alpha2 = iamv1alpha2.New(c)
 	cs.networkV1alpha1 = networkv1alpha1.New(c)
 	cs.servicemeshV1alpha2 = servicemeshv1alpha2.New(c)
 	cs.tenantV1alpha1 = tenantv1alpha1.New(c)
-	cs.towerV1alpha1 = towerv1alpha1.New(c)
 
 	cs.DiscoveryClient = discovery.NewDiscoveryClient(c)
 	return &cs

pkg/client/clientset/versioned/fake/clientset_generated.go

@@ -25,6 +25,8 @@ import (
 	fakediscovery "k8s.io/client-go/discovery/fake"
 	"k8s.io/client-go/testing"
 	clientset "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1"
+	fakeclusterv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake"
 	devopsv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/devops/v1alpha1"
 	fakedevopsv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/devops/v1alpha1/fake"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/iam/v1alpha2"
@@ -35,8 +37,6 @@ import (
 	fakeservicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/servicemesh/v1alpha2/fake"
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tenant/v1alpha1"
 	faketenantv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tenant/v1alpha1/fake"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tower/v1alpha1"
-	faketowerv1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tower/v1alpha1/fake"
 )
 
 // NewSimpleClientset returns a clientset that will respond with the provided objects.
@@ -86,6 +86,11 @@ func (c *Clientset) Tracker() testing.ObjectTracker {
 
 var _ clientset.Interface = &Clientset{}
 
+// ClusterV1alpha1 retrieves the ClusterV1alpha1Client
+func (c *Clientset) ClusterV1alpha1() clusterv1alpha1.ClusterV1alpha1Interface {
+	return &fakeclusterv1alpha1.FakeClusterV1alpha1{Fake: &c.Fake}
+}
+
 // DevopsV1alpha1 retrieves the DevopsV1alpha1Client
 func (c *Clientset) DevopsV1alpha1() devopsv1alpha1.DevopsV1alpha1Interface {
 	return &fakedevopsv1alpha1.FakeDevopsV1alpha1{Fake: &c.Fake}
@@ -110,8 +115,3 @@ func (c *Clientset) ServicemeshV1alpha2() servicemeshv1alpha2.ServicemeshV1alpha
 func (c *Clientset) TenantV1alpha1() tenantv1alpha1.TenantV1alpha1Interface {
 	return &faketenantv1alpha1.FakeTenantV1alpha1{Fake: &c.Fake}
 }
-
-// TowerV1alpha1 retrieves the TowerV1alpha1Client
-func (c *Clientset) TowerV1alpha1() towerv1alpha1.TowerV1alpha1Interface {
-	return &faketowerv1alpha1.FakeTowerV1alpha1{Fake: &c.Fake}
-}

pkg/client/clientset/versioned/fake/register.go

@@ -24,24 +24,24 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 	devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2"
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
 )
 
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
 var parameterCodec = runtime.NewParameterCodec(scheme)
 var localSchemeBuilder = runtime.SchemeBuilder{
+	clusterv1alpha1.AddToScheme,
 	devopsv1alpha1.AddToScheme,
 	iamv1alpha2.AddToScheme,
 	networkv1alpha1.AddToScheme,
 	servicemeshv1alpha2.AddToScheme,
 	tenantv1alpha1.AddToScheme,
-	towerv1alpha1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition

pkg/client/clientset/versioned/scheme/register.go

@@ -24,24 +24,24 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 	devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1"
 	iamv1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2"
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
 )
 
 var Scheme = runtime.NewScheme()
 var Codecs = serializer.NewCodecFactory(Scheme)
 var ParameterCodec = runtime.NewParameterCodec(Scheme)
 var localSchemeBuilder = runtime.SchemeBuilder{
+	clusterv1alpha1.AddToScheme,
 	devopsv1alpha1.AddToScheme,
 	iamv1alpha2.AddToScheme,
 	networkv1alpha1.AddToScheme,
 	servicemeshv1alpha2.AddToScheme,
 	tenantv1alpha1.AddToScheme,
-	towerv1alpha1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition

pkg/client/clientset/versioned/typed/cluster/v1alpha1/agent.go

@@ -25,14 +25,14 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	rest "k8s.io/client-go/rest"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 	scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme"
 )
 
 // AgentsGetter has a method to return a AgentInterface.
 // A group's client should implement this interface.
 type AgentsGetter interface {
-	Agents(namespace string) AgentInterface
+	Agents() AgentInterface
 }
 
 // AgentInterface has methods to work with Agent resources.
@@ -52,14 +52,12 @@ type AgentInterface interface {
 // agents implements AgentInterface
 type agents struct {
 	client rest.Interface
-	ns     string
 }
 
 // newAgents returns a Agents
-func newAgents(c *TowerV1alpha1Client, namespace string) *agents {
+func newAgents(c *ClusterV1alpha1Client) *agents {
 	return &agents{
 		client: c.RESTClient(),
-		ns:     namespace,
 	}
 }
 
@@ -67,7 +65,6 @@ func newAgents(c *TowerV1alpha1Client, namespace string) *agents {
 func (c *agents) Get(name string, options v1.GetOptions) (result *v1alpha1.Agent, err error) {
 	result = &v1alpha1.Agent{}
 	err = c.client.Get().
-		Namespace(c.ns).
 		Resource("agents").
 		Name(name).
 		VersionedParams(&options, scheme.ParameterCodec).
@@ -84,7 +81,6 @@ func (c *agents) List(opts v1.ListOptions) (result *v1alpha1.AgentList, err erro
 	}
 	result = &v1alpha1.AgentList{}
 	err = c.client.Get().
-		Namespace(c.ns).
 		Resource("agents").
 		VersionedParams(&opts, scheme.ParameterCodec).
 		Timeout(timeout).
@@ -101,7 +97,6 @@ func (c *agents) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	}
 	opts.Watch = true
 	return c.client.Get().
-		Namespace(c.ns).
 		Resource("agents").
 		VersionedParams(&opts, scheme.ParameterCodec).
 		Timeout(timeout).
@@ -112,7 +107,6 @@ func (c *agents) Watch(opts v1.ListOptions) (watch.Interface, error) {
 func (c *agents) Create(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err error) {
 	result = &v1alpha1.Agent{}
 	err = c.client.Post().
-		Namespace(c.ns).
 		Resource("agents").
 		Body(agent).
 		Do().
@@ -124,7 +118,6 @@ func (c *agents) Create(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err erro
 func (c *agents) Update(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err error) {
 	result = &v1alpha1.Agent{}
 	err = c.client.Put().
-		Namespace(c.ns).
 		Resource("agents").
 		Name(agent.Name).
 		Body(agent).
@@ -139,7 +132,6 @@ func (c *agents) Update(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err erro
 func (c *agents) UpdateStatus(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err error) {
 	result = &v1alpha1.Agent{}
 	err = c.client.Put().
-		Namespace(c.ns).
 		Resource("agents").
 		Name(agent.Name).
 		SubResource("status").
@@ -152,7 +144,6 @@ func (c *agents) UpdateStatus(agent *v1alpha1.Agent) (result *v1alpha1.Agent, er
 // Delete takes name of the agent and deletes it. Returns an error if one occurs.
 func (c *agents) Delete(name string, options *v1.DeleteOptions) error {
 	return c.client.Delete().
-		Namespace(c.ns).
 		Resource("agents").
 		Name(name).
 		Body(options).
@@ -167,7 +158,6 @@ func (c *agents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.List
 		timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
 	}
 	return c.client.Delete().
-		Namespace(c.ns).
 		Resource("agents").
 		VersionedParams(&listOptions, scheme.ParameterCodec).
 		Timeout(timeout).
@@ -180,7 +170,6 @@ func (c *agents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.List
 func (c *agents) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Agent, err error) {
 	result = &v1alpha1.Agent{}
 	err = c.client.Patch(pt).
-		Namespace(c.ns).
 		Resource("agents").
 		SubResource(subresources...).
 		Name(name).

pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster.go

@@ -0,0 +1,180 @@
+/*
+Copyright 2019 The KubeSphere authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"time"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	rest "k8s.io/client-go/rest"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
+	scheme "kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme"
+)
+
+// ClustersGetter has a method to return a ClusterInterface.
+// A group's client should implement this interface.
+type ClustersGetter interface {
+	Clusters() ClusterInterface
+}
+
+// ClusterInterface has methods to work with Cluster resources.
+type ClusterInterface interface {
+	Create(*v1alpha1.Cluster) (*v1alpha1.Cluster, error)
+	Update(*v1alpha1.Cluster) (*v1alpha1.Cluster, error)
+	UpdateStatus(*v1alpha1.Cluster) (*v1alpha1.Cluster, error)
+	Delete(name string, options *v1.DeleteOptions) error
+	DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error
+	Get(name string, options v1.GetOptions) (*v1alpha1.Cluster, error)
+	List(opts v1.ListOptions) (*v1alpha1.ClusterList, error)
+	Watch(opts v1.ListOptions) (watch.Interface, error)
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Cluster, err error)
+	ClusterExpansion
+}
+
+// clusters implements ClusterInterface
+type clusters struct {
+	client rest.Interface
+}
+
+// newClusters returns a Clusters
+func newClusters(c *ClusterV1alpha1Client) *clusters {
+	return &clusters{
+		client: c.RESTClient(),
+	}
+}
+
+// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
+func (c *clusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) {
+	result = &v1alpha1.Cluster{}
+	err = c.client.Get().
+		Resource("clusters").
+		Name(name).
+		VersionedParams(&options, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// List takes label and field selectors, and returns the list of Clusters that match those selectors.
+func (c *clusters) List(opts v1.ListOptions) (result *v1alpha1.ClusterList, err error) {
+	var timeout time.Duration
+	if opts.TimeoutSeconds != nil {
+		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+	}
+	result = &v1alpha1.ClusterList{}
+	err = c.client.Get().
+		Resource("clusters").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Do().
+		Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested clusters.
+func (c *clusters) Watch(opts v1.ListOptions) (watch.Interface, error) {
+	var timeout time.Duration
+	if opts.TimeoutSeconds != nil {
+		timeout = time.Duration(*opts.TimeoutSeconds) * time.Second
+	}
+	opts.Watch = true
+	return c.client.Get().
+		Resource("clusters").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Timeout(timeout).
+		Watch()
+}
+
+// Create takes the representation of a cluster and creates it.  Returns the server's representation of the cluster, and an error, if there is any.
+func (c *clusters) Create(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) {
+	result = &v1alpha1.Cluster{}
+	err = c.client.Post().
+		Resource("clusters").
+		Body(cluster).
+		Do().
+		Into(result)
+	return
+}
+
+// Update takes the representation of a cluster and updates it. Returns the server's representation of the cluster, and an error, if there is any.
+func (c *clusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) {
+	result = &v1alpha1.Cluster{}
+	err = c.client.Put().
+		Resource("clusters").
+		Name(cluster.Name).
+		Body(cluster).
+		Do().
+		Into(result)
+	return
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+
+func (c *clusters) UpdateStatus(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) {
+	result = &v1alpha1.Cluster{}
+	err = c.client.Put().
+		Resource("clusters").
+		Name(cluster.Name).
+		SubResource("status").
+		Body(cluster).
+		Do().
+		Into(result)
+	return
+}
+
+// Delete takes name of the cluster and deletes it. Returns an error if one occurs.
+func (c *clusters) Delete(name string, options *v1.DeleteOptions) error {
+	return c.client.Delete().
+		Resource("clusters").
+		Name(name).
+		Body(options).
+		Do().
+		Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *clusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+	var timeout time.Duration
+	if listOptions.TimeoutSeconds != nil {
+		timeout = time.Duration(*listOptions.TimeoutSeconds) * time.Second
+	}
+	return c.client.Delete().
+		Resource("clusters").
+		VersionedParams(&listOptions, scheme.ParameterCodec).
+		Timeout(timeout).
+		Body(options).
+		Do().
+		Error()
+}
+
+// Patch applies the patch and returns the patched cluster.
+func (c *clusters) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Cluster, err error) {
+	result = &v1alpha1.Cluster{}
+	err = c.client.Patch(pt).
+		Resource("clusters").
+		SubResource(subresources...).
+		Name(name).
+		Body(data).
+		Do().
+		Into(result)
+	return
+}

pkg/client/clientset/versioned/typed/cluster/v1alpha1/cluster_client.go

@@ -20,26 +20,31 @@ package v1alpha1
 
 import (
 	rest "k8s.io/client-go/rest"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 	"kubesphere.io/kubesphere/pkg/client/clientset/versioned/scheme"
 )
 
-type TowerV1alpha1Interface interface {
+type ClusterV1alpha1Interface interface {
 	RESTClient() rest.Interface
 	AgentsGetter
+	ClustersGetter
 }
 
-// TowerV1alpha1Client is used to interact with features provided by the tower.kubesphere.io group.
-type TowerV1alpha1Client struct {
+// ClusterV1alpha1Client is used to interact with features provided by the cluster.kubesphere.io group.
+type ClusterV1alpha1Client struct {
 	restClient rest.Interface
 }
 
-func (c *TowerV1alpha1Client) Agents(namespace string) AgentInterface {
-	return newAgents(c, namespace)
+func (c *ClusterV1alpha1Client) Agents() AgentInterface {
+	return newAgents(c)
 }
 
-// NewForConfig creates a new TowerV1alpha1Client for the given config.
-func NewForConfig(c *rest.Config) (*TowerV1alpha1Client, error) {
+func (c *ClusterV1alpha1Client) Clusters() ClusterInterface {
+	return newClusters(c)
+}
+
+// NewForConfig creates a new ClusterV1alpha1Client for the given config.
+func NewForConfig(c *rest.Config) (*ClusterV1alpha1Client, error) {
 	config := *c
 	if err := setConfigDefaults(&config); err != nil {
 		return nil, err
@@ -48,12 +53,12 @@ func NewForConfig(c *rest.Config) (*TowerV1alpha1Client, error) {
 	if err != nil {
 		return nil, err
 	}
-	return &TowerV1alpha1Client{client}, nil
+	return &ClusterV1alpha1Client{client}, nil
 }
 
-// NewForConfigOrDie creates a new TowerV1alpha1Client for the given config and
+// NewForConfigOrDie creates a new ClusterV1alpha1Client for the given config and
 // panics if there is an error in the config.
-func NewForConfigOrDie(c *rest.Config) *TowerV1alpha1Client {
+func NewForConfigOrDie(c *rest.Config) *ClusterV1alpha1Client {
 	client, err := NewForConfig(c)
 	if err != nil {
 		panic(err)
@@ -61,9 +66,9 @@ func NewForConfigOrDie(c *rest.Config) *TowerV1alpha1Client {
 	return client
 }
 
-// New creates a new TowerV1alpha1Client for the given RESTClient.
-func New(c rest.Interface) *TowerV1alpha1Client {
-	return &TowerV1alpha1Client{c}
+// New creates a new ClusterV1alpha1Client for the given RESTClient.
+func New(c rest.Interface) *ClusterV1alpha1Client {
+	return &ClusterV1alpha1Client{c}
 }
 
 func setConfigDefaults(config *rest.Config) error {
@@ -81,7 +86,7 @@ func setConfigDefaults(config *rest.Config) error {
 
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
-func (c *TowerV1alpha1Client) RESTClient() rest.Interface {
+func (c *ClusterV1alpha1Client) RESTClient() rest.Interface {
 	if c == nil {
 		return nil
 	}

pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_agent.go

@@ -25,24 +25,22 @@ import (
 	types "k8s.io/apimachinery/pkg/types"
 	watch "k8s.io/apimachinery/pkg/watch"
 	testing "k8s.io/client-go/testing"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 )
 
 // FakeAgents implements AgentInterface
 type FakeAgents struct {
-	Fake *FakeTowerV1alpha1
-	ns   string
+	Fake *FakeClusterV1alpha1
 }
 
-var agentsResource = schema.GroupVersionResource{Group: "tower.kubesphere.io", Version: "v1alpha1", Resource: "agents"}
+var agentsResource = schema.GroupVersionResource{Group: "cluster.kubesphere.io", Version: "v1alpha1", Resource: "agents"}
 
-var agentsKind = schema.GroupVersionKind{Group: "tower.kubesphere.io", Version: "v1alpha1", Kind: "Agent"}
+var agentsKind = schema.GroupVersionKind{Group: "cluster.kubesphere.io", Version: "v1alpha1", Kind: "Agent"}
 
 // Get takes name of the agent, and returns the corresponding agent object, and an error if there is any.
 func (c *FakeAgents) Get(name string, options v1.GetOptions) (result *v1alpha1.Agent, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewGetAction(agentsResource, c.ns, name), &v1alpha1.Agent{})
-
+		Invokes(testing.NewRootGetAction(agentsResource, name), &v1alpha1.Agent{})
 	if obj == nil {
 		return nil, err
 	}
@@ -52,8 +50,7 @@ func (c *FakeAgents) Get(name string, options v1.GetOptions) (result *v1alpha1.A
 // List takes label and field selectors, and returns the list of Agents that match those selectors.
 func (c *FakeAgents) List(opts v1.ListOptions) (result *v1alpha1.AgentList, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewListAction(agentsResource, agentsKind, c.ns, opts), &v1alpha1.AgentList{})
-
+		Invokes(testing.NewRootListAction(agentsResource, agentsKind, opts), &v1alpha1.AgentList{})
 	if obj == nil {
 		return nil, err
 	}
@@ -74,15 +71,13 @@ func (c *FakeAgents) List(opts v1.ListOptions) (result *v1alpha1.AgentList, err
 // Watch returns a watch.Interface that watches the requested agents.
 func (c *FakeAgents) Watch(opts v1.ListOptions) (watch.Interface, error) {
 	return c.Fake.
-		InvokesWatch(testing.NewWatchAction(agentsResource, c.ns, opts))
-
+		InvokesWatch(testing.NewRootWatchAction(agentsResource, opts))
 }
 
 // Create takes the representation of a agent and creates it.  Returns the server's representation of the agent, and an error, if there is any.
 func (c *FakeAgents) Create(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewCreateAction(agentsResource, c.ns, agent), &v1alpha1.Agent{})
-
+		Invokes(testing.NewRootCreateAction(agentsResource, agent), &v1alpha1.Agent{})
 	if obj == nil {
 		return nil, err
 	}
@@ -92,8 +87,7 @@ func (c *FakeAgents) Create(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err
 // Update takes the representation of a agent and updates it. Returns the server's representation of the agent, and an error, if there is any.
 func (c *FakeAgents) Update(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewUpdateAction(agentsResource, c.ns, agent), &v1alpha1.Agent{})
-
+		Invokes(testing.NewRootUpdateAction(agentsResource, agent), &v1alpha1.Agent{})
 	if obj == nil {
 		return nil, err
 	}
@@ -104,8 +98,7 @@ func (c *FakeAgents) Update(agent *v1alpha1.Agent) (result *v1alpha1.Agent, err
 // Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
 func (c *FakeAgents) UpdateStatus(agent *v1alpha1.Agent) (*v1alpha1.Agent, error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewUpdateSubresourceAction(agentsResource, "status", c.ns, agent), &v1alpha1.Agent{})
-
+		Invokes(testing.NewRootUpdateSubresourceAction(agentsResource, "status", agent), &v1alpha1.Agent{})
 	if obj == nil {
 		return nil, err
 	}
@@ -115,14 +108,13 @@ func (c *FakeAgents) UpdateStatus(agent *v1alpha1.Agent) (*v1alpha1.Agent, error
 // Delete takes name of the agent and deletes it. Returns an error if one occurs.
 func (c *FakeAgents) Delete(name string, options *v1.DeleteOptions) error {
 	_, err := c.Fake.
-		Invokes(testing.NewDeleteAction(agentsResource, c.ns, name), &v1alpha1.Agent{})
-
+		Invokes(testing.NewRootDeleteAction(agentsResource, name), &v1alpha1.Agent{})
 	return err
 }
 
 // DeleteCollection deletes a collection of objects.
 func (c *FakeAgents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
-	action := testing.NewDeleteCollectionAction(agentsResource, c.ns, listOptions)
+	action := testing.NewRootDeleteCollectionAction(agentsResource, listOptions)
 
 	_, err := c.Fake.Invokes(action, &v1alpha1.AgentList{})
 	return err
@@ -131,8 +123,7 @@ func (c *FakeAgents) DeleteCollection(options *v1.DeleteOptions, listOptions v1.
 // Patch applies the patch and returns the patched agent.
 func (c *FakeAgents) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Agent, err error) {
 	obj, err := c.Fake.
-		Invokes(testing.NewPatchSubresourceAction(agentsResource, c.ns, name, pt, data, subresources...), &v1alpha1.Agent{})
-
+		Invokes(testing.NewRootPatchSubresourceAction(agentsResource, name, pt, data, subresources...), &v1alpha1.Agent{})
 	if obj == nil {
 		return nil, err
 	}

pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_cluster.go

@@ -0,0 +1,131 @@
+/*
+Copyright 2019 The KubeSphere authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by client-gen. DO NOT EDIT.
+
+package fake
+
+import (
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	testing "k8s.io/client-go/testing"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
+)
+
+// FakeClusters implements ClusterInterface
+type FakeClusters struct {
+	Fake *FakeClusterV1alpha1
+}
+
+var clustersResource = schema.GroupVersionResource{Group: "cluster.kubesphere.io", Version: "v1alpha1", Resource: "clusters"}
+
+var clustersKind = schema.GroupVersionKind{Group: "cluster.kubesphere.io", Version: "v1alpha1", Kind: "Cluster"}
+
+// Get takes name of the cluster, and returns the corresponding cluster object, and an error if there is any.
+func (c *FakeClusters) Get(name string, options v1.GetOptions) (result *v1alpha1.Cluster, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewRootGetAction(clustersResource, name), &v1alpha1.Cluster{})
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.Cluster), err
+}
+
+// List takes label and field selectors, and returns the list of Clusters that match those selectors.
+func (c *FakeClusters) List(opts v1.ListOptions) (result *v1alpha1.ClusterList, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewRootListAction(clustersResource, clustersKind, opts), &v1alpha1.ClusterList{})
+	if obj == nil {
+		return nil, err
+	}
+
+	label, _, _ := testing.ExtractFromListOptions(opts)
+	if label == nil {
+		label = labels.Everything()
+	}
+	list := &v1alpha1.ClusterList{ListMeta: obj.(*v1alpha1.ClusterList).ListMeta}
+	for _, item := range obj.(*v1alpha1.ClusterList).Items {
+		if label.Matches(labels.Set(item.Labels)) {
+			list.Items = append(list.Items, item)
+		}
+	}
+	return list, err
+}
+
+// Watch returns a watch.Interface that watches the requested clusters.
+func (c *FakeClusters) Watch(opts v1.ListOptions) (watch.Interface, error) {
+	return c.Fake.
+		InvokesWatch(testing.NewRootWatchAction(clustersResource, opts))
+}
+
+// Create takes the representation of a cluster and creates it.  Returns the server's representation of the cluster, and an error, if there is any.
+func (c *FakeClusters) Create(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewRootCreateAction(clustersResource, cluster), &v1alpha1.Cluster{})
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.Cluster), err
+}
+
+// Update takes the representation of a cluster and updates it. Returns the server's representation of the cluster, and an error, if there is any.
+func (c *FakeClusters) Update(cluster *v1alpha1.Cluster) (result *v1alpha1.Cluster, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewRootUpdateAction(clustersResource, cluster), &v1alpha1.Cluster{})
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.Cluster), err
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+func (c *FakeClusters) UpdateStatus(cluster *v1alpha1.Cluster) (*v1alpha1.Cluster, error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewRootUpdateSubresourceAction(clustersResource, "status", cluster), &v1alpha1.Cluster{})
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.Cluster), err
+}
+
+// Delete takes name of the cluster and deletes it. Returns an error if one occurs.
+func (c *FakeClusters) Delete(name string, options *v1.DeleteOptions) error {
+	_, err := c.Fake.
+		Invokes(testing.NewRootDeleteAction(clustersResource, name), &v1alpha1.Cluster{})
+	return err
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *FakeClusters) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+	action := testing.NewRootDeleteCollectionAction(clustersResource, listOptions)
+
+	_, err := c.Fake.Invokes(action, &v1alpha1.ClusterList{})
+	return err
+}
+
+// Patch applies the patch and returns the patched cluster.
+func (c *FakeClusters) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1alpha1.Cluster, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewRootPatchSubresourceAction(clustersResource, name, pt, data, subresources...), &v1alpha1.Cluster{})
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1alpha1.Cluster), err
+}

pkg/client/clientset/versioned/typed/cluster/v1alpha1/fake/fake_cluster_client.go

@@ -21,20 +21,24 @@ package fake
 import (
 	rest "k8s.io/client-go/rest"
 	testing "k8s.io/client-go/testing"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/tower/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1"
 )
 
-type FakeTowerV1alpha1 struct {
+type FakeClusterV1alpha1 struct {
 	*testing.Fake
 }
 
-func (c *FakeTowerV1alpha1) Agents(namespace string) v1alpha1.AgentInterface {
-	return &FakeAgents{c, namespace}
+func (c *FakeClusterV1alpha1) Agents() v1alpha1.AgentInterface {
+	return &FakeAgents{c}
+}
+
+func (c *FakeClusterV1alpha1) Clusters() v1alpha1.ClusterInterface {
+	return &FakeClusters{c}
 }
 
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
-func (c *FakeTowerV1alpha1) RESTClient() rest.Interface {
+func (c *FakeClusterV1alpha1) RESTClient() rest.Interface {
 	var ret *rest.RESTClient
 	return ret
 }

pkg/client/clientset/versioned/typed/cluster/v1alpha1/generated_expansion.go

@@ -19,3 +19,5 @@ limitations under the License.
 package v1alpha1
 
 type AgentExpansion interface{}
+
+type ClusterExpansion interface{}

pkg/client/informers/externalversions/cluster/interface.go

@@ -16,11 +16,11 @@ limitations under the License.
 
 // Code generated by informer-gen. DO NOT EDIT.
 
-package tower
+package cluster
 
 import (
+	v1alpha1 "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/client/informers/externalversions/tower/v1alpha1"
 )
 
 // Interface provides access to each of this group's versions.

pkg/client/informers/externalversions/cluster/v1alpha1/agent.go

@@ -25,10 +25,10 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	cache "k8s.io/client-go/tools/cache"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 	versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/tower/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
 )
 
 // AgentInformer provides access to a shared informer and lister for
@@ -41,47 +41,46 @@ type AgentInformer interface {
 type agentInformer struct {
 	factory          internalinterfaces.SharedInformerFactory
 	tweakListOptions internalinterfaces.TweakListOptionsFunc
-	namespace        string
 }
 
 // NewAgentInformer constructs a new informer for Agent type.
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
-func NewAgentInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
-	return NewFilteredAgentInformer(client, namespace, resyncPeriod, indexers, nil)
+func NewAgentInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return NewFilteredAgentInformer(client, resyncPeriod, indexers, nil)
 }
 
 // NewFilteredAgentInformer constructs a new informer for Agent type.
 // Always prefer using an informer factory to get a shared informer instead of getting an independent
 // one. This reduces memory footprint and number of connections to the server.
-func NewFilteredAgentInformer(client versioned.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
+func NewFilteredAgentInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
 	return cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.TowerV1alpha1().Agents(namespace).List(options)
+				return client.ClusterV1alpha1().Agents().List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
 				if tweakListOptions != nil {
 					tweakListOptions(&options)
 				}
-				return client.TowerV1alpha1().Agents(namespace).Watch(options)
+				return client.ClusterV1alpha1().Agents().Watch(options)
 			},
 		},
-		&towerv1alpha1.Agent{},
+		&clusterv1alpha1.Agent{},
 		resyncPeriod,
 		indexers,
 	)
 }
 
 func (f *agentInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
-	return NewFilteredAgentInformer(client, f.namespace, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
+	return NewFilteredAgentInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
 }
 
 func (f *agentInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&towerv1alpha1.Agent{}, f.defaultInformer)
+	return f.factory.InformerFor(&clusterv1alpha1.Agent{}, f.defaultInformer)
 }
 
 func (f *agentInformer) Lister() v1alpha1.AgentLister {

pkg/client/informers/externalversions/cluster/v1alpha1/cluster.go

@@ -0,0 +1,88 @@
+/*
+Copyright 2019 The KubeSphere authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by informer-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	time "time"
+
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	watch "k8s.io/apimachinery/pkg/watch"
+	cache "k8s.io/client-go/tools/cache"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
+	versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
+	internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
+)
+
+// ClusterInformer provides access to a shared informer and lister for
+// Clusters.
+type ClusterInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() v1alpha1.ClusterLister
+}
+
+type clusterInformer struct {
+	factory          internalinterfaces.SharedInformerFactory
+	tweakListOptions internalinterfaces.TweakListOptionsFunc
+}
+
+// NewClusterInformer constructs a new informer for Cluster type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewClusterInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return NewFilteredClusterInformer(client, resyncPeriod, indexers, nil)
+}
+
+// NewFilteredClusterInformer constructs a new informer for Cluster type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewFilteredClusterInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ClusterV1alpha1().Clusters().List(options)
+			},
+			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
+				if tweakListOptions != nil {
+					tweakListOptions(&options)
+				}
+				return client.ClusterV1alpha1().Clusters().Watch(options)
+			},
+		},
+		&clusterv1alpha1.Cluster{},
+		resyncPeriod,
+		indexers,
+	)
+}
+
+func (f *clusterInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	return NewFilteredClusterInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
+}
+
+func (f *clusterInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&clusterv1alpha1.Cluster{}, f.defaultInformer)
+}
+
+func (f *clusterInformer) Lister() v1alpha1.ClusterLister {
+	return v1alpha1.NewClusterLister(f.Informer().GetIndexer())
+}

pkg/client/informers/externalversions/cluster/v1alpha1/interface.go

@@ -26,6 +26,8 @@ import (
 type Interface interface {
 	// Agents returns a AgentInformer.
 	Agents() AgentInformer
+	// Clusters returns a ClusterInformer.
+	Clusters() ClusterInformer
 }
 
 type version struct {
@@ -41,5 +43,10 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList
 
 // Agents returns a AgentInformer.
 func (v *version) Agents() AgentInformer {
-	return &agentInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
+	return &agentInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
+}
+
+// Clusters returns a ClusterInformer.
+func (v *version) Clusters() ClusterInformer {
+	return &clusterInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
 }

pkg/client/informers/externalversions/factory.go

@@ -28,13 +28,13 @@ import (
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
 	versioned "kubesphere.io/kubesphere/pkg/client/clientset/versioned"
+	cluster "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster"
 	devops "kubesphere.io/kubesphere/pkg/client/informers/externalversions/devops"
 	iam "kubesphere.io/kubesphere/pkg/client/informers/externalversions/iam"
 	internalinterfaces "kubesphere.io/kubesphere/pkg/client/informers/externalversions/internalinterfaces"
 	network "kubesphere.io/kubesphere/pkg/client/informers/externalversions/network"
 	servicemesh "kubesphere.io/kubesphere/pkg/client/informers/externalversions/servicemesh"
 	tenant "kubesphere.io/kubesphere/pkg/client/informers/externalversions/tenant"
-	tower "kubesphere.io/kubesphere/pkg/client/informers/externalversions/tower"
 )
 
 // SharedInformerOption defines the functional option type for SharedInformerFactory.
@@ -177,12 +177,16 @@ type SharedInformerFactory interface {
 	ForResource(resource schema.GroupVersionResource) (GenericInformer, error)
 	WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool
 
+	Cluster() cluster.Interface
 	Devops() devops.Interface
 	Iam() iam.Interface
 	Network() network.Interface
 	Servicemesh() servicemesh.Interface
 	Tenant() tenant.Interface
-	Tower() tower.Interface
+}
+
+func (f *sharedInformerFactory) Cluster() cluster.Interface {
+	return cluster.New(f, f.namespace, f.tweakListOptions)
 }
 
 func (f *sharedInformerFactory) Devops() devops.Interface {
@@ -204,7 +208,3 @@ func (f *sharedInformerFactory) Servicemesh() servicemesh.Interface {
 func (f *sharedInformerFactory) Tenant() tenant.Interface {
 	return tenant.New(f, f.namespace, f.tweakListOptions)
 }
-
-func (f *sharedInformerFactory) Tower() tower.Interface {
-	return tower.New(f, f.namespace, f.tweakListOptions)
-}

pkg/client/informers/externalversions/generic.go

@@ -23,12 +23,12 @@ import (
 
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	cache "k8s.io/client-go/tools/cache"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
+	devopsv1alpha1 "kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1"
 	v1alpha2 "kubesphere.io/kubesphere/pkg/apis/iam/v1alpha2"
 	networkv1alpha1 "kubesphere.io/kubesphere/pkg/apis/network/v1alpha1"
 	servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2"
 	tenantv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tenant/v1alpha1"
-	towerv1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
 )
 
 // GenericInformer is type of SharedIndexInformer which will locate and delegate to other
@@ -57,14 +57,20 @@ func (f *genericInformer) Lister() cache.GenericLister {
 // TODO extend this to unknown resources with a client pool
 func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) {
 	switch resource {
-	// Group=devops.kubesphere.io, Version=v1alpha1
-	case v1alpha1.SchemeGroupVersion.WithResource("s2ibinaries"):
+	// Group=cluster.kubesphere.io, Version=v1alpha1
+	case v1alpha1.SchemeGroupVersion.WithResource("agents"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Cluster().V1alpha1().Agents().Informer()}, nil
+	case v1alpha1.SchemeGroupVersion.WithResource("clusters"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Cluster().V1alpha1().Clusters().Informer()}, nil
+
+		// Group=devops.kubesphere.io, Version=v1alpha1
+	case devopsv1alpha1.SchemeGroupVersion.WithResource("s2ibinaries"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Devops().V1alpha1().S2iBinaries().Informer()}, nil
-	case v1alpha1.SchemeGroupVersion.WithResource("s2ibuilders"):
+	case devopsv1alpha1.SchemeGroupVersion.WithResource("s2ibuilders"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Devops().V1alpha1().S2iBuilders().Informer()}, nil
-	case v1alpha1.SchemeGroupVersion.WithResource("s2ibuildertemplates"):
+	case devopsv1alpha1.SchemeGroupVersion.WithResource("s2ibuildertemplates"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Devops().V1alpha1().S2iBuilderTemplates().Informer()}, nil
-	case v1alpha1.SchemeGroupVersion.WithResource("s2iruns"):
+	case devopsv1alpha1.SchemeGroupVersion.WithResource("s2iruns"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Devops().V1alpha1().S2iRuns().Informer()}, nil
 
 		// Group=iam.kubesphere.io, Version=v1alpha2
@@ -93,10 +99,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case tenantv1alpha1.SchemeGroupVersion.WithResource("workspaces"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Tenant().V1alpha1().Workspaces().Informer()}, nil
 
-		// Group=tower.kubesphere.io, Version=v1alpha1
-	case towerv1alpha1.SchemeGroupVersion.WithResource("agents"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Tower().V1alpha1().Agents().Informer()}, nil
-
 	}
 
 	return nil, fmt.Errorf("no informer found for %v", resource)

pkg/client/listers/cluster/v1alpha1/agent.go

@@ -22,15 +22,15 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/tools/cache"
-	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/tower/v1alpha1"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
 )
 
 // AgentLister helps list Agents.
 type AgentLister interface {
 	// List lists all Agents in the indexer.
 	List(selector labels.Selector) (ret []*v1alpha1.Agent, err error)
-	// Agents returns an object that can list and get Agents.
-	Agents(namespace string) AgentNamespaceLister
+	// Get retrieves the Agent from the index for a given name.
+	Get(name string) (*v1alpha1.Agent, error)
 	AgentListerExpansion
 }
 
@@ -52,38 +52,9 @@ func (s *agentLister) List(selector labels.Selector) (ret []*v1alpha1.Agent, err
 	return ret, err
 }
 
-// Agents returns an object that can list and get Agents.
-func (s *agentLister) Agents(namespace string) AgentNamespaceLister {
-	return agentNamespaceLister{indexer: s.indexer, namespace: namespace}
-}
-
-// AgentNamespaceLister helps list and get Agents.
-type AgentNamespaceLister interface {
-	// List lists all Agents in the indexer for a given namespace.
-	List(selector labels.Selector) (ret []*v1alpha1.Agent, err error)
-	// Get retrieves the Agent from the indexer for a given namespace and name.
-	Get(name string) (*v1alpha1.Agent, error)
-	AgentNamespaceListerExpansion
-}
-
-// agentNamespaceLister implements the AgentNamespaceLister
-// interface.
-type agentNamespaceLister struct {
-	indexer   cache.Indexer
-	namespace string
-}
-
-// List lists all Agents in the indexer for a given namespace.
-func (s agentNamespaceLister) List(selector labels.Selector) (ret []*v1alpha1.Agent, err error) {
-	err = cache.ListAllByNamespace(s.indexer, s.namespace, selector, func(m interface{}) {
-		ret = append(ret, m.(*v1alpha1.Agent))
-	})
-	return ret, err
-}
-
-// Get retrieves the Agent from the indexer for a given namespace and name.
-func (s agentNamespaceLister) Get(name string) (*v1alpha1.Agent, error) {
-	obj, exists, err := s.indexer.GetByKey(s.namespace + "/" + name)
+// Get retrieves the Agent from the index for a given name.
+func (s *agentLister) Get(name string) (*v1alpha1.Agent, error) {
+	obj, exists, err := s.indexer.GetByKey(name)
 	if err != nil {
 		return nil, err
 	}

pkg/client/listers/cluster/v1alpha1/cluster.go

@@ -0,0 +1,65 @@
+/*
+Copyright 2019 The KubeSphere authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by lister-gen. DO NOT EDIT.
+
+package v1alpha1
+
+import (
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/client-go/tools/cache"
+	v1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
+)
+
+// ClusterLister helps list Clusters.
+type ClusterLister interface {
+	// List lists all Clusters in the indexer.
+	List(selector labels.Selector) (ret []*v1alpha1.Cluster, err error)
+	// Get retrieves the Cluster from the index for a given name.
+	Get(name string) (*v1alpha1.Cluster, error)
+	ClusterListerExpansion
+}
+
+// clusterLister implements the ClusterLister interface.
+type clusterLister struct {
+	indexer cache.Indexer
+}
+
+// NewClusterLister returns a new ClusterLister.
+func NewClusterLister(indexer cache.Indexer) ClusterLister {
+	return &clusterLister{indexer: indexer}
+}
+
+// List lists all Clusters in the indexer.
+func (s *clusterLister) List(selector labels.Selector) (ret []*v1alpha1.Cluster, err error) {
+	err = cache.ListAll(s.indexer, selector, func(m interface{}) {
+		ret = append(ret, m.(*v1alpha1.Cluster))
+	})
+	return ret, err
+}
+
+// Get retrieves the Cluster from the index for a given name.
+func (s *clusterLister) Get(name string) (*v1alpha1.Cluster, error) {
+	obj, exists, err := s.indexer.GetByKey(name)
+	if err != nil {
+		return nil, err
+	}
+	if !exists {
+		return nil, errors.NewNotFound(v1alpha1.Resource("cluster"), name)
+	}
+	return obj.(*v1alpha1.Cluster), nil
+}

pkg/client/listers/cluster/v1alpha1/expansion_generated.go

@@ -22,6 +22,6 @@ package v1alpha1
 // AgentLister.
 type AgentListerExpansion interface{}
 
-// AgentNamespaceListerExpansion allows custom methods to be added to
-// AgentNamespaceLister.
-type AgentNamespaceListerExpansion interface{}
+// ClusterListerExpansion allows custom methods to be added to
+// ClusterLister.
+type ClusterListerExpansion interface{}

pkg/controller/cluster/cluster_controller.go

@@ -0,0 +1,347 @@
+package cluster
+
+import (
+	"fmt"
+	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
+	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
+	"k8s.io/client-go/tools/cache"
+	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/tools/record"
+	"k8s.io/client-go/util/retry"
+	"k8s.io/client-go/util/workqueue"
+	"k8s.io/klog"
+	clusterv1alpha1 "kubesphere.io/kubesphere/pkg/apis/cluster/v1alpha1"
+	clusterclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned/typed/cluster/v1alpha1"
+	clusterinformer "kubesphere.io/kubesphere/pkg/client/informers/externalversions/cluster/v1alpha1"
+	clusterlister "kubesphere.io/kubesphere/pkg/client/listers/cluster/v1alpha1"
+	"time"
+)
+
+const (
+	// maxRetries is the number of times a service will be retried before it is dropped out of the queue.
+	// With the current rate-limiter in use (5ms*2^(maxRetries-1)) the following numbers represent the
+	// sequence of delays between successive queuings of a service.
+	//
+	// 5ms, 10ms, 20ms, 40ms, 80ms, 160ms, 320ms, 640ms, 1.3s, 2.6s, 5.1s, 10.2s, 20.4s, 41s, 82s
+	maxRetries = 15
+)
+
+type ClusterController struct {
+	eventBroadcaster record.EventBroadcaster
+	eventRecorder    record.EventRecorder
+
+	agentClient   clusterclient.AgentInterface
+	clusterClient clusterclient.ClusterInterface
+
+	agentLister    clusterlister.AgentLister
+	agentHasSynced cache.InformerSynced
+
+	clusterLister    clusterlister.ClusterLister
+	clusterHasSynced cache.InformerSynced
+
+	queue workqueue.RateLimitingInterface
+
+	workerLoopPeriod time.Duration
+}
+
+func NewClusterController(
+	client kubernetes.Interface,
+	clusterInformer clusterinformer.ClusterInformer,
+	agentInformer clusterinformer.AgentInformer,
+	agentClient clusterclient.AgentInterface,
+	clusterClient clusterclient.ClusterInterface,
+) *ClusterController {
+
+	broadcaster := record.NewBroadcaster()
+	broadcaster.StartLogging(func(format string, args ...interface{}) {
+		klog.Info(fmt.Sprintf(format, args))
+	})
+	broadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: client.CoreV1().Events("")})
+	recorder := broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "cluster-controller"})
+
+	c := &ClusterController{
+		eventBroadcaster: broadcaster,
+		eventRecorder:    recorder,
+		agentClient:      agentClient,
+		clusterClient:    clusterClient,
+		queue:            workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "cluster"),
+		workerLoopPeriod: time.Second,
+	}
+
+	c.agentLister = agentInformer.Lister()
+	c.agentHasSynced = agentInformer.Informer().HasSynced
+
+	c.clusterLister = clusterInformer.Lister()
+	c.clusterHasSynced = clusterInformer.Informer().HasSynced
+
+	clusterInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc: c.addCluster,
+		UpdateFunc: func(oldObj, newObj interface{}) {
+			c.addCluster(newObj)
+		},
+		DeleteFunc: c.addCluster,
+	})
+
+	agentInformer.Informer().AddEventHandler(cache.ResourceEventHandlerFuncs{
+		AddFunc:    nil,
+		UpdateFunc: nil,
+		DeleteFunc: nil,
+	})
+
+	return c
+}
+
+func (c *ClusterController) Start(stopCh <-chan struct{}) error {
+	return c.Run(5, stopCh)
+}
+
+func (c *ClusterController) Run(workers int, stopCh <-chan struct{}) error {
+	defer utilruntime.HandleCrash()
+	defer c.queue.ShutDown()
+
+	klog.V(0).Info("starting cluster controller")
+	defer klog.Info("shutting down cluster controller")
+
+	if !cache.WaitForCacheSync(stopCh, c.clusterHasSynced, c.agentHasSynced) {
+		return fmt.Errorf("failed to wait for caches to sync")
+	}
+
+	for i := 0; i < workers; i++ {
+		go wait.Until(c.worker, c.workerLoopPeriod, stopCh)
+	}
+
+	<-stopCh
+	return nil
+}
+
+func (c *ClusterController) worker() {
+	for c.processNextItem() {
+	}
+}
+
+func (c *ClusterController) processNextItem() bool {
+	key, quit := c.queue.Get()
+	if quit {
+		return false
+	}
+
+	defer c.queue.Done(key)
+
+	err := c.syncCluster(key.(string))
+	c.handleErr(err, key)
+	return true
+}
+
+func (c *ClusterController) syncCluster(key string) error {
+	startTime := time.Now()
+
+	_, name, err := cache.SplitMetaNamespaceKey(key)
+	if err != nil {
+		klog.Errorf("not a valid controller key %s, %#v", key, err)
+		return err
+	}
+
+	defer func() {
+		klog.V(4).Infof("Finished syncing cluster %s in %s", name, time.Since(startTime))
+	}()
+
+	cluster, err := c.clusterLister.Get(name)
+	if err != nil {
+		// cluster not found, possibly been deleted
+		// need to do the cleanup
+		if errors.IsNotFound(err) {
+			_, err = c.agentLister.Get(name)
+			if err != nil && errors.IsNotFound(err) {
+				return nil
+			}
+
+			if err != nil {
+				klog.Errorf("Failed to get cluster agent %s, %#v", name, err)
+				return err
+			}
+
+			// do the real cleanup work
+			err = c.agentClient.Delete(name, &metav1.DeleteOptions{})
+			return err
+		}
+
+		klog.Errorf("Failed to get cluster with name %s, %#v", name, err)
+		return err
+	}
+
+	newAgent := &clusterv1alpha1.Agent{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: name,
+			Labels: map[string]string{
+				"app.kubernetes.io/name":     "tower",
+				"cluster.kubesphere.io/name": name,
+			},
+		},
+		Spec: clusterv1alpha1.AgentSpec{
+			Token:                   "",
+			KubeSphereAPIServerPort: 0,
+			KubernetesAPIServerPort: 0,
+			Proxy:                   "",
+			Paused:                  !cluster.Spec.Active,
+		},
+	}
+
+	agent, err := c.agentLister.Get(name)
+	if err != nil && errors.IsNotFound(err) {
+		agent, err = c.agentClient.Create(newAgent)
+		if err != nil {
+			klog.Errorf("Failed to create agent %s, %#v", name, err)
+			return err
+		}
+
+		return nil
+	}
+
+	if err != nil {
+		klog.Errorf("Failed to get agent %s, %#v", name, err)
+		return err
+	}
+
+	if agent.Spec.Paused != newAgent.Spec.Paused {
+		agent.Spec.Paused = newAgent.Spec.Paused
+		return retry.RetryOnConflict(retry.DefaultBackoff, func() error {
+			_, err = c.agentClient.Update(agent)
+			return err
+		})
+	}
+
+	// agent connection is ready, update cluster status
+	// set
+	if len(agent.Status.KubeConfig) != 0 && c.isAgentReady(agent) {
+		clientConfig, err := clientcmd.NewClientConfigFromBytes(agent.Status.KubeConfig)
+		if err != nil {
+			klog.Errorf("Unable to create client config from kubeconfig bytes, %#v", err)
+			return err
+		}
+
+		config, err := clientConfig.ClientConfig()
+		if err != nil {
+			klog.Errorf("Failed to get client config, %#v", err)
+			return err
+		}
+
+		clientSet, err := kubernetes.NewForConfig(config)
+		if err != nil {
+			klog.Errorf("Failed to create ClientSet from config, %#v", err)
+			return nil
+		}
+
+		version, err := clientSet.Discovery().ServerVersion()
+		if err != nil {
+			klog.Errorf("Failed to get kubernetes version, %#v", err)
+			return err
+		}
+
+		cluster.Status.KubernetesVersion = version.GitVersion
+
+		nodes, err := clientSet.CoreV1().Nodes().List(metav1.ListOptions{})
+		if err != nil {
+			klog.Errorf("Failed to get cluster nodes, %#v", err)
+			return err
+		}
+
+		cluster.Status.NodeCount = len(nodes.Items)
+	}
+
+	agentReadyCondition := clusterv1alpha1.ClusterCondition{
+		Type:               clusterv1alpha1.ClusterAgentAvailable,
+		LastUpdateTime:     metav1.NewTime(time.Now()),
+		LastTransitionTime: metav1.NewTime(time.Now()),
+		Reason:             "",
+		Message:            "Cluster agent is available now.",
+	}
+
+	if c.isAgentReady(agent) {
+		agentReadyCondition.Status = v1.ConditionTrue
+	} else {
+		agentReadyCondition.Status = v1.ConditionFalse
+	}
+
+	c.addClusterCondition(cluster, agentReadyCondition)
+
+	_, err = c.clusterClient.Update(cluster)
+	if err != nil {
+		klog.Errorf("Failed to update cluster status, %#v", err)
+		return err
+	}
+
+	return nil
+}
+
+func (c *ClusterController) addCluster(obj interface{}) {
+	cluster := obj.(*clusterv1alpha1.Cluster)
+
+	key, err := cache.MetaNamespaceKeyFunc(obj)
+	if err != nil {
+		utilruntime.HandleError(fmt.Errorf("get cluster key %s failed", cluster.Name))
+		return
+	}
+
+	c.queue.Add(key)
+}
+
+func (c *ClusterController) handleErr(err error, key interface{}) {
+	if err == nil {
+		c.queue.Forget(key)
+		return
+	}
+
+	if c.queue.NumRequeues(key) < maxRetries {
+		klog.V(2).Infof("Error syncing virtualservice %s for service retrying, %#v", key, err)
+		c.queue.AddRateLimited(key)
+		return
+	}
+
+	klog.V(4).Infof("Dropping service %s out of the queue.", key)
+	c.queue.Forget(key)
+	utilruntime.HandleError(err)
+}
+
+func (c *ClusterController) addAgent(obj interface{}) {
+	agent := obj.(*clusterv1alpha1.Agent)
+	key, err := cache.MetaNamespaceKeyFunc(obj)
+	if err != nil {
+		utilruntime.HandleError(fmt.Errorf("get agent key %s failed", agent.Name))
+		return
+	}
+
+	c.queue.Add(key)
+}
+
+func (c *ClusterController) isAgentReady(agent *clusterv1alpha1.Agent) bool {
+	for _, condition := range agent.Status.Conditions {
+		if condition.Type == clusterv1alpha1.AgentConnected && condition.Status == v1.ConditionTrue {
+			return true
+		}
+	}
+	return false
+}
+
+// addClusterCondition add condition
+func (c *ClusterController) addClusterCondition(cluster *clusterv1alpha1.Cluster, condition clusterv1alpha1.ClusterCondition) {
+	if cluster.Status.Conditions == nil {
+		cluster.Status.Conditions = make([]clusterv1alpha1.ClusterCondition, 0)
+	}
+
+	newConditions := make([]clusterv1alpha1.ClusterCondition, 0)
+	for _, cond := range cluster.Status.Conditions {
+		if cond.Type == condition.Type {
+			continue
+		}
+		newConditions = append(newConditions, cond)
+	}
+
+	newConditions = append(newConditions, condition)
+	cluster.Status.Conditions = newConditions
+}

pkg/controller/cluster/cluster_controller_test.go

@@ -0,0 +1 @@
+package cluster

pkg/controller/destinationrule/destinationrule_controller.go

@@ -199,7 +199,7 @@ func (v *DestinationRuleController) processNextWorkItem() bool {
 func (v *DestinationRuleController) syncService(key string) error {
 	startTime := time.Now()
 	defer func() {
-		log.V(4).Info("Finished syncing service destinationrule.", "key", key, "duration", time.Since(startTime))
+		log.V(4).Infof("Finished syncing service destinationrule %s in %s.", key, time.Since(startTime))
 	}()
 
 	namespace, name, err := cache.SplitMetaNamespaceKey(key)
@@ -212,14 +212,14 @@ func (v *DestinationRuleController) syncService(key string) error {
 		// delete the corresponding destinationrule if there is any, as the service has been deleted.
 		err = v.destinationRuleClient.NetworkingV1alpha3().DestinationRules(namespace).Delete(name, nil)
 		if err != nil && !errors.IsNotFound(err) {
-			log.Error(err, "delete destination rule failed", "namespace", namespace, "name", name)
+			log.Errorf("delete destination rule failed %s/%s, error %v.", namespace, name, err)
 			return err
 		}
 
 		// delete orphan service policy if there is any
 		err = v.servicemeshClient.ServicemeshV1alpha2().ServicePolicies(namespace).Delete(name, nil)
 		if err != nil && !errors.IsNotFound(err) {
-			log.Error(err, "delete orphan service policy failed", "namespace", namespace, "name", name)
+			log.Errorf("delete orphan service policy %s/%s failed, %#v", namespace, name, err)
 			return err
 		}
 
@@ -259,7 +259,7 @@ func (v *DestinationRuleController) syncService(key string) error {
 		version := util.GetComponentVersion(&deployment.ObjectMeta)
 
 		if len(version) == 0 {
-			log.V(4).Info("Deployment doesn't have a version label", "key", types.NamespacedName{Namespace: deployment.Namespace, Name: deployment.Name}.String())
+			log.V(4).Infof("Deployment %s doesn't have a version label", types.NamespacedName{Namespace: deployment.Namespace, Name: deployment.Name}.String())
 			continue
 		}
 

pkg/controller/virtualservice/virtualservice_controller.go

@@ -213,7 +213,7 @@ func (v *VirtualServiceController) syncService(key string) error {
 	appName := name
 
 	defer func() {
-		log.V(4).Info("Finished syncing service virtualservice.", "namespace", namespace, "name", name, "duration", time.Since(startTime))
+		log.V(4).Infof("Finished syncing service virtualservice %s/%s in %s.", namespace, name, time.Since(startTime))
 	}()
 
 	service, err := v.serviceLister.Services(namespace).Get(name)