Merge pull request #454 from runkecheng/feature_backup_nfs

*：Simplify the use of NFS backup.

Author: andyli029

api/v1alpha1/backup_types.go

@@ -38,9 +38,9 @@ type BackupSpec struct {
 	// If is empty, is use leader HostName
 	HostName string `json:"hostname,omitempty"`
 
-	// Represents the name of backup to NFS
+	// Represents the ip address of the nfs server.
 	// +optional
-	BackupToNFS string `json:"BackupToNFS,omitempty"`
+	NFSServerAddress string `json:"nfsServerAddress,omitempty"`
 
 	// ClusterName represents the cluster name to backup
 	ClusterName string `json:"clustname"`

api/v1alpha1/mysqlcluster_types.go

@@ -78,13 +78,13 @@ type MysqlClusterSpec struct {
 	// +optional
 	BackupSecretName string `json:"backupSecretName,omitempty"`
 
-	// Represents the name of the cluster restore from backup path
+	// Represents the name of the cluster restore from backup path.
 	// +optional
 	RestoreFrom string `json:"restoreFrom,omitempty"`
 
 	// Represents NFS ip address where cluster restore from.
 	// +optional
-	RestoreFromNFS string `json:"restoreFromNFS,omitempty"`
+	NFSServerAddress string `json:"nfsServerAddress,omitempty"`
 }
 
 // MysqlOpts defines the options of MySQL container.

backup/syncer/job.go

@@ -117,14 +117,14 @@ func (s *jobSyncer) ensurePodSpec(in corev1.PodSpec) corev1.PodSpec {
 	in.Containers[0].Name = utils.ContainerBackupName
 	in.Containers[0].Image = fmt.Sprintf("%s%s", mysqlcluster.GetPrefixFromEnv(), s.backup.Spec.Image)
 
-	if len(s.backup.Spec.BackupToNFS) != 0 {
+	if len(s.backup.Spec.NFSServerAddress) != 0 {
 		// add volumn about pvc
 		in.Volumes = []corev1.Volume{
 			{
 				Name: utils.XtrabackupPV,
 				VolumeSource: corev1.VolumeSource{
 					NFS: &corev1.NFSVolumeSource{
-						Server: s.backup.Spec.BackupToNFS,
+						Server: s.backup.Spec.NFSServerAddress,
 						Path:   "/",
 					},
 				},

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

@@ -36,9 +36,6 @@ spec:
           spec:
             description: BackupSpec defines the desired state of Backup
             properties:
-              BackupToNFS:
-                description: Represents the name of backup to NFS
-                type: string
               clustname:
                 description: ClusterName represents the cluster name to backup
                 type: string
@@ -55,6 +52,9 @@ spec:
                 default: radondb/mysql57-sidecar:v2.2.0
                 description: To specify the image that will be used for sidecar container.
                 type: string
+              nfsServerAddress:
+                description: Represents the ip address of the nfs server.
+                type: string
             required:
             - clustname
             type: object

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

@@ -215,6 +215,9 @@ spec:
                   Based on this version the operator can take decisions which features
                   can be used.'
                 type: string
+              nfsServerAddress:
+                description: Represents NFS ip address where cluster restore from.
+                type: string
               persistence:
                 default:
                   accessModes:
@@ -1243,10 +1246,7 @@ spec:
                 type: integer
               restoreFrom:
                 description: Represents the name of the cluster restore from backup
-                  path
-                type: string
-              restoreFromNFS:
-                description: Represents NFS ip address where cluster restore from.
+                  path.
                 type: string
               xenonOpts:
                 default:

config/crd/bases/mysql.radondb.com_backups.yaml

@@ -36,9 +36,6 @@ spec:
           spec:
             description: BackupSpec defines the desired state of Backup
             properties:
-              BackupToNFS:
-                description: Represents the name of backup to NFS
-                type: string
               clustname:
                 description: ClusterName represents the cluster name to backup
                 type: string
@@ -55,6 +52,9 @@ spec:
                 default: radondb/mysql57-sidecar:v2.2.0
                 description: To specify the image that will be used for sidecar container.
                 type: string
+              nfsServerAddress:
+                description: Represents the ip address of the nfs server.
+                type: string
             required:
             - clustname
             type: object

config/crd/bases/mysql.radondb.com_mysqlclusters.yaml

@@ -215,6 +215,9 @@ spec:
                   Based on this version the operator can take decisions which features
                   can be used.'
                 type: string
+              nfsServerAddress:
+                description: Represents NFS ip address where cluster restore from.
+                type: string
               persistence:
                 default:
                   accessModes:
@@ -1243,10 +1246,7 @@ spec:
                 type: integer
               restoreFrom:
                 description: Represents the name of the cluster restore from backup
-                  path
-                type: string
-              restoreFromNFS:
-                description: Represents NFS ip address where cluster restore from.
+                  path.
                 type: string
               xenonOpts:
                 default:

config/samples/mysql_v1alpha1_backup.yaml

@@ -4,8 +4,8 @@ metadata:
   name: backup-sample
 spec:
   # Add fields here
-  image: radondb/mysql-sidecar:latest
+  image: radondb/mysql57-sidecar:v2.2.0
   # hostname if empty, use the leader as hostname
   hostname: sample-mysql-0
   clustname: sample
-  # BackupToNFS: "IP of NFS server"
+  # nfsServerAddress: ""

config/samples/mysql_v1alpha1_mysqlcluster.yaml

@@ -15,8 +15,8 @@ spec:
   # restoreFrom: 
 
   # Restore from NFS, uncomment below and set the ip of NFS server
-  # such as restoreFromNFS: "10.233.55.172"
-  # restoreFromNFS: 
+  # such as nfsServerAddress: "10.233.55.172"
+  # nfsServerAddress: 
   mysqlOpts:
     rootPassword: "RadonDB@123"
     rootHost: localhost

config/samples/pv-volume.yaml renamed to config/samples/nfs_pv.yaml

@@ -1,8 +1,7 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  annotations:
-  name: manual
+  name: radondb-nfs-hostpath
 provisioner: kubernetes.io/no-provisioner
 reclaimPolicy: Retain
 volumeBindingMode: WaitForFirstConsumer
@@ -11,11 +10,11 @@ volumeBindingMode: WaitForFirstConsumer
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: backup-pv-volume
+  name: radondb-nfs-pv
   labels:
     type: local
 spec:
-  storageClassName: manual
+  storageClassName: radondb-nfs-hostpath
   # you can set affinity ,for example:
   # nodeAffinity:
   #   required:
@@ -26,8 +25,21 @@ spec:
   #         values:
   #         - node2
   capacity:
-    storage: 40Gi
+    storage: 30Gi
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/mnt/backup"
+    path: "/mnt/radondb-nfs-backup"
+---
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: radondb-nfs-pvc
+spec:
+  storageClassName: radondb-nfs-hostpath
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: 30Gi