From dbfc0b3ee76f02161c225c5d8bb98f26c4830ab2 Mon Sep 17 00:00:00 2001 From: mmontes11 Date: Wed, 25 Jun 2025 19:24:48 +0200 Subject: [PATCH] Restore examples from main --- examples/manifests/backup_scheduled.yaml | 2 +- examples/manifests/mariadb.yaml | 1 - examples/manifests/mariadb_from_backup.yaml | 4 --- .../mariadb_from_backup_scheduled.yaml | 26 +++++++++++++++++++ examples/manifests/mariadb_from_nfs.yaml | 4 --- examples/manifests/mariadb_from_pvc.yaml | 4 --- examples/manifests/mariadb_from_s3.yaml | 4 --- examples/manifests/mariadb_galera.yaml | 1 - .../manifests/mariadb_galera_from_s3.yaml | 2 +- .../manifests/mariadb_init_mariabackup.yaml | 23 ++++++++++++++++ 10 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 examples/manifests/mariadb_from_backup_scheduled.yaml create mode 100644 examples/manifests/mariadb_init_mariabackup.yaml diff --git a/examples/manifests/backup_scheduled.yaml b/examples/manifests/backup_scheduled.yaml index a7b0aa6c..5f9c7591 100644 --- a/examples/manifests/backup_scheduled.yaml +++ b/examples/manifests/backup_scheduled.yaml @@ -1,7 +1,7 @@ apiVersion: k8s.mariadb.com/v1alpha1 kind: Backup metadata: - name: backup + name: backup-scheduled spec: mariaDbRef: name: mariadb diff --git a/examples/manifests/mariadb.yaml b/examples/manifests/mariadb.yaml index 86a4d150..1e15a528 100644 --- a/examples/manifests/mariadb.yaml +++ b/examples/manifests/mariadb.yaml @@ -18,7 +18,6 @@ spec: storage: size: 1Gi - # storageClassName: csi-hostpath-sc service: type: LoadBalancer diff --git a/examples/manifests/mariadb_from_backup.yaml b/examples/manifests/mariadb_from_backup.yaml index be201ee9..3ece26e3 100644 --- a/examples/manifests/mariadb_from_backup.yaml +++ b/examples/manifests/mariadb_from_backup.yaml @@ -3,10 +3,6 @@ kind: MariaDB metadata: name: mariadb-from-backup spec: - rootPasswordSecretKeyRef: - name: mariadb - key: password - storage: size: 1Gi diff --git a/examples/manifests/mariadb_from_backup_scheduled.yaml b/examples/manifests/mariadb_from_backup_scheduled.yaml new file mode 100644 index 00000000..8b1ba22e --- /dev/null +++ b/examples/manifests/mariadb_from_backup_scheduled.yaml @@ -0,0 +1,26 @@ +apiVersion: k8s.mariadb.com/v1alpha1 +kind: MariaDB +metadata: + name: mariadb-from-backup-scheduled +spec: + storage: + size: 1Gi + + bootstrapFrom: + backupRef: + name: backup-scheduled + targetRecoveryTime: 2023-12-28T09:00:00Z + restoreJob: + metadata: + labels: + sidecar.istio.io/inject: "false" + args: + - "--verbose" + affinity: + antiAffinityEnabled: true + resources: + requests: + cpu: 100m + memory: 128Mi + limits: + memory: 1Gi diff --git a/examples/manifests/mariadb_from_nfs.yaml b/examples/manifests/mariadb_from_nfs.yaml index c7e9858c..7d14c05b 100644 --- a/examples/manifests/mariadb_from_nfs.yaml +++ b/examples/manifests/mariadb_from_nfs.yaml @@ -3,10 +3,6 @@ kind: MariaDB metadata: name: mariadb-from-nfs spec: - rootPasswordSecretKeyRef: - name: mariadb - key: password - storage: size: 1Gi diff --git a/examples/manifests/mariadb_from_pvc.yaml b/examples/manifests/mariadb_from_pvc.yaml index 12599a10..407acac2 100644 --- a/examples/manifests/mariadb_from_pvc.yaml +++ b/examples/manifests/mariadb_from_pvc.yaml @@ -3,10 +3,6 @@ kind: MariaDB metadata: name: mariadb-from-pvc spec: - rootPasswordSecretKeyRef: - name: mariadb - key: password - storage: size: 1Gi diff --git a/examples/manifests/mariadb_from_s3.yaml b/examples/manifests/mariadb_from_s3.yaml index ba49beff..d04e620c 100644 --- a/examples/manifests/mariadb_from_s3.yaml +++ b/examples/manifests/mariadb_from_s3.yaml @@ -3,10 +3,6 @@ kind: MariaDB metadata: name: mariadb-from-s3 spec: - rootPasswordSecretKeyRef: - name: mariadb - key: password - storage: size: 1Gi diff --git a/examples/manifests/mariadb_galera.yaml b/examples/manifests/mariadb_galera.yaml index 3f854ef1..31fe87cc 100644 --- a/examples/manifests/mariadb_galera.yaml +++ b/examples/manifests/mariadb_galera.yaml @@ -9,7 +9,6 @@ spec: storage: size: 1Gi - # storageClassName: csi-hostpath-sc replicas: 3 diff --git a/examples/manifests/mariadb_galera_from_s3.yaml b/examples/manifests/mariadb_galera_from_s3.yaml index 120e386a..1988413e 100644 --- a/examples/manifests/mariadb_galera_from_s3.yaml +++ b/examples/manifests/mariadb_galera_from_s3.yaml @@ -1,7 +1,7 @@ apiVersion: k8s.mariadb.com/v1alpha1 kind: MariaDB metadata: - name: mariadb-galera + name: mariadb-galera-from-s3 spec: rootPasswordSecretKeyRef: name: mariadb diff --git a/examples/manifests/mariadb_init_mariabackup.yaml b/examples/manifests/mariadb_init_mariabackup.yaml new file mode 100644 index 00000000..2fb3b3be --- /dev/null +++ b/examples/manifests/mariadb_init_mariabackup.yaml @@ -0,0 +1,23 @@ +apiVersion: k8s.mariadb.com/v1alpha1 +kind: MariaDB +metadata: + name: mariadb-init-mariabackup +spec: + # See: https://mariadb.com/kb/en/full-backup-and-restore-with-mariabackup/ + initContainers: + - image: docker-registry1.mariadb.com/library/mariadb:11.4.5 + args: + - mariadb-backup + - --copy-back + - --target-dir=/var/mariadb/backup/ + + volumes: + - name: mariabackup + persistentVolumeClaim: + claimName: mariabackup + volumeMounts: + - name: mariabackup + mountPath: /var/mariadb/backup/ + + storage: + size: 1Gi \ No newline at end of file