Merge pull request #261 from hustjieke/feature_change_kind_cluster_to_mysqlcluster_#249

*.: change kind type cluster to mysqlcluster #249

Author: andyli029

Dockerfile

@@ -13,7 +13,7 @@ RUN go env -w GOPROXY=https://goproxy.cn,direct; \
 # Copy the go source
 COPY cmd/manager/main.go cmd/manager/main.go
 COPY api/ api/
-COPY cluster/ cluster/
+COPY mysqlcluster/ mysqlcluster/
 COPY controllers/ controllers/
 COPY backup/ backup/
 COPY internal/ internal/

PROJECT

@@ -10,7 +10,7 @@ resources:
   controller: true
   domain: radondb.com
   group: mysql
-  kind: Cluster
+  kind: MysqlCluster
   path: github.com/radondb/radondb-mysql-kubernetes/api/v1alpha1
   version: v1alpha1
 - controller: true

api/v1alpha1/backup_types.go

@@ -37,7 +37,7 @@ type BackupSpec struct {
 	// HostName represents the host for which to take backup
 	HostName string `json:"hostname"`
 
-	// Cluster represents the cluster name to backup
+	// ClusterName represents the cluster name to backup
 	ClusterName string `json:"clustname"`
 
 	// History Limit of job

api/v1alpha1/cluster_types.go renamed to api/v1alpha1/mysqlcluster_types.go

@@ -24,8 +24,8 @@ import (
 // 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.
 
-// ClusterSpec defines the desired state of Cluster
-type ClusterSpec struct {
+// MysqlClusterSpec defines the desired state of MysqlCluster
+type MysqlClusterSpec struct {
 	// INSERT ADDITIONAL SPEC FIELDS - desired state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
@@ -313,8 +313,8 @@ const (
 	NodeConditionReplicating NodeConditionType = "Replicating"
 )
 
-// ClusterStatus defines the observed state of Cluster
-type ClusterStatus struct {
+// MysqlClusterStatus defines the observed state of MysqlCluster
+type MysqlClusterStatus struct {
 	// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
 	// Important: Run "make" to regenerate code after modifying this file
 
@@ -335,24 +335,24 @@ type ClusterStatus struct {
 // +kubebuilder:printcolumn:name="Replicas",type="integer",JSONPath=".spec.replicas",description="The number of desired nodes"
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
 // +kubebuilder:resource:shortName=mysql
-// Cluster is the Schema for the clusters API
-type Cluster struct {
+// MysqlCluster is the Schema for the mysqlclusters API
+type MysqlCluster struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`
 
-	Spec   ClusterSpec   `json:"spec,omitempty"`
-	Status ClusterStatus `json:"status,omitempty"`
+	Spec   MysqlClusterSpec   `json:"spec,omitempty"`
+	Status MysqlClusterStatus `json:"status,omitempty"`
 }
 
 // +kubebuilder:object:root=true
 
-// ClusterList contains a list of Cluster
-type ClusterList struct {
+// MysqlClusterList contains a list of MysqlCluster
+type MysqlClusterList struct {
 	metav1.TypeMeta `json:",inline"`
 	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []Cluster `json:"items"`
+	Items           []MysqlCluster `json:"items"`
 }
 
 func init() {
-	SchemeBuilder.Register(&Cluster{}, &ClusterList{})
+	SchemeBuilder.Register(&MysqlCluster{}, &MysqlClusterList{})
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -37,7 +37,7 @@ spec:
             description: BackupSpec defines the desired state of Backup
             properties:
               clustname:
-                description: Cluster represents the cluster name to backup
+                description: ClusterName represents the cluster name to backup
                 type: string
               historyLimit:
                 default: 3

charts/mysql-operator/crds/mysql.radondb.com_backups.yaml

@@ -6,16 +6,16 @@ metadata:
   annotations:
     controller-gen.kubebuilder.io/version: v0.4.1
   creationTimestamp: null
-  name: clusters.mysql.radondb.com
+  name: mysqlclusters.mysql.radondb.com
 spec:
   group: mysql.radondb.com
   names:
-    kind: Cluster
-    listKind: ClusterList
-    plural: clusters
+    kind: MysqlCluster
+    listKind: MysqlClusterList
+    plural: mysqlclusters
     shortNames:
     - mysql
-    singular: cluster
+    singular: mysqlcluster
   scope: Namespaced
   versions:
   - additionalPrinterColumns:
@@ -33,7 +33,7 @@ spec:
     name: v1alpha1
     schema:
       openAPIV3Schema:
-        description: Cluster is the Schema for the clusters API
+        description: MysqlCluster is the Schema for the mysqlclusters API
         properties:
           apiVersion:
             description: 'APIVersion defines the versioned schema of this representation
@@ -48,7 +48,7 @@ spec:
           metadata:
             type: object
           spec:
-            description: ClusterSpec defines the desired state of Cluster
+            description: MysqlClusterSpec defines the desired state of MysqlCluster
             properties:
               backupSecretName:
                 description: Represents the name of the secret that contains credentials
@@ -1309,7 +1309,7 @@ spec:
                 type: object
             type: object
           status:
-            description: ClusterStatus defines the observed state of Cluster
+            description: MysqlClusterStatus defines the observed state of MysqlCluster
             properties:
               conditions:
                 description: Conditions contains the list of the cluster conditions

config/crd/bases/mysql.radondb.com_clusters.yaml renamed to charts/mysql-operator/crds/mysql.radondb.com_mysqlclusters.yaml

@@ -1,8 +1,8 @@
-You can create a new cluster by issuing:
+You can create a new mysqlcluster by issuing:
 
 cat <<EOF | kubectl apply -f-
 apiVersion: mysql.radondb.com/v1alpha1
-kind: Cluster
+kind: MysqlCluster
 metadata:
   name: sample
 spec:

charts/mysql-operator/templates/NOTES.txt

@@ -76,7 +76,7 @@ rules:
 - apiGroups:
   - mysql.radondb.com
   resources:
-  - clusters
+  - mysqlclusters
   verbs:
   - create
   - delete
@@ -88,13 +88,13 @@ rules:
 - apiGroups:
   - mysql.radondb.com
   resources:
-  - clusters/finalizers
+  - mysqlclusters/finalizers
   verbs:
   - update
 - apiGroups:
   - mysql.radondb.com
   resources:
-  - clusters/status
+  - mysqlclusters/status
   verbs:
   - get
   - patch