fix cluster controller (#1996)

pkg/apis/cluster/v1alpha1/agent_types.go

@@ -82,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"`
@@ -99,6 +97,8 @@ type AgentStatus struct {
 // +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

@@ -9,31 +9,38 @@ const (
 	ResourceKindCluster      = "Cluster"
 	ResourcesSingularCluster = "cluster"
 	ResourcesPluralCluster   = "clusters"
+
+	IsHostCluster = "cluster.kubesphere.io/is-host-cluster"
 )
 
 type ClusterSpec struct {
 
-	// Join cluster as kubefed cluster
+	// 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
-	ClusterAgentInitialized ClusterConditionType = "AgentInitialized"
+	ClusterInitialized ClusterConditionType = "Initialized"
 
 	// Cluster agent is available
 	ClusterAgentAvailable ClusterConditionType = "AgentAvailable"
 
-	//
-
+	// Cluster has been one of federated clusters
+	ClusterFederated ClusterConditionType = "Federated"
 )
 
-type ClusterStatus struct {
+type ClusterCondition struct {
 	// Type of the condition
 	Type ClusterConditionType `json:"type"`
 	// Status of the condition, one of True, False, Unknown.
@@ -48,10 +55,28 @@ type ClusterStatus struct {
 	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 {

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

@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Code generated by deepcopy-gen. DO NOT EDIT.
+// Code generated by controller-gen. DO NOT EDIT.
 
 package v1alpha1
 
@@ -31,7 +31,6 @@ func (in *Agent) DeepCopyInto(out *Agent) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Agent.
@@ -57,7 +56,6 @@ func (in *AgentCondition) DeepCopyInto(out *AgentCondition) {
 	*out = *in
 	in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
 	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AgentCondition.
@@ -82,7 +80,6 @@ func (in *AgentList) DeepCopyInto(out *AgentList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AgentList.
@@ -106,7 +103,6 @@ func (in *AgentList) DeepCopyObject() runtime.Object {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *AgentSpec) DeepCopyInto(out *AgentSpec) {
 	*out = *in
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AgentSpec.
@@ -134,7 +130,6 @@ func (in *AgentStatus) DeepCopyInto(out *AgentStatus) {
 		*out = make([]byte, len(*in))
 		copy(*out, *in)
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AgentStatus.
@@ -154,7 +149,6 @@ func (in *Cluster) DeepCopyInto(out *Cluster) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	out.Spec = in.Spec
 	in.Status.DeepCopyInto(&out.Status)
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Cluster.
@@ -175,6 +169,23 @@ func (in *Cluster) DeepCopyObject() runtime.Object {
 	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
@@ -187,7 +198,6 @@ func (in *ClusterList) DeepCopyInto(out *ClusterList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterList.
@@ -211,7 +221,6 @@ func (in *ClusterList) DeepCopyObject() runtime.Object {
 // 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
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ClusterSpec.
@@ -227,9 +236,13 @@ func (in *ClusterSpec) DeepCopy() *ClusterSpec {
 // 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
-	in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
-	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
+	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.

pkg/apis/iam/v1alpha2/zz_generated.deepcopy.go

@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Code generated by deepcopy-gen. DO NOT EDIT.
+// Code generated by controller-gen. DO NOT EDIT.
 
 package v1alpha2
 
@@ -31,7 +31,6 @@ func (in *User) DeepCopyInto(out *User) {
 	in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
 	in.Spec.DeepCopyInto(&out.Spec)
 	in.Status.DeepCopyInto(&out.Status)
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new User.
@@ -56,7 +55,6 @@ func (in *User) DeepCopyObject() runtime.Object {
 func (in *UserCondition) DeepCopyInto(out *UserCondition) {
 	*out = *in
 	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserCondition.
@@ -81,7 +79,6 @@ func (in *UserList) DeepCopyInto(out *UserList) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserList.
@@ -115,7 +112,6 @@ func (in *UserSpec) DeepCopyInto(out *UserSpec) {
 		*out = make([]FinalizerName, len(*in))
 		copy(*out, *in)
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserSpec.
@@ -138,7 +134,6 @@ func (in *UserStatus) DeepCopyInto(out *UserStatus) {
 			(*in)[i].DeepCopyInto(&(*out)[i])
 		}
 	}
-	return
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new UserStatus.