From 25e8cf1f46bc57a7e50e2bb313ab6db25f805ecd Mon Sep 17 00:00:00 2001 From: SK Ali Arman Date: Tue, 17 Dec 2024 11:47:13 +0600 Subject: [PATCH] Add MariaDB 11.6.2 Version Support Signed-off-by: SK Ali Arman --- catalog/kubedb/active_versions.json | 1 + catalog/kubedb/backup_tasks.json | 1 + .../kubedb/raw/mariadb/mariadb-11.6.2.yaml | 46 +++++++++++++++ catalog/kubedb/restore_tasks.json | 1 + .../templates/mariadb/mariadb-11.6.2.yaml | 56 +++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 catalog/kubedb/raw/mariadb/mariadb-11.6.2.yaml create mode 100644 charts/kubedb-catalog/templates/mariadb/mariadb-11.6.2.yaml diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 71d891be1..8f6738eb3 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -71,6 +71,7 @@ "2022-cu12" ], "MariaDB": [ + "11.6.2", "11.5.2", "11.4.3", "11.3.2", diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json index a6940eadd..5ef35dc78 100644 --- a/catalog/kubedb/backup_tasks.json +++ b/catalog/kubedb/backup_tasks.json @@ -41,6 +41,7 @@ "xpack-8.2.3" ], "mariadb-backup-10.5.8": [ + "11.6.2", "11.5.2", "11.4.3", "11.3.2", diff --git a/catalog/kubedb/raw/mariadb/mariadb-11.6.2.yaml b/catalog/kubedb/raw/mariadb/mariadb-11.6.2.yaml new file mode 100644 index 000000000..e933f298a --- /dev/null +++ b/catalog/kubedb/raw/mariadb/mariadb-11.6.2.yaml @@ -0,0 +1,46 @@ +apiVersion: catalog.kubedb.com/v1alpha1 +kind: MariaDBVersion +metadata: + name: 11.6.2 +spec: + archiver: + addon: + name: mariadb-addon + tasks: + fullBackup: + name: logical-backup + fullBackupRestore: + name: logical-backup-restore + manifestBackup: + name: manifest-backup + manifestRestore: + name: manifest-restore + volumeSnapshot: + name: volume-snapshot + walg: + image: ghcr.io/kubedb/mariadb-archiver:(v0.9.0)_11.2.2-jammy + coordinator: + image: ghcr.io/kubedb/mariadb-coordinator:v0.29.0 + db: + image: ghcr.io/appscode-images/mariadb:11.6.2-noble + exporter: + image: prom/mysqld-exporter:v0.13.0 + initContainer: + image: ghcr.io/kubedb/mariadb-init:0.5.2 + podSecurityPolicies: + databasePolicyName: maria-db + securityContext: + runAsUser: 999 + stash: + addon: + backupTask: + name: mariadb-backup-10.5.8 + restoreTask: + name: mariadb-restore-10.5.8 + ui: + - name: phpmyadmin + version: v2024.4.27 + updateConstraints: + allowlist: + - '> 11.6.2, <= 11.6.2' + version: 11.6.2 diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json index 2f953b52d..273053ac8 100644 --- a/catalog/kubedb/restore_tasks.json +++ b/catalog/kubedb/restore_tasks.json @@ -41,6 +41,7 @@ "xpack-8.2.3" ], "mariadb-restore-10.5.8": [ + "11.6.2", "11.5.2", "11.4.3", "11.3.2", diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-11.6.2.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-11.6.2.yaml new file mode 100644 index 000000000..a4c2bc931 --- /dev/null +++ b/charts/kubedb-catalog/templates/mariadb/mariadb-11.6.2.yaml @@ -0,0 +1,56 @@ +{{ $featureGates := .Values.featureGates }} +{{- if .Values.global }} + {{ $featureGates = mergeOverwrite dict .Values.featureGates .Values.global.featureGates }} +{{- end }} + +{{ if $featureGates.MariaDB }} + +apiVersion: catalog.kubedb.com/v1alpha1 +kind: MariaDBVersion +metadata: + name: '11.6.2' + labels: + {{- include "kubedb-catalog.labels" . | nindent 4 }} +spec: + archiver: + addon: + name: mariadb-addon + tasks: + fullBackup: + name: logical-backup + fullBackupRestore: + name: logical-backup-restore + manifestBackup: + name: manifest-backup + manifestRestore: + name: manifest-restore + volumeSnapshot: + name: volume-snapshot + walg: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-archiver") $) }}:v0.9.0_11.2.2-jammy' + coordinator: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.29.0' + db: + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:11.6.2-noble' + exporter: + image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' + initContainer: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-init") $) }}:0.5.2' + podSecurityPolicies: + databasePolicyName: maria-db + securityContext: + runAsUser: 999 + stash: + addon: + backupTask: + name: mariadb-backup-10.5.8 + restoreTask: + name: mariadb-restore-10.5.8 + ui: + - name: phpmyadmin + version: v2024.4.27 + updateConstraints: + allowlist: + - '> 11.6.2, <= 11.6.2' + version: 11.6.2 +{{ end }}