From 48e9fdb0751a2ab8ed3eb447281d351ad2e1eae0 Mon Sep 17 00:00:00 2001 From: "Md. Ishtiaq Islam" Date: Wed, 22 May 2024 17:36:43 +0600 Subject: [PATCH] Add `--ignore-database=mysql` to mariadb-args (#338) Signed-off-by: Md. Ishtiaq Islam --- .../10.5.8/mariadb-backup-function.yaml | 2 +- charts/stash-catalog/README.md | 112 +++++++++--------- charts/stash-catalog/values.yaml | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/catalog/raw/mariadb/10.5.8/mariadb-backup-function.yaml b/catalog/raw/mariadb/10.5.8/mariadb-backup-function.yaml index 8ca9e9753..f18ef00a6 100644 --- a/catalog/raw/mariadb/10.5.8/mariadb-backup-function.yaml +++ b/catalog/raw/mariadb/10.5.8/mariadb-backup-function.yaml @@ -17,7 +17,7 @@ spec: - --enable-cache=${ENABLE_CACHE:=true} - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - - --mariadb-args=${args:=--all-databases} + - --mariadb-args=${args:=--all-databases --ignore-database=mysql} - --wait-timeout=${waitTimeout:=300} - --namespace=${NAMESPACE:=default} - --appbinding=${TARGET_NAME:=} diff --git a/charts/stash-catalog/README.md b/charts/stash-catalog/README.md index 5e53fd4c3..39f104990 100644 --- a/charts/stash-catalog/README.md +++ b/charts/stash-catalog/README.md @@ -45,62 +45,62 @@ The command removes all the Kubernetes components associated with the chart and The following table lists the configurable parameters of the `stash-catalog` chart and their default values. -| Parameter | Description | Default | -|-----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|--------------------------------| -| registryFQDN | Docker registry fqdn used to pull Stash related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | -| image.registry | Docker registry used to pull Postgres addon image | "" | -| waitTimeout | Number of seconds to wait for the database to be ready before backup/restore process. | 300 | -| elasticsearch.enabled | If true, deploys Elasticsearch addon | true | -| elasticsearch.backup.args | Arguments to pass to `multielasticdump` command during backup process | "" | -| elasticsearch.restore.args | Arguments to pass to `multielasticdump` command during restore process | "" | -| mariadb.enabled | If true, deploys MariaDB addon | true | -| mariadb.backup.args | Arguments to pass to `mariadbdump` command during bakcup process | "--all-databases" | -| mariadb.restore.args | Arguments to pass to `mariadb` command during restore process | "" | -| mongodb.enabled | If true, deploys MongoDB addon | true | -| mongodb.maxConcurrency | Maximum concurrency to perform backup or restore tasks | 3 | -| mongodb.backup.args | Arguments to pass to `mongodump` command during backup process | "" | -| mongodb.restore.args | Arguments to pass to `mongorestore` command during restore process | "" | -| mysql.enabled | If true, deploys MySQL addon | true | -| mysql.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "--all-databases" | -| mysql.backup.args5_7 | Arguments to pass to `mysqldump` command during MySQL 5.7.x bakcup process | "" | -| mysql.restore.args | Arguments to pass to `mysql` command during restore process | "" | -| perconaxtradb.enabled | If true, deploys Percona XtraDB addon | true | -| perconaxtradb.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "--all-databases" | -| perconaxtradb.backup.socatRetry | Optional argument sent to backup script | 30 | -| perconaxtradb.restore.args | Arguments to pass to `mysql` command during restore process | "" | -| perconaxtradb.restore.targetAppReplicas | Optional argument sent to recovery script | 1 | -| postgres.enabled | If true, deploys PostgreSQL addon | true | -| postgres.backup.cmd | Postgres dump command, can either be: pg_dumpall or pg_dump | "pg_dumpall" | -| postgres.backup.args | Arguments to pass to `backup.cmd` command during backup process | "" | -| postgres.restore.args | Arguments to pass to `psql` command during restore process | "" | -| redis.enabled | If true, deploys Redis addon | true | -| redis.backup.args | Arguments to pass to `redis-dump` command during bakcup process | "" | -| redis.restore.args | Arguments to pass to `redis` command during restore process | "" | -| nats.enabled | If true, deploys NATS addon | true | -| nats.backup.args | Arguments to pass to `nats str backup` command during backup process | "" | -| nats.backup.streams | List of streams to backup. Don't set this field if you want to backup all streams. | "" | -| nats.restore.args | Arguments to pass to `nats str restore` command during restore process | "" | -| nats.restore.streams | List of streams to restore. Don't set this field if you want to restore all the backed up streams. | "" | -| nats.restore.overwrite | Specify whether to delete the old stream before restoring from backup. | false | -| etcd.enabled | If true, deploys ETCD addon | true | -| etcd.backup.args | Arguments to pass to `etcdctl save` command during backup process | "" | -| etcd.restore.args | Arguments to pass to `etcdctl restore` command during restore process | "" | -| etcd.restore.initialCluster | List of the peers used to bootstrap the ETCD cluster | "" | -| etcd.restore.initialClusterToken | Initial token used for the ETCD cluster | "" | -| etcd.restore.dataDir | Directory where the ETCD stores its data for persistence | "" | -| etcd.restore.workloadKind | Kind of the workload used to deploy the ETCD cluster (i.e. StatefulSet) | "" | -| etcd.restore.workloadName | Name of the workload used to deploy the ETCD cluster | "" | -| kubedump.enabled | If true, deploy kubedump addon | true | -| kubedump.backup.sanitize | Specify whether to remove the decorator | true | -| kubedump.backup.labelSelector | Specify label selector to filter resources | "" | -| kubedump.backup.includeDependants | Specify whether to include the dependants resources along with it's parent | false | -| vault.enabled | If true, deploys vault addon | true | -| vault.backup.args | Arguments to pass to `vault operator raft snapshot save` command during backup process | "" | -| vault.backup.keyPrefix | Prefix that will be appended with the root-token & unseal-keys | "" | -| vault.restore.args | Arguments to pass to `vault operator raft snapshot restore` command during restore process | "" | -| vault.restore.force | Specify whether to apply `-force` flag to restore vault snapshot | false | -| vault.restore.keyPrefix | Prefix that will be appended with the root-token & unseal-keys | "" | -| vault.restore.oldKeyPrefix | Prefix that was appended with the root-token & unseal-keys | "" | +| Parameter | Description | Default | +|-----------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------| +| registryFQDN | Docker registry fqdn used to pull Stash related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | +| image.registry | Docker registry used to pull Postgres addon image | "" | +| waitTimeout | Number of seconds to wait for the database to be ready before backup/restore process. | 300 | +| elasticsearch.enabled | If true, deploys Elasticsearch addon | true | +| elasticsearch.backup.args | Arguments to pass to `multielasticdump` command during backup process | "" | +| elasticsearch.restore.args | Arguments to pass to `multielasticdump` command during restore process | "" | +| mariadb.enabled | If true, deploys MariaDB addon | true | +| mariadb.backup.args | Arguments to pass to `mariadbdump` command during bakcup process | "--all-databases --ignore-database=mysql" | +| mariadb.restore.args | Arguments to pass to `mariadb` command during restore process | "" | +| mongodb.enabled | If true, deploys MongoDB addon | true | +| mongodb.maxConcurrency | Maximum concurrency to perform backup or restore tasks | 3 | +| mongodb.backup.args | Arguments to pass to `mongodump` command during backup process | "" | +| mongodb.restore.args | Arguments to pass to `mongorestore` command during restore process | "" | +| mysql.enabled | If true, deploys MySQL addon | true | +| mysql.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "--all-databases" | +| mysql.backup.args5_7 | Arguments to pass to `mysqldump` command during MySQL 5.7.x bakcup process | "" | +| mysql.restore.args | Arguments to pass to `mysql` command during restore process | "" | +| perconaxtradb.enabled | If true, deploys Percona XtraDB addon | true | +| perconaxtradb.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "--all-databases" | +| perconaxtradb.backup.socatRetry | Optional argument sent to backup script | 30 | +| perconaxtradb.restore.args | Arguments to pass to `mysql` command during restore process | "" | +| perconaxtradb.restore.targetAppReplicas | Optional argument sent to recovery script | 1 | +| postgres.enabled | If true, deploys PostgreSQL addon | true | +| postgres.backup.cmd | Postgres dump command, can either be: pg_dumpall or pg_dump | "pg_dumpall" | +| postgres.backup.args | Arguments to pass to `backup.cmd` command during backup process | "" | +| postgres.restore.args | Arguments to pass to `psql` command during restore process | "" | +| redis.enabled | If true, deploys Redis addon | true | +| redis.backup.args | Arguments to pass to `redis-dump` command during bakcup process | "" | +| redis.restore.args | Arguments to pass to `redis` command during restore process | "" | +| nats.enabled | If true, deploys NATS addon | true | +| nats.backup.args | Arguments to pass to `nats str backup` command during backup process | "" | +| nats.backup.streams | List of streams to backup. Don't set this field if you want to backup all streams. | "" | +| nats.restore.args | Arguments to pass to `nats str restore` command during restore process | "" | +| nats.restore.streams | List of streams to restore. Don't set this field if you want to restore all the backed up streams. | "" | +| nats.restore.overwrite | Specify whether to delete the old stream before restoring from backup. | false | +| etcd.enabled | If true, deploys ETCD addon | true | +| etcd.backup.args | Arguments to pass to `etcdctl save` command during backup process | "" | +| etcd.restore.args | Arguments to pass to `etcdctl restore` command during restore process | "" | +| etcd.restore.initialCluster | List of the peers used to bootstrap the ETCD cluster | "" | +| etcd.restore.initialClusterToken | Initial token used for the ETCD cluster | "" | +| etcd.restore.dataDir | Directory where the ETCD stores its data for persistence | "" | +| etcd.restore.workloadKind | Kind of the workload used to deploy the ETCD cluster (i.e. StatefulSet) | "" | +| etcd.restore.workloadName | Name of the workload used to deploy the ETCD cluster | "" | +| kubedump.enabled | If true, deploy kubedump addon | true | +| kubedump.backup.sanitize | Specify whether to remove the decorator | true | +| kubedump.backup.labelSelector | Specify label selector to filter resources | "" | +| kubedump.backup.includeDependants | Specify whether to include the dependants resources along with it's parent | false | +| vault.enabled | If true, deploys vault addon | true | +| vault.backup.args | Arguments to pass to `vault operator raft snapshot save` command during backup process | "" | +| vault.backup.keyPrefix | Prefix that will be appended with the root-token & unseal-keys | "" | +| vault.restore.args | Arguments to pass to `vault operator raft snapshot restore` command during restore process | "" | +| vault.restore.force | Specify whether to apply `-force` flag to restore vault snapshot | false | +| vault.restore.keyPrefix | Prefix that will be appended with the root-token & unseal-keys | "" | +| vault.restore.oldKeyPrefix | Prefix that was appended with the root-token & unseal-keys | "" | Specify each parameter using the `--set key=value[,key=value]` argument to `helm upgrade -i`. For example: diff --git a/charts/stash-catalog/values.yaml b/charts/stash-catalog/values.yaml index 1de01d7cb..51c974193 100644 --- a/charts/stash-catalog/values.yaml +++ b/charts/stash-catalog/values.yaml @@ -26,7 +26,7 @@ mariadb: # optional argument to send mariadbdump or mariadb command backup: # Arguments to pass to `mariadbdump` command during bakcup process - args: "--all-databases" + args: "--all-databases --ignore-database=mysql" restore: # Arguments to pass to `mariadb` command during restore process args: ""