From 28f1747cc9690d4af02ad8aa7081a948a467aa65 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Fri, 15 Dec 2023 09:08:14 -0800 Subject: [PATCH] Deprecate old mysql and mariadb versions Signed-off-by: Tamal Saha --- catalog/kubedb/active_versions.json | 7 +------ catalog/kubedb/backup_tasks.json | 9 ++------- ...iadb-10.10.2.yaml => deprecated-mariadb-10.10.2.yaml} | 1 + ...iadb-10.11.2.yaml => deprecated-mariadb-10.11.2.yaml} | 1 + ...iadb-10.4.31.yaml => deprecated-mariadb-10.4.31.yaml} | 1 + ...ariadb-10.6.4.yaml => deprecated-mariadb-10.6.4.yaml} | 1 + ...ficial.yaml => deprecated-mysql-8.0.31-official.yaml} | 1 + catalog/kubedb/restore_tasks.json | 9 ++------- ...iadb-10.10.2.yaml => deprecated-mariadb-10.10.2.yaml} | 3 ++- ...iadb-10.11.2.yaml => deprecated-mariadb-10.11.2.yaml} | 3 ++- ...iadb-10.4.31.yaml => deprecated-mariadb-10.4.31.yaml} | 3 ++- ...ariadb-10.6.4.yaml => deprecated-mariadb-10.6.4.yaml} | 3 ++- ...ficial.yaml => deprecated-mysql-8.0.31-official.yaml} | 3 ++- 13 files changed, 20 insertions(+), 25 deletions(-) rename catalog/kubedb/raw/mariadb/{mariadb-10.10.2.yaml => deprecated-mariadb-10.10.2.yaml} (96%) rename catalog/kubedb/raw/mariadb/{mariadb-10.11.2.yaml => deprecated-mariadb-10.11.2.yaml} (96%) rename catalog/kubedb/raw/mariadb/{mariadb-10.4.31.yaml => deprecated-mariadb-10.4.31.yaml} (96%) rename catalog/kubedb/raw/mariadb/{mariadb-10.6.4.yaml => deprecated-mariadb-10.6.4.yaml} (96%) rename catalog/kubedb/raw/mysql/{mysql-8.0.31-official.yaml => deprecated-mysql-8.0.31-official.yaml} (97%) rename charts/kubedb-catalog/templates/mariadb/{mariadb-10.10.2.yaml => deprecated-mariadb-10.10.2.yaml} (91%) rename charts/kubedb-catalog/templates/mariadb/{mariadb-10.11.2.yaml => deprecated-mariadb-10.11.2.yaml} (91%) rename charts/kubedb-catalog/templates/mariadb/{mariadb-10.4.31.yaml => deprecated-mariadb-10.4.31.yaml} (91%) rename charts/kubedb-catalog/templates/mariadb/{mariadb-10.6.4.yaml => deprecated-mariadb-10.6.4.yaml} (91%) rename charts/kubedb-catalog/templates/mysql/{mysql-8.0.31-official.yaml => deprecated-mysql-8.0.31-official.yaml} (93%) diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index 0c1badbd7..d4cb41faf 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -31,14 +31,10 @@ "11.1.3", "11.0.4", "10.11.6", - "10.11.2", "10.10.7", - "10.10.2", "10.6.16", - "10.6.4", "10.5.23", - "10.4.32", - "10.4.31" + "10.4.32" ], "Memcached": [ "1.5.22", @@ -56,7 +52,6 @@ "8.1.0", "8.0.32", "8.0.31-innodb", - "8.0.31", "5.7.41" ], "PerconaXtraDB": [ diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json index fba7f9a71..60f5f1c54 100644 --- a/catalog/kubedb/backup_tasks.json +++ b/catalog/kubedb/backup_tasks.json @@ -29,14 +29,10 @@ "11.1.3", "11.0.4", "10.11.6", - "10.11.2", "10.10.7", - "10.10.2", "10.6.16", - "10.6.4", "10.5.23", - "10.4.32", - "10.4.31" + "10.4.32" ], "mongodb-backup-4.2.3": [ "percona-4.2.7", @@ -58,8 +54,7 @@ "mysql-backup-8.0.21": [ "8.1.0", "8.0.32", - "8.0.31-innodb", - "8.0.31" + "8.0.31-innodb" ], "perconaxtradb-backup-5.7": [ "8.0.31", diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.10.2.yaml b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.10.2.yaml similarity index 96% rename from catalog/kubedb/raw/mariadb/mariadb-10.10.2.yaml rename to catalog/kubedb/raw/mariadb/deprecated-mariadb-10.10.2.yaml index 07f098442..d710a725f 100644 --- a/catalog/kubedb/raw/mariadb/mariadb-10.10.2.yaml +++ b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.10.2.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mariadb-coordinator:v0.18.0 db: image: ghcr.io/appscode-images/mariadb:10.10.2-jammy + deprecated: true exporter: image: prom/mysqld-exporter:v0.13.0 initContainer: diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.11.2.yaml b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.11.2.yaml similarity index 96% rename from catalog/kubedb/raw/mariadb/mariadb-10.11.2.yaml rename to catalog/kubedb/raw/mariadb/deprecated-mariadb-10.11.2.yaml index fe3d7e46b..4da2351aa 100644 --- a/catalog/kubedb/raw/mariadb/mariadb-10.11.2.yaml +++ b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.11.2.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mariadb-coordinator:v0.18.0 db: image: ghcr.io/appscode-images/mariadb:10.11.2-jammy + deprecated: true exporter: image: prom/mysqld-exporter:v0.13.0 initContainer: diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.4.31.yaml b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.4.31.yaml similarity index 96% rename from catalog/kubedb/raw/mariadb/mariadb-10.4.31.yaml rename to catalog/kubedb/raw/mariadb/deprecated-mariadb-10.4.31.yaml index 2f8abbd07..fd75ba9ac 100644 --- a/catalog/kubedb/raw/mariadb/mariadb-10.4.31.yaml +++ b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.4.31.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mariadb-coordinator:v0.18.0 db: image: ghcr.io/appscode-images/mariadb:10.4.31-focal + deprecated: true exporter: image: prom/mysqld-exporter:v0.13.0 initContainer: diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.6.4.yaml b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.6.4.yaml similarity index 96% rename from catalog/kubedb/raw/mariadb/mariadb-10.6.4.yaml rename to catalog/kubedb/raw/mariadb/deprecated-mariadb-10.6.4.yaml index 1ece1ba8b..c3359b14d 100644 --- a/catalog/kubedb/raw/mariadb/mariadb-10.6.4.yaml +++ b/catalog/kubedb/raw/mariadb/deprecated-mariadb-10.6.4.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mariadb-coordinator:v0.18.0 db: image: ghcr.io/appscode-images/mariadb:10.6.4-focal + deprecated: true exporter: image: prom/mysqld-exporter:v0.13.0 initContainer: diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.31-official.yaml similarity index 97% rename from catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-8.0.31-official.yaml index fa1477ac1..f0a7f249b 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.31-official.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mysql-coordinator:v0.16.0 db: image: ghcr.io/appscode-images/mysql:8.0.31-oracle + deprecated: true distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json index aab052cdc..abb4020fb 100644 --- a/catalog/kubedb/restore_tasks.json +++ b/catalog/kubedb/restore_tasks.json @@ -29,14 +29,10 @@ "11.1.3", "11.0.4", "10.11.6", - "10.11.2", "10.10.7", - "10.10.2", "10.6.16", - "10.6.4", "10.5.23", - "10.4.32", - "10.4.31" + "10.4.32" ], "mongodb-restore-4.2.3": [ "percona-4.2.7", @@ -58,8 +54,7 @@ "mysql-restore-8.0.21": [ "8.1.0", "8.0.32", - "8.0.31-innodb", - "8.0.31" + "8.0.31-innodb" ], "perconaxtradb-restore-5.7": [ "8.0.31", diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.2.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml similarity index 91% rename from charts/kubedb-catalog/templates/mariadb/mariadb-10.10.2.yaml rename to charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml index a77c3cba4..ee812e366 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.2.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.10.2.yaml @@ -1,4 +1,4 @@ -{{ if .Values.catalog.mariadb }} +{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -10,6 +10,7 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.18.0' db: image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.10.2-jammy' + deprecated: true exporter: image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' initContainer: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.2.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml similarity index 91% rename from charts/kubedb-catalog/templates/mariadb/mariadb-10.11.2.yaml rename to charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml index 7c54f1be6..8527993e8 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.2.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.11.2.yaml @@ -1,4 +1,4 @@ -{{ if .Values.catalog.mariadb }} +{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -10,6 +10,7 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.18.0' db: image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.11.2-jammy' + deprecated: true exporter: image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' initContainer: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.31.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml similarity index 91% rename from charts/kubedb-catalog/templates/mariadb/mariadb-10.4.31.yaml rename to charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml index 9847e932f..63df36fb1 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.31.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.4.31.yaml @@ -1,4 +1,4 @@ -{{ if .Values.catalog.mariadb }} +{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -10,6 +10,7 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.18.0' db: image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.4.31-focal' + deprecated: true exporter: image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' initContainer: diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.6.4.yaml b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml similarity index 91% rename from charts/kubedb-catalog/templates/mariadb/mariadb-10.6.4.yaml rename to charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml index 37fb219a3..5f0567288 100644 --- a/charts/kubedb-catalog/templates/mariadb/mariadb-10.6.4.yaml +++ b/charts/kubedb-catalog/templates/mariadb/deprecated-mariadb-10.6.4.yaml @@ -1,4 +1,4 @@ -{{ if .Values.catalog.mariadb }} +{{ if and .Values.catalog.mariadb (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MariaDBVersion metadata: @@ -10,6 +10,7 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.18.0' db: image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.6.4-focal' + deprecated: true exporter: image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' initContainer: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml similarity index 93% rename from charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml index ccd6db067..6b9c386ba 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.31-official.yaml @@ -1,4 +1,4 @@ -{{ if .Values.catalog.mysql }} +{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: @@ -10,6 +10,7 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.16.0' db: image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mysql") $) }}:8.0.31-oracle' + deprecated: true distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1'