diff --git a/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go b/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go index 2fd03d664..2fe203222 100644 --- a/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go +++ b/apis/installer/v1alpha1/kubedb_kubestash_catalog_types.go @@ -54,7 +54,6 @@ type KubedbKubestashCatalogSpec struct { Mysql StashMysqlSpec `json:"mysql"` Redis StashRedisSpec `json:"redis"` Postgres StashPostgresSpec `json:"postgres"` - Mariadb StashMariadbSpec `json:"mariadb"` } // StashElasticsearchSpec is the schema for Stash Elasticsearch values file @@ -137,22 +136,6 @@ type MySQLRestore struct { Args string `json:"args"` } -// StashMariadbSpec is the schema for Stash MySQL values file -type StashMariadbSpec struct { - Backup MariaDBBackup `json:"backup"` - Restore MariaDBRestore `json:"restore"` -} - -type MariaDBBackup struct { - // +optional - Args string `json:"args"` -} - -type MariaDBRestore struct { - // +optional - Args string `json:"args"` -} - // StashRedisSpec is the schema for Stash Redis values file type StashRedisSpec struct { Backup RedisBackup `json:"backup"` diff --git a/apis/installer/v1alpha1/zz_generated.deepcopy.go b/apis/installer/v1alpha1/zz_generated.deepcopy.go index 6ab648e88..a05fa494f 100644 --- a/apis/installer/v1alpha1/zz_generated.deepcopy.go +++ b/apis/installer/v1alpha1/zz_generated.deepcopy.go @@ -938,7 +938,6 @@ func (in *KubedbKubestashCatalogSpec) DeepCopyInto(out *KubedbKubestashCatalogSp out.Mysql = in.Mysql out.Redis = in.Redis out.Postgres = in.Postgres - out.Mariadb = in.Mariadb return } @@ -2130,38 +2129,6 @@ func (in *KubedbWebhookServerValues) DeepCopy() *KubedbWebhookServerValues { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MariaDBBackup) DeepCopyInto(out *MariaDBBackup) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MariaDBBackup. -func (in *MariaDBBackup) DeepCopy() *MariaDBBackup { - if in == nil { - return nil - } - out := new(MariaDBBackup) - in.DeepCopyInto(out) - return out -} - -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *MariaDBRestore) DeepCopyInto(out *MariaDBRestore) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MariaDBRestore. -func (in *MariaDBRestore) DeepCopy() *MariaDBRestore { - if in == nil { - return nil - } - out := new(MariaDBRestore) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MongoDBBackup) DeepCopyInto(out *MongoDBBackup) { *out = *in @@ -2902,24 +2869,6 @@ func (in *StashKubedbmanifestSpec) DeepCopy() *StashKubedbmanifestSpec { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *StashMariadbSpec) DeepCopyInto(out *StashMariadbSpec) { - *out = *in - out.Backup = in.Backup - out.Restore = in.Restore - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new StashMariadbSpec. -func (in *StashMariadbSpec) DeepCopy() *StashMariadbSpec { - if in == nil { - return nil - } - out := new(StashMariadbSpec) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *StashMongodbSpec) DeepCopyInto(out *StashMongodbSpec) { *out = *in diff --git a/catalog/kubestash/raw/mariadb/mariadb-addon.yaml b/catalog/kubestash/raw/mariadb/mariadb-addon.yaml index b44429d43..1a0678cd0 100644 --- a/catalog/kubestash/raw/mariadb/mariadb-addon.yaml +++ b/catalog/kubestash/raw/mariadb/mariadb-addon.yaml @@ -4,34 +4,6 @@ metadata: name: mariadb-addon spec: backupTasks: - - name: logical-backup - function: mariadb-backup - driver: Restic - executor: Job - singleton: true - parameters: - - name: args - usage: Arguments to be passed to the dump command. - required: false - - name: databases - usage: List of databases to backup. - required: false - - name: enableCache - usage: Enable or disable caching. Disabling caching may impact backup performance. - required: false - default: "true" - - name: scratchDir - usage: Directory for holding temporary files and restic cache. - required: false - default: /kubestash-tmp - volumeTemplate: - - name: kubestash-tmp-volume - usage: Holds temporary files and restic cache. - source: - emptyDir: {} - volumeMounts: - - name: kubestash-tmp-volume - mountPath: /kubestash-tmp - name: volume-snapshot function: mariadb-csi-snapshotter driver: VolumeSnapshotter @@ -64,31 +36,6 @@ spec: - name: kubestash-tmp-volume mountPath: /kubestash-tmp restoreTasks: - - name: logical-backup-restore - function: mariadb-restore - driver: Restic - executor: Job - singleton: true - parameters: - - name: args - usage: Arguments to be passed to the dump command. - required: false - - name: enableCache - usage: Enable or disable caching. Disabling caching may impact backup performance. - required: false - default: "true" - - name: scratchDir - usage: Directory for holding temporary files and restic cache. - required: false - default: /kubestash-tmp - volumeTemplate: - - name: kubestash-tmp-volume - usage: Holds temporary files and restic cache. - source: - emptyDir: {} - volumeMounts: - - name: kubestash-tmp-volume - mountPath: /kubestash-tmp - name: manifest-restore function: kubedbmanifest-restore driver: Restic diff --git a/catalog/kubestash/raw/mariadb/mariadb-backup-function.yaml b/catalog/kubestash/raw/mariadb/mariadb-backup-function.yaml deleted file mode 100644 index 783b5b037..000000000 --- a/catalog/kubestash/raw/mariadb/mariadb-backup-function.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: addons.kubestash.com/v1alpha1 -kind: Function -metadata: - name: mariadb-backup -spec: - args: - - backup - - --namespace=${namespace:=default} - - --backupsession=${backupSession:=} - - --enable-cache=${enableCache:=} - - --scratch-dir=${scratchDir:=} - - --wait-timeout=${waitTimeout:=300} - - --mariadb-args=${args:=} - - --db-version=${dbVersion:=} - - --databases=${databases:=} - image: ghcr.io/kubedb/mariadb-restic-plugin:v0.4.0-beta.1_${DB_VERSION} diff --git a/catalog/kubestash/raw/mariadb/mariadb-csi-snapshotter-function.yaml b/catalog/kubestash/raw/mariadb/mariadb-csi-snapshotter-function.yaml index 6425fb2c5..5da9742d8 100644 --- a/catalog/kubestash/raw/mariadb/mariadb-csi-snapshotter-function.yaml +++ b/catalog/kubestash/raw/mariadb/mariadb-csi-snapshotter-function.yaml @@ -8,4 +8,4 @@ spec: - --namespace=${namespace:=default} - --volume-snapshot-class-name=${volumeSnapshotClassName:=} - --backupsession=${backupSession:=} - image: ghcr.io/kubedb/mariadb-csi-snapshotter-plugin:v0.2.0-beta.1 + image: ghcr.io/kubedb/mariadb-csi-snapshotter-plugin:v0.1.0-beta.1 diff --git a/catalog/kubestash/raw/mariadb/mariadb-restore-function.yaml b/catalog/kubestash/raw/mariadb/mariadb-restore-function.yaml deleted file mode 100644 index 97e4e1b9c..000000000 --- a/catalog/kubestash/raw/mariadb/mariadb-restore-function.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: addons.kubestash.com/v1alpha1 -kind: Function -metadata: - name: mariadb-restore -spec: - args: - - restore - - --namespace=${namespace:=default} - - --restoresession=${restoreSession:=} - - --snapshot=${snapshot:=} - - --enable-cache=${enableCache:=} - - --scratch-dir=${scratchDir:=} - - --wait-timeout=${waitTimeout:=300} - - --mariadb-args=${args:=} - - --db-version=${dbVersion:=} - image: ghcr.io/kubedb/mariadb-restic-plugin:v0.4.0-beta.1_${DB_VERSION} diff --git a/charts/kubedb-kubestash-catalog/README.md b/charts/kubedb-kubestash-catalog/README.md index cc7d814da..6d75ec429 100644 --- a/charts/kubedb-kubestash-catalog/README.md +++ b/charts/kubedb-kubestash-catalog/README.md @@ -88,8 +88,6 @@ The following table lists the configurable parameters of the `kubedb-kubestash-c | postgres.restore.args | Arguments to pass to `psql` command during restore process | "" | | mysql.backup.args | Arguments to pass to `mysqldump` command during bakcup process | "" | | mysql.restore.args | Arguments to pass to `mysql` command during restore process | "" | -| mariadb.backup.args | Arguments to pass to `mariadbdump` command during bakcup process | "" | -| mariadb.restore.args | Arguments to pass to `mariadb` command during restore process | "" | | 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 | "" | diff --git a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-addon.yaml b/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-addon.yaml index fec7e6387..46de38fd2 100644 --- a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-addon.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-addon.yaml @@ -12,34 +12,6 @@ metadata: {{- include "kubedb-kubestash-catalog.labels" . | nindent 4 }} spec: backupTasks: - - driver: Restic - executor: Job - function: mariadb-backup - name: logical-backup - parameters: - - name: args - required: false - usage: Arguments to be passed to the dump command. - - name: databases - required: false - usage: List of databases to backup. - - default: "true" - name: enableCache - required: false - usage: Enable or disable caching. Disabling caching may impact backup performance. - - default: /kubestash-tmp - name: scratchDir - required: false - usage: Directory for holding temporary files and restic cache. - singleton: true - volumeMounts: - - mountPath: /kubestash-tmp - name: kubestash-tmp-volume - volumeTemplate: - - name: kubestash-tmp-volume - source: - emptyDir: {} - usage: Holds temporary files and restic cache. - driver: VolumeSnapshotter executor: Job function: mariadb-csi-snapshotter @@ -72,31 +44,6 @@ spec: emptyDir: {} usage: Holds temporary files and restic cache. restoreTasks: - - driver: Restic - executor: Job - function: mariadb-restore - name: logical-backup-restore - parameters: - - name: args - required: false - usage: Arguments to be passed to the dump command. - - default: "true" - name: enableCache - required: false - usage: Enable or disable caching. Disabling caching may impact backup performance. - - default: /kubestash-tmp - name: scratchDir - required: false - usage: Directory for holding temporary files and restic cache. - singleton: true - volumeMounts: - - mountPath: /kubestash-tmp - name: kubestash-tmp-volume - volumeTemplate: - - name: kubestash-tmp-volume - source: - emptyDir: {} - usage: Holds temporary files and restic cache. - driver: Restic executor: Job function: kubedbmanifest-restore diff --git a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-backup.yaml b/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-backup.yaml deleted file mode 100644 index b0daf247b..000000000 --- a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-backup.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{ $featureGates := .Values.featureGates }} -{{- if .Values.global }} - {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} -{{- end }} - -{{ if $featureGates.MariaDB }} -apiVersion: addons.kubestash.com/v1alpha1 -kind: Function -metadata: - name: 'mariadb-backup' - labels: - {{- include "kubedb-kubestash-catalog.labels" . | nindent 4 }} -spec: - args: - - backup - - --namespace=${namespace:=default} - - --backupsession=${backupSession:=} - - --enable-cache=${enableCache:=} - - --scratch-dir=${scratchDir:=} - - --wait-timeout=${waitTimeout:={{ .Values.waitTimeout}}} - - --mariadb-args=${args:={{ .Values.mariadb.args }}} - - --db-version=${dbVersion:=} - - --databases=${databases:=} - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-restic-plugin") $) }}:v0.4.0-beta.1_${DB_VERSION}' -{{ end }} diff --git a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-csi-snapshotter.yaml b/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-csi-snapshotter.yaml index c73f82284..f996b63d4 100644 --- a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-csi-snapshotter.yaml +++ b/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-csi-snapshotter.yaml @@ -16,5 +16,5 @@ spec: - --namespace=${namespace:=default} - --volume-snapshot-class-name=${volumeSnapshotClassName:=} - --backupsession=${backupSession:=} - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-csi-snapshotter-plugin") $) }}:v0.2.0-beta.1' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-csi-snapshotter-plugin") $) }}:v0.1.0-beta.1' {{ end }} diff --git a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-restore.yaml b/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-restore.yaml deleted file mode 100644 index 5a6ad578b..000000000 --- a/charts/kubedb-kubestash-catalog/templates/mariadb/mariadb-restore.yaml +++ /dev/null @@ -1,25 +0,0 @@ -{{ $featureGates := .Values.featureGates }} -{{- if .Values.global }} - {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} -{{- end }} - -{{ if $featureGates.MariaDB }} -apiVersion: addons.kubestash.com/v1alpha1 -kind: Function -metadata: - name: 'mariadb-restore' - labels: - {{- include "kubedb-kubestash-catalog.labels" . | nindent 4 }} -spec: - args: - - restore - - --namespace=${namespace:=default} - - --restoresession=${restoreSession:=} - - --snapshot=${snapshot:=} - - --enable-cache=${enableCache:=} - - --scratch-dir=${scratchDir:=} - - --wait-timeout=${waitTimeout:={{ .Values.waitTimeout}}} - - --mariadb-args=${args:={{ .Values.mariadb.args }}} - - --db-version=${dbVersion:=} - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-restic-plugin") $) }}:v0.4.0-beta.1_${DB_VERSION}' -{{ end }} diff --git a/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml b/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml index fa40f0693..cb1c08d0b 100644 --- a/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml +++ b/charts/kubedb-kubestash-catalog/values.openapiv3_schema.yaml @@ -28,23 +28,6 @@ properties: required: - enabled type: object - mariadb: - description: StashMariadbSpec is the schema for Stash MySQL values file - properties: - backup: - properties: - args: - type: string - type: object - restore: - properties: - args: - type: string - type: object - required: - - backup - - restore - type: object mongodb: description: StashMongodbSpec is the schema for Stash MongoDB values file properties: @@ -161,7 +144,6 @@ required: - elasticsearch - featureGates - kubedbmanifest -- mariadb - mongodb - mysql - opensearch diff --git a/charts/kubedb-kubestash-catalog/values.yaml b/charts/kubedb-kubestash-catalog/values.yaml index ee66dfbf8..e86b7d643 100644 --- a/charts/kubedb-kubestash-catalog/values.yaml +++ b/charts/kubedb-kubestash-catalog/values.yaml @@ -91,14 +91,6 @@ mysql: restore: # Arguments to pass to `mysql` command during restore process args: "" -mariadb: - # optional argument to send mariadbdump or mariadb command - backup: - # Arguments to pass to `mariadbdump` command during bakcup process - args: "" - restore: - # Arguments to pass to `mariadb` command during restore process - args: "" redis: # optional argument to send redis-dump or redis command backup: diff --git a/charts/kubedb/values.openapiv3_schema.yaml b/charts/kubedb/values.openapiv3_schema.yaml index 48fa3d9d0..02ffb5063 100644 --- a/charts/kubedb/values.openapiv3_schema.yaml +++ b/charts/kubedb/values.openapiv3_schema.yaml @@ -3064,23 +3064,6 @@ properties: required: - enabled type: object - mariadb: - description: StashMariadbSpec is the schema for Stash MySQL values file - properties: - backup: - properties: - args: - type: string - type: object - restore: - properties: - args: - type: string - type: object - required: - - backup - - restore - type: object mongodb: description: StashMongodbSpec is the schema for Stash MongoDB values file properties: @@ -3199,7 +3182,6 @@ properties: - enabled - featureGates - kubedbmanifest - - mariadb - mongodb - mysql - opensearch