Use args5_7 for MySQL 5.7.x backup

Signed-off-by: Tamal Saha <tamal@appscode.com>
stashed · Oct 17, 2023 · 7dfba84 · 7dfba84
1 parent 6255a69
commit 7dfba84
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 2 deletions.
diff --git a/apis/installer/v1alpha1/stash_catalog_types.go b/apis/installer/v1alpha1/stash_catalog_types.go
@@ -121,6 +121,8 @@ type StashMysqlSpec struct {
 type MySQLBackup struct {
 	// +optional
 	Args string `json:"args"`
+	// +optional
+	Args57 string `json:"args5_7"`
 }
 
 type MySQLRestore struct {

diff --git a/charts/stash-catalog/README.md b/charts/stash-catalog/README.md
@@ -62,6 +62,7 @@ The following table lists the configurable parameters of the `stash-catalog` cha
 | mongodb.restore.args                    | Arguments to pass to `mongorestore` command during restore process                                                                     | <code>""</code>                |
 | mysql.enabled                           | If true, deploys MySQL addon                                                                                                           | <code>true</code>              |
 | mysql.backup.args                       | Arguments to pass to `mysqldump` command  during bakcup process                                                                        | <code>"--all-databases"</code> |
+| mysql.backup.args5_7                    | Arguments to pass to `mysqldump` command  during MySQL 5.7.x bakcup process                                                            | <code>""</code>                |
 | mysql.restore.args                      | Arguments to pass to `mysql` command during restore process                                                                            | <code>""</code>                |
 | perconaxtradb.enabled                   | If true, deploys Percona XtraDB addon                                                                                                  | <code>true</code>              |
 | perconaxtradb.backup.args               | Arguments to pass to `mysqldump` command  during bakcup process                                                                        | <code>"--all-databases"</code> |

diff --git a/charts/stash-catalog/templates/mysql/5.7.25/mysql-backup-function.yaml b/charts/stash-catalog/templates/mysql/5.7.25/mysql-backup-function.yaml
@@ -19,7 +19,7 @@ spec:
   - --enable-cache=${ENABLE_CACHE:=true}
   - --max-connections=${MAX_CONNECTIONS:=0}
   - --hostname=${HOSTNAME:=}
-  - --mysql-args=${args:={{ .Values.mysql.backup.args }}}
+  - --mysql-args=${args:={{ .Values.mysql.backup.args5_7 }}}
   - --wait-timeout=${waitTimeout:={{ .Values.waitTimeout}}}
   - --namespace=${NAMESPACE:=default}
   - --appbinding=${TARGET_NAME:=}

diff --git a/charts/stash-catalog/values.openapiv3_schema.yaml b/charts/stash-catalog/values.openapiv3_schema.yaml
@@ -129,6 +129,8 @@ properties:
         properties:
           args:
             type: string
+          args5_7:
+            type: string
         type: object
       enabled:
         type: boolean

diff --git a/charts/stash-catalog/values.yaml b/charts/stash-catalog/values.yaml
@@ -49,6 +49,8 @@ mysql:
   backup:
     # Arguments to pass to `mysqldump` command  during bakcup process
     args: "--all-databases"
+    # Arguments to pass to `mysqldump` command  during MySQL 5.7.x bakcup process
+    args5_7: ""
   restore:
     # Arguments to pass to `mysql` command during restore process
     args: ""

diff --git a/charts/stash/values.openapiv3_schema.yaml b/charts/stash/values.openapiv3_schema.yaml
@@ -171,6 +171,8 @@ properties:
             properties:
               args:
                 type: string
+              args5_7:
+                type: string
             type: object
           enabled:
             type: boolean

diff --git a/hack/fmt/main.go b/hack/fmt/main.go
@@ -197,7 +197,11 @@ func main() {
 
 						case "mysql":
 							if strings.HasPrefix(args[i], "--mysql-args=") {
-								args[i] = fmt.Sprintf(`--mysql-args=${args:={{ .Values.%s.%s.args }}}`, loc.App, r.Type)
+								if r.Resource.GetName() == "mysql-backup-5.7.25" {
+									args[i] = fmt.Sprintf(`--mysql-args=${args:={{ .Values.%s.%s.args5_7 }}}`, loc.App, r.Type)
+								} else {
+									args[i] = fmt.Sprintf(`--mysql-args=${args:={{ .Values.%s.%s.args }}}`, loc.App, r.Type)
+								}
 							}
 
 						case "perconaxtradb":