Merge pull request #500 from andyli029/neater

*: modify name to CamelCase. #494
radondb · May 31, 2022 · b3e4120 · b3e4120
2 parents 171acda + 007669e
commit b3e4120
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/api/v1alpha1/backup_types.go b/api/v1alpha1/backup_types.go
@@ -34,7 +34,7 @@ type BackupSpec struct {
 
 	// HostName represents the host for which to take backup
 	// If is empty, is use leader HostName
-	HostName string `json:"hostname,omitempty"`
+	HostName string `json:"hostName,omitempty"`
 
 	// Represents the ip address of the nfs server.
 	// +optional

diff --git a/api/v1alpha1/mysqlcluster_webhook.go b/api/v1alpha1/mysqlcluster_webhook.go
@@ -40,7 +40,7 @@ func (r *MysqlCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
 // TODO(user): EDIT THIS FILE!  THIS IS SCAFFOLDING FOR YOU TO OWN!
 
 // TODO(user): change verbs to "verbs=create;update;delete" if you want to enable deletion validation.
-//+kubebuilder:webhook:path=/convert,mutating=false,failurePolicy=fail,sideEffects=None,groups=mysql.radondb.com,resources=mysqlclusters,verbs=create;update,versions=v1alpha1,name=vmysqlcluster.kb.io,admissionReviewVersions=v1
+//+kubebuilder:webhook:path=/validate-mysql-radondb-com-v1alpha1-mysqlcluster,mutating=false,failurePolicy=fail,sideEffects=None,groups=mysql.radondb.com,resources=mysqlclusters,verbs=create;update,versions=v1alpha1,name=vmysqlcluster.kb.io,admissionReviewVersions=v1
 
 var _ webhook.Validator = &MysqlCluster{}
 

diff --git a/charts/mysql-operator/crds/mysql.radondb.com_backups.yaml b/charts/mysql-operator/crds/mysql.radondb.com_backups.yaml
@@ -58,7 +58,7 @@ spec:
                 description: History Limit of job
                 format: int32
                 type: integer
-              hostname:
+              hostName:
                 description: HostName represents the host for which to take backup
                   If is empty, is use leader HostName
                 type: string

diff --git a/config/crd/bases/mysql.radondb.com_backups.yaml b/config/crd/bases/mysql.radondb.com_backups.yaml
@@ -58,7 +58,7 @@ spec:
                 description: History Limit of job
                 format: int32
                 type: integer
-              hostname:
+              hostName:
                 description: HostName represents the host for which to take backup
                   If is empty, is use leader HostName
                 type: string

diff --git a/config/samples/mysql_v1alpha1_backup.yaml b/config/samples/mysql_v1alpha1_backup.yaml
@@ -6,6 +6,6 @@ spec:
   # Add fields here
   image: radondb/mysql57-sidecar:v2.2.0
   # hostname if empty, use the leader as hostname
-  hostname: sample-mysql-0
-  clustername: sample
+  hostName: sample-mysql-0
+  clusterName: sample
   # nfsServerAddress: ""
diff --git a/docs/en-us/deploy_backup_restore_s3.md b/docs/en-us/deploy_backup_restore_s3.md
@@ -50,14 +50,14 @@ metadata:
   name: backup-sample1
 spec:
   # Add fields here
-  hostname: sample-mysql-0
-  clustername: sample
+  hostName: sample-mysql-0
+  clusterName: sample
 
 ```
 | name | function  | 
 |------|--------|
-|hostname|pod name in cluser|
-|clustername|cluster name|
+|hostName|pod name in cluser|
+|clusterName|cluster name|
 
 ### start cluster
 

diff --git a/docs/zh-cn/deploy_backup_restore_s3.md b/docs/zh-cn/deploy_backup_restore_s3.md
@@ -50,14 +50,14 @@ metadata:
   name: backup-sample1
 spec:
   # Add fields here
-  hostname: sample-mysql-0
-  clustername: sample
+  hostName: sample-mysql-0
+  clusterName: sample
 
 ```
 | name | function  | 
 |------|--------|
-|hostname|pod name in cluser|
-|clustername|cluster name|
+|hostName|pod name in cluser|
+|clusterName|cluster name|
 
 ### start cluster