Merge pull request #211 from hangscer8/rename_crd

rename crds

Author: ErikJiang

.github/workflows/call-offline-build.yaml

@@ -37,8 +37,8 @@ jobs:
         KUBEAN_TAG: ${{ github.ref_name }}
         KUBESPRAY_TAG: ${{ env.SPRAY_SHA_SHORT }}
       run: |
-        bash artifacts/manage_version_cr.sh create_infomanifest
-        bash artifacts/manage_version_cr.sh create_offlineversion
+        bash artifacts/manage_version_cr.sh create_manifest
+        bash artifacts/manage_version_cr.sh create_localartifactset
 
         echo "kubeanofflineversion cr output:"
         cat ${KUBEAN_TAG}/kubeanofflineversion.cr.yaml

README.md

@@ -17,7 +17,7 @@ helm install kubean kubean-io/kubean --create-namespace -n kubean-system
 
 Then check kubean-operator status by `kubectl get pods -n kubean-system | grep 'kubean'`.
 
-## Start KuBeanClusterOps for cluster.yml playbook
+## Start ClusterOperation for cluster.yml playbook
 
 We cloud use the example in folder `artifacts/demo` which uses online resources to install k8s cluster.
 

api/apis/kubeancluster/v1alpha1/doc.go renamed to api/apis/cluster/v1alpha1/doc.go

@@ -13,8 +13,8 @@ import (
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=`.metadata.creationTimestamp`,name="Age",type=date
 
-// KuBeanCluster represents the desire state and status of a member cluster.
-type KuBeanCluster struct {
+// Cluster represents the desire state and status of a member cluster.
+type Cluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
@@ -53,7 +53,7 @@ const (
 )
 
 type ClusterCondition struct {
-	// ClusterOps refers to the name of KuBeanClusterOps.
+	// ClusterOps refers to the name of ClusterOperation.
 	// +required
 	ClusterOps string `json:"clusterOps"`
 	// +optional
@@ -72,11 +72,11 @@ type Status struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// KuBeanClusterList contains a list of member cluster.
-type KuBeanClusterList struct {
+// ClusterList contains a list of member cluster.
+type ClusterList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	// Items holds a list of KuBeanCluster.
-	Items []KuBeanCluster `json:"items"`
+	// Items holds a list of Cluster.
+	Items []Cluster `json:"items"`
 }

api/apis/kubeancluster/v1alpha1/types.go renamed to api/apis/cluster/v1alpha1/types.go

@@ -13,8 +13,8 @@ import (
 // +kubebuilder:subresource:status
 // +kubebuilder:printcolumn:JSONPath=`.metadata.creationTimestamp`,name="Age",type=date
 
-// KuBeanClusterOps represents the desire state and status of a member cluster.
-type KuBeanClusterOps struct {
+// ClusterOperation represents the desire state and status of a member cluster.
+type ClusterOperation struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
@@ -34,9 +34,9 @@ const (
 
 // Spec defines the desired state of a member cluster.
 type Spec struct {
-	// KuBeanCluster the name of KuBeanCluster.
+	// Cluster the name of Cluster.kubean.io.
 	// +required
-	KuBeanCluster string `json:"kuBeanCluster"`
+	Cluster string `json:"cluster"`
 	// HostsConfRef will be filled by operator when it performs backup.
 	// +optional
 	HostsConfRef *apis.ConfigMapRef `json:"hostsConfRef"`
@@ -109,11 +109,11 @@ type Status struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// KuBeanClusterOpsList contains a list of member cluster.
-type KuBeanClusterOpsList struct {
+// ClusterOperationList contains a list of member cluster.
+type ClusterOperationList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
 
-	// Items holds a list of KuBeanClusterOps.
-	Items []KuBeanClusterOps `json:"items"`
+	// Items holds a list of ClusterOperation.
+	Items []ClusterOperation `json:"items"`
 }