diff --git a/apis/installer/v1alpha1/stash_catalog_types.go b/apis/installer/v1alpha1/stash_catalog_types.go index 6952182d9..138c593d4 100644 --- a/apis/installer/v1alpha1/stash_catalog_types.go +++ b/apis/installer/v1alpha1/stash_catalog_types.go @@ -121,8 +121,6 @@ type StashMysqlSpec struct { type MySQLBackup struct { // +optional Args string `json:"args"` - // +optional - Args57 string `json:"args5_7"` } type MySQLRestore struct { diff --git a/catalog/raw/mysql/8.0.14/mysql-backup-function.yaml b/catalog/raw/mysql/8.0.14/mysql-backup-function.yaml index c16441329..60752d3dd 100644 --- a/catalog/raw/mysql/8.0.14/mysql-backup-function.yaml +++ b/catalog/raw/mysql/8.0.14/mysql-backup-function.yaml @@ -18,6 +18,7 @@ spec: - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - --mysql-args=${args:=--all-databases} + - --multi-dump-args=${multiDumpArgs:=} - --wait-timeout=${waitTimeout:=300} - --namespace=${NAMESPACE:=default} - --appbinding=${TARGET_NAME:=} diff --git a/catalog/raw/mysql/8.0.21/mysql-backup-function.yaml b/catalog/raw/mysql/8.0.21/mysql-backup-function.yaml index cb2f588c3..16b7419fc 100644 --- a/catalog/raw/mysql/8.0.21/mysql-backup-function.yaml +++ b/catalog/raw/mysql/8.0.21/mysql-backup-function.yaml @@ -18,6 +18,7 @@ spec: - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - --mysql-args=${args:=--all-databases} + - --multi-dump-args=${multiDumpArgs:=} - --wait-timeout=${waitTimeout:=300} - --namespace=${NAMESPACE:=default} - --appbinding=${TARGET_NAME:=} diff --git a/catalog/raw/mysql/8.0.3/mysql-backup-function.yaml b/catalog/raw/mysql/8.0.3/mysql-backup-function.yaml index 834c44227..2790569f5 100644 --- a/catalog/raw/mysql/8.0.3/mysql-backup-function.yaml +++ b/catalog/raw/mysql/8.0.3/mysql-backup-function.yaml @@ -18,6 +18,7 @@ spec: - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - --mysql-args=${args:=--all-databases} + - --multi-dump-args=${multiDumpArgs:=} - --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 7651b67d2..95949ea48 100644 --- a/charts/stash-catalog/README.md +++ b/charts/stash-catalog/README.md @@ -62,7 +62,6 @@ The following table lists the configurable parameters of the `stash-catalog` cha | 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" | 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 index fd04ef96f..5eb28324d 100644 --- 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 @@ -20,7 +20,7 @@ spec: - --enable-cache=${ENABLE_CACHE:=true} - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - - --mysql-args=${args:={{ .Values.mysql.backup.args5_7 }}} + - --mysql-args=${args:={{ .Values.mysql.backup.args }}} - --wait-timeout=${waitTimeout:={{ .Values.waitTimeout}}} - --namespace=${NAMESPACE:=default} - --appbinding=${TARGET_NAME:=} diff --git a/charts/stash-catalog/templates/mysql/8.0.14/mysql-backup-function.yaml b/charts/stash-catalog/templates/mysql/8.0.14/mysql-backup-function.yaml index ed764bc1c..b9d04120a 100644 --- a/charts/stash-catalog/templates/mysql/8.0.14/mysql-backup-function.yaml +++ b/charts/stash-catalog/templates/mysql/8.0.14/mysql-backup-function.yaml @@ -21,6 +21,7 @@ spec: - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - --mysql-args=${args:={{ .Values.mysql.backup.args }}} + - --multi-dump-args=${multiDumpArgs:=} - --wait-timeout=${waitTimeout:={{ .Values.waitTimeout}}} - --namespace=${NAMESPACE:=default} - --appbinding=${TARGET_NAME:=} diff --git a/charts/stash-catalog/templates/mysql/8.0.21/mysql-backup-function.yaml b/charts/stash-catalog/templates/mysql/8.0.21/mysql-backup-function.yaml index 5c7a2a33e..39603a15f 100644 --- a/charts/stash-catalog/templates/mysql/8.0.21/mysql-backup-function.yaml +++ b/charts/stash-catalog/templates/mysql/8.0.21/mysql-backup-function.yaml @@ -21,6 +21,7 @@ spec: - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - --mysql-args=${args:={{ .Values.mysql.backup.args }}} + - --multi-dump-args=${multiDumpArgs:=} - --wait-timeout=${waitTimeout:={{ .Values.waitTimeout}}} - --namespace=${NAMESPACE:=default} - --appbinding=${TARGET_NAME:=} diff --git a/charts/stash-catalog/templates/mysql/8.0.3/mysql-backup-function.yaml b/charts/stash-catalog/templates/mysql/8.0.3/mysql-backup-function.yaml index 58ffc1707..e1f8432c8 100644 --- a/charts/stash-catalog/templates/mysql/8.0.3/mysql-backup-function.yaml +++ b/charts/stash-catalog/templates/mysql/8.0.3/mysql-backup-function.yaml @@ -21,6 +21,7 @@ spec: - --max-connections=${MAX_CONNECTIONS:=0} - --hostname=${HOSTNAME:=} - --mysql-args=${args:={{ .Values.mysql.backup.args }}} + - --multi-dump-args=${multiDumpArgs:=} - --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 index 46e0cff6f..1b073e049 100644 --- a/charts/stash-catalog/values.openapiv3_schema.yaml +++ b/charts/stash-catalog/values.openapiv3_schema.yaml @@ -129,8 +129,6 @@ 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 index 51c974193..95ce70e7a 100644 --- a/charts/stash-catalog/values.yaml +++ b/charts/stash-catalog/values.yaml @@ -49,8 +49,6 @@ 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-enterprise/README.md b/charts/stash-enterprise/README.md index 5c6860d5b..6fd54f25f 100644 --- a/charts/stash-enterprise/README.md +++ b/charts/stash-enterprise/README.md @@ -53,7 +53,7 @@ The following table lists the configurable parameters of the `stash-enterprise` | license | License for the product. Get a license by following the steps from [here](https://stash.run/docs/latest/setup/install/enterprise#get-a-trial-license).
Example:
`helm install appscode/stash-enterprise \`
`--set-file license=/path/to/license/file`
`or`
`helm install appscode/stash-enterprise \`
`--set license=` | "" | | licenseSecretName | Name of Secret with the license as key.txt key | "" | | licenseApiService | Name of the ApiService to use by the addon to identify the respective service and certificate for license verification request | v1beta1.admission.stash.appscode.com | -| registryFQDN | Docker registry fqdn used to pull Stash related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | ghcr.io | +| registryFQDN | Docker registry fqdn used to pull Stash related images. Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} | "" | | operator.registry | Docker registry used to pull operator image | stashed | | operator.repository | Name of operator container image | stash-enterprise | | operator.tag | Operator container image tag | "" | diff --git a/charts/stash-enterprise/values.yaml b/charts/stash-enterprise/values.yaml index 2ecba0084..09b014cd3 100644 --- a/charts/stash-enterprise/values.yaml +++ b/charts/stash-enterprise/values.yaml @@ -23,7 +23,8 @@ licenseSecretName: "" licenseApiService: v1beta1.admission.stash.appscode.com # Docker registry fqdn used to pull Stash related images. # Set this to use docker registry hosted at ${registryFQDN}/${registry}/${image} -registryFQDN: ghcr.io +registryFQDN: "" +# cleanerRegistryFQDN: ghcr.io operator: # Docker registry used to pull operator image registry: stashed diff --git a/charts/stash/values.openapiv3_schema.yaml b/charts/stash/values.openapiv3_schema.yaml index a9b01e7d6..dd20b7495 100644 --- a/charts/stash/values.openapiv3_schema.yaml +++ b/charts/stash/values.openapiv3_schema.yaml @@ -171,8 +171,6 @@ 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 index 33d952656..37bd09b0f 100644 --- a/hack/fmt/main.go +++ b/hack/fmt/main.go @@ -197,11 +197,7 @@ func main() { case "mysql": if strings.HasPrefix(args[i], "--mysql-args=") { - 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) - } + args[i] = fmt.Sprintf(`--mysql-args=${args:={{ .Values.%s.%s.args }}}`, loc.App, r.Type) } case "perconaxtradb":