add cluster api group (#1992)

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
@@ -86,12 +92,13 @@ 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
 
 // Agent is the Schema for the agents API
 type Agent struct {

pkg/apis/cluster/v1alpha1/cluster_types.go

@@ -0,0 +1,75 @@
+package v1alpha1
+
+import (
+	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+const (
+	ResourceKindCluster      = "Cluster"
+	ResourcesSingularCluster = "cluster"
+	ResourcesPluralCluster   = "clusters"
+)
+
+type ClusterSpec struct {
+
+	// Join cluster as kubefed cluster
+	Federated bool `json:"federated,omitempty"`
+
+	// Desired state of the cluster
+	Active bool `json:"active,omitempty"`
+}
+
+type ClusterConditionType string
+
+const (
+	// Cluster agent is initialized and waiting for connecting
+	ClusterAgentInitialized ClusterConditionType = "AgentInitialized"
+
+	// Cluster agent is available
+	ClusterAgentAvailable ClusterConditionType = "AgentAvailable"
+
+	//
+
+)
+
+type ClusterStatus 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"`
+}
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+// +k8s:openapi-gen=true
+// +genclient:nonNamespaced
+
+// 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

@@ -16,7 +16,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Code generated by controller-gen. DO NOT EDIT.
+// Code generated by deepcopy-gen. DO NOT EDIT.
 
 package v1alpha1
 
@@ -31,6 +31,7 @@ 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.
@@ -56,6 +57,7 @@ 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.
@@ -80,6 +82,7 @@ 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.
@@ -103,6 +106,7 @@ 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.
@@ -130,6 +134,7 @@ 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.
@@ -141,3 +146,98 @@ 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)
+	return
+}
+
+// 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 *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])
+		}
+	}
+	return
+}
+
+// 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
+	return
+}
+
+// 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
+	in.LastUpdateTime.DeepCopyInto(&out.LastUpdateTime)
+	in.LastTransitionTime.DeepCopyInto(&out.LastTransitionTime)
+	return
+}
+
+// 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/iam/v1alpha2/user_types.go

@@ -20,17 +20,15 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-// 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.
-
-// User is the Schema for the users API
-// +k8s:openapi-gen=true
 // +genclient
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 // +genclient:nonNamespaced
+
+// +k8s:openapi-gen=true
 // +kubebuilder:printcolumn:name="Email",type="string",JSONPath=".spec.email"
 // +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.state"
 // +kubebuilder:resource:categories="iam",scope="Cluster"
+// User is the Schema for the users API
 type User struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
@@ -119,7 +117,6 @@ const (
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-// +genclient:nonNamespaced
 
 // UserList contains a list of User
 type UserList struct {

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 controller-gen. DO NOT EDIT.
+// Code generated by deepcopy-gen. DO NOT EDIT.
 
 package v1alpha2
 
@@ -31,6 +31,7 @@ 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.
@@ -55,6 +56,7 @@ 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.
@@ -79,6 +81,7 @@ 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.
@@ -112,6 +115,7 @@ 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.
@@ -134,6 +138,7 @@ 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.

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