Deprecate old mysql and mariadb versions (#743)

Signed-off-by: Tamal Saha <[email protected]>
kubedb · Dec 15, 2023 · 0d8fa43 · 0d8fa43
1 parent 97ebf54
commit 0d8fa43
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 25 deletions.
diff --git 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
@@ -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/...g/kubedb/raw/mariadb/mariadb-10.10.2.yaml → ...w/mariadb/deprecated-mariadb-10.10.2.yaml b/...g/kubedb/raw/mariadb/mariadb-10.10.2.yaml → ...w/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/...g/kubedb/raw/mariadb/mariadb-10.11.2.yaml → ...w/mariadb/deprecated-mariadb-10.11.2.yaml b/...g/kubedb/raw/mariadb/mariadb-10.11.2.yaml → ...w/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/...g/kubedb/raw/mariadb/mariadb-10.4.31.yaml → ...w/mariadb/deprecated-mariadb-10.4.31.yaml b/...g/kubedb/raw/mariadb/mariadb-10.4.31.yaml → ...w/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/...og/kubedb/raw/mariadb/mariadb-10.6.4.yaml → ...aw/mariadb/deprecated-mariadb-10.6.4.yaml b/...og/kubedb/raw/mariadb/mariadb-10.6.4.yaml → ...aw/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/...bedb/raw/mysql/mysql-8.0.31-official.yaml → ...sql/deprecated-mysql-8.0.31-official.yaml b/...bedb/raw/mysql/mysql-8.0.31-official.yaml → ...sql/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
@@ -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/...og/templates/mariadb/mariadb-10.10.2.yaml → ...s/mariadb/deprecated-mariadb-10.10.2.yaml b/...og/templates/mariadb/mariadb-10.10.2.yaml → ...s/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/...og/templates/mariadb/mariadb-10.11.2.yaml → ...s/mariadb/deprecated-mariadb-10.11.2.yaml b/...og/templates/mariadb/mariadb-10.11.2.yaml → ...s/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/...og/templates/mariadb/mariadb-10.4.31.yaml → ...s/mariadb/deprecated-mariadb-10.4.31.yaml b/...og/templates/mariadb/mariadb-10.4.31.yaml → ...s/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/...log/templates/mariadb/mariadb-10.6.4.yaml → ...es/mariadb/deprecated-mariadb-10.6.4.yaml b/...log/templates/mariadb/mariadb-10.6.4.yaml → ...es/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/...emplates/mysql/mysql-8.0.31-official.yaml → ...sql/deprecated-mysql-8.0.31-official.yaml b/...emplates/mysql/mysql-8.0.31-official.yaml → ...sql/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'