diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json index f9dd77a70..2df569b2c 100644 --- a/catalog/kubedb/active_versions.json +++ b/catalog/kubedb/active_versions.json @@ -130,14 +130,8 @@ "8.0.32", "8.0.31", "8.0.31-innodb", - "8.0.29", - "8.0.27", - "8.0.27-innodb", - "8.0.17", - "8.0.3-v4", "5.7.41", - "5.7.36", - "5.7.35-v1" + "5.7.36" ], "PerconaXtraDB": [ "8.0.31", diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json index 685902415..5fc5f7a8f 100644 --- a/catalog/kubedb/backup_tasks.json +++ b/catalog/kubedb/backup_tasks.json @@ -153,21 +153,13 @@ ], "mysql-backup-5.7.25": [ "5.7.41", - "5.7.36", - "5.7.35-v1" + "5.7.36" ], "mysql-backup-8.0.21": [ "8.1.0", "8.0.32", "8.0.31", - "8.0.31-innodb", - "8.0.29", - "8.0.27", - "8.0.27-innodb" - ], - "mysql-backup-8.0.3": [ - "8.0.17", - "8.0.3-v4" + "8.0.31-innodb" ], "perconaxtradb-backup-5.7": [ "8.0.31", diff --git a/catalog/kubedb/raw/mysql/mysql-5.7.35-official.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-5.7.35-official.yaml similarity index 98% rename from catalog/kubedb/raw/mysql/mysql-5.7.35-official.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-5.7.35-official.yaml index abafc0b46..b119fdfd3 100644 --- a/catalog/kubedb/raw/mysql/mysql-5.7.35-official.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-5.7.35-official.yaml @@ -1,19 +1,18 @@ apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 5.7.35-v1 + name: 5.7.35 spec: - coordinator: - image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: mysql:5.7.35 + image: ghcr.io/kubedb/mysql:5.7.35 + deprecated: true distribution: Official exporter: - image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 + image: prom/mysqld-exporter:v0.13.0 gitSyncer: image: registry.k8s.io/git-sync/git-sync:v4.0.0-rc5 initContainer: - image: ghcr.io/kubedb/mysql-init:5.7-v3 + image: ghcr.io/kubedb/mysql-init:5.7 podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: @@ -36,18 +35,20 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 5.7.35 + name: 5.7.35-v1 spec: + coordinator: + image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: ghcr.io/kubedb/mysql:5.7.35 + image: mysql:5.7.35 deprecated: true distribution: Official exporter: - image: prom/mysqld-exporter:v0.13.0 + image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 gitSyncer: image: registry.k8s.io/git-sync/git-sync:v4.0.0-rc5 initContainer: - image: ghcr.io/kubedb/mysql-init:5.7 + image: ghcr.io/kubedb/mysql-init:5.7-v3 podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.17-official.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.17-official.yaml similarity index 97% rename from catalog/kubedb/raw/mysql/mysql-8.0.17-official.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-8.0.17-official.yaml index 71ae65b95..8615d7962 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.17-official.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.17-official.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: image: mysql:8.0.17 + deprecated: true distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.27-mysql.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.27-mysql.yaml similarity index 98% rename from catalog/kubedb/raw/mysql/mysql-8.0.27-mysql.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-8.0.27-mysql.yaml index bba0e6d62..fc7439310 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.27-mysql.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.27-mysql.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: image: mysql/mysql-server:8.0.27 + deprecated: true distribution: MySQL exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.27-official.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.27-official.yaml similarity index 97% rename from catalog/kubedb/raw/mysql/mysql-8.0.27-official.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-8.0.27-official.yaml index 1574e55c5..a36374ca3 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.27-official.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.27-official.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: image: mysql:8.0.27 + deprecated: true distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.29-official.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.29-official.yaml similarity index 97% rename from catalog/kubedb/raw/mysql/mysql-8.0.29-official.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-8.0.29-official.yaml index 84548c767..13c23843e 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.29-official.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.29-official.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: image: mysql:8.0.29 + deprecated: true distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.3-official.yaml b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.3-official.yaml similarity index 99% rename from catalog/kubedb/raw/mysql/mysql-8.0.3-official.yaml rename to catalog/kubedb/raw/mysql/deprecated-mysql-8.0.3-official.yaml index a35ad68b9..0fea380dc 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.3-official.yaml +++ b/catalog/kubedb/raw/mysql/deprecated-mysql-8.0.3-official.yaml @@ -1,29 +1,22 @@ apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 8.0.3-v4 + name: 8.0-v1 spec: - coordinator: - image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: mysql:8.0.3 + image: ghcr.io/kubedb/mysql:8.0-v1 + deprecated: true distribution: Official exporter: - image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 + image: ghcr.io/kubedb/mysqld-exporter:v0.11.0 gitSyncer: image: registry.k8s.io/git-sync/git-sync:v4.0.0-rc5 initContainer: - image: ghcr.io/kubedb/mysql-init:8.0.3-v2 + image: ghcr.io/kubedb/busybox podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: image: ghcr.io/kubedb/replication-mode-detector:v0.24.0 - stash: - addon: - backupTask: - name: mysql-backup-8.0.3 - restoreTask: - name: mysql-restore-8.0.3 updateConstraints: allowlist: groupReplication: @@ -36,10 +29,10 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 8.0-v1 + name: 8.0.3 spec: db: - image: ghcr.io/kubedb/mysql:8.0-v1 + image: ghcr.io/kubedb/mysql:8.0.3 deprecated: true distribution: Official exporter: @@ -64,10 +57,10 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 8.0.3 + name: 8.0.3-v1 spec: db: - image: ghcr.io/kubedb/mysql:8.0.3 + image: ghcr.io/kubedb/mysql:8.0.3-v1 deprecated: true distribution: Official exporter: @@ -92,10 +85,10 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 8.0.3-v1 + name: 8.0.3-v2 spec: db: - image: ghcr.io/kubedb/mysql:8.0.3-v1 + image: ghcr.io/kubedb/mysql:8.0.3-v2 deprecated: true distribution: Official exporter: @@ -103,11 +96,17 @@ spec: gitSyncer: image: registry.k8s.io/git-sync/git-sync:v4.0.0-rc5 initContainer: - image: ghcr.io/kubedb/busybox + image: ghcr.io/kubedb/toybox:0.8.4 podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: image: ghcr.io/kubedb/replication-mode-detector:v0.24.0 + stash: + addon: + backupTask: + name: mysql-backup-8.0.3 + restoreTask: + name: mysql-restore-8.0.3 updateConstraints: allowlist: groupReplication: @@ -120,18 +119,18 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 8.0.3-v2 + name: 8.0.3-v3 spec: db: - image: ghcr.io/kubedb/mysql:8.0.3-v2 + image: mysql:8.0.3 deprecated: true distribution: Official exporter: - image: ghcr.io/kubedb/mysqld-exporter:v0.11.0 + image: prom/mysqld-exporter:v0.13.0 gitSyncer: image: registry.k8s.io/git-sync/git-sync:v4.0.0-rc5 initContainer: - image: ghcr.io/kubedb/toybox:0.8.4 + image: ghcr.io/kubedb/mysql-init:8.0.3 podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: @@ -154,18 +153,20 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: 8.0.3-v3 + name: 8.0.3-v4 spec: + coordinator: + image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: image: mysql:8.0.3 deprecated: true distribution: Official exporter: - image: prom/mysqld-exporter:v0.13.0 + image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 gitSyncer: image: registry.k8s.io/git-sync/git-sync:v4.0.0-rc5 initContainer: - image: ghcr.io/kubedb/mysql-init:8.0.3 + image: ghcr.io/kubedb/mysql-init:8.0.3-v2 podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: diff --git a/catalog/kubedb/raw/mysql/mysql-5.7.36-official.yaml b/catalog/kubedb/raw/mysql/mysql-5.7.36-official.yaml index 2c78e5d49..cc00803b6 100644 --- a/catalog/kubedb/raw/mysql/mysql-5.7.36-official.yaml +++ b/catalog/kubedb/raw/mysql/mysql-5.7.36-official.yaml @@ -7,6 +7,7 @@ spec: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: image: mysql:5.7.36 + depricated: true distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-5.7.41-official.yaml b/catalog/kubedb/raw/mysql/mysql-5.7.41-official.yaml index b69ee678e..2d39d0a33 100644 --- a/catalog/kubedb/raw/mysql/mysql-5.7.41-official.yaml +++ b/catalog/kubedb/raw/mysql/mysql-5.7.41-official.yaml @@ -6,7 +6,7 @@ spec: coordinator: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: mysql:5.7.41 + image: ghcr.io/appscode-images/mysql:5.7.41-oracle distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.31-mysql.yaml b/catalog/kubedb/raw/mysql/mysql-8.0.31-mysql.yaml index d49ddbda8..3659a2d52 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.31-mysql.yaml +++ b/catalog/kubedb/raw/mysql/mysql-8.0.31-mysql.yaml @@ -6,7 +6,7 @@ spec: coordinator: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: mysql/mysql-server:8.0.31 + image: ghcr.io/appscode-images/mysql:8.0.31-oracle distribution: MySQL exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml b/catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml index ebfcd4348..36ce2b762 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml +++ b/catalog/kubedb/raw/mysql/mysql-8.0.31-official.yaml @@ -6,7 +6,7 @@ spec: coordinator: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: mysql:8.0.31 + image: ghcr.io/appscode-images/mysql:8.0.31-oracle distribution: Official exporter: image: ghcr.io/kubedb/mysqld-exporter:v0.13.1 diff --git a/catalog/kubedb/raw/mysql/mysql-8.0.32-official.yaml b/catalog/kubedb/raw/mysql/mysql-8.0.32-official.yaml index c9527a354..48dab1f74 100644 --- a/catalog/kubedb/raw/mysql/mysql-8.0.32-official.yaml +++ b/catalog/kubedb/raw/mysql/mysql-8.0.32-official.yaml @@ -6,7 +6,7 @@ spec: coordinator: image: ghcr.io/kubedb/mysql-coordinator:v0.15.0 db: - image: mysql:8.0.32 + image: ghcr.io/appscode-images/mysql:8.0.32-oracle 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 0bf5c7ecd..694f62b58 100644 --- a/catalog/kubedb/restore_tasks.json +++ b/catalog/kubedb/restore_tasks.json @@ -153,21 +153,13 @@ ], "mysql-restore-5.7.25": [ "5.7.41", - "5.7.36", - "5.7.35-v1" + "5.7.36" ], "mysql-restore-8.0.21": [ "8.1.0", "8.0.32", "8.0.31", - "8.0.31-innodb", - "8.0.29", - "8.0.27", - "8.0.27-innodb" - ], - "mysql-restore-8.0.3": [ - "8.0.17", - "8.0.3-v4" + "8.0.31-innodb" ], "perconaxtradb-restore-5.7": [ "8.0.31", diff --git a/charts/kubedb-catalog/templates/mysql/mysql-5.7.35-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml similarity index 96% rename from charts/kubedb-catalog/templates/mysql/mysql-5.7.35-official.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml index 15fd0ad28..f7a7c1ae3 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-5.7.35-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-5.7.35-official.yaml @@ -1,22 +1,21 @@ -{{ if .Values.catalog.mysql }} +{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '5.7.35-v1' + name: '5.7.35' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: - coordinator: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:5.7.35' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:5.7.35' + deprecated: true distribution: Official exporter: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' + image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' gitSyncer: image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.0.0-rc5' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:5.7-v3' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:5.7' podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: @@ -41,20 +40,22 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '5.7.35' + name: '5.7.35-v1' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: + coordinator: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:5.7.35' + image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:5.7.35' deprecated: true distribution: Official exporter: - image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' gitSyncer: image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.0.0-rc5' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:5.7' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:5.7-v3' podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.17-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-official.yaml similarity index 93% rename from charts/kubedb-catalog/templates/mysql/mysql-8.0.17-official.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-official.yaml index 3faa8701a..852a31c98 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.17-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.17-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.15.0' db: image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.17' + deprecated: true distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.27-mysql.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.yaml similarity index 94% rename from charts/kubedb-catalog/templates/mysql/mysql-8.0.27-mysql.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.yaml index 68c2cb460..69b14987f 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.27-mysql.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-mysql.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.15.0' db: image: '{{ include "image.dockerHub" (merge (dict "_repo" "mysql/mysql-server") $) }}:8.0.27' + deprecated: true distribution: MySQL exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.27-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-official.yaml similarity index 93% rename from charts/kubedb-catalog/templates/mysql/mysql-8.0.27-official.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-official.yaml index b5916fb07..fec1b9628 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.27-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.27-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.15.0' db: image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.27' + deprecated: true distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.29-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-official.yaml similarity index 93% rename from charts/kubedb-catalog/templates/mysql/mysql-8.0.29-official.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-official.yaml index a143e2c7e..d82e8d61b 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.29-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.29-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.15.0' db: image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.29' + deprecated: true distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.3-official.yaml b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml similarity index 98% rename from charts/kubedb-catalog/templates/mysql/mysql-8.0.3-official.yaml rename to charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml index 6d9caacc8..5b52026e0 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.3-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/deprecated-mysql-8.0.3-official.yaml @@ -1,32 +1,25 @@ -{{ if .Values.catalog.mysql }} +{{ if and .Values.catalog.mysql (not .Values.skipDeprecated) }} apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '8.0.3-v4' + name: '8.0-v1' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: - coordinator: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.3' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0-v1' + deprecated: true distribution: Official exporter: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.11.0' gitSyncer: image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.0.0-rc5' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:8.0.3-v2' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/busybox") $) }}' podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.24.0' - stash: - addon: - backupTask: - name: mysql-backup-8.0.3 - restoreTask: - name: mysql-restore-8.0.3 updateConstraints: allowlist: groupReplication: @@ -41,12 +34,12 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '8.0-v1' + name: '8.0.3' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: db: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0-v1' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0.3' deprecated: true distribution: Official exporter: @@ -73,12 +66,12 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '8.0.3' + name: '8.0.3-v1' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: db: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0.3' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0.3-v1' deprecated: true distribution: Official exporter: @@ -105,12 +98,12 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '8.0.3-v1' + name: '8.0.3-v2' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: db: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0.3-v1' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0.3-v2' deprecated: true distribution: Official exporter: @@ -118,11 +111,17 @@ spec: gitSyncer: image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.0.0-rc5' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/busybox") $) }}' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/toybox") $) }}:0.8.4' podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.24.0' + stash: + addon: + backupTask: + name: mysql-backup-8.0.3 + restoreTask: + name: mysql-restore-8.0.3 updateConstraints: allowlist: groupReplication: @@ -137,20 +136,20 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '8.0.3-v2' + name: '8.0.3-v3' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: db: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql") $) }}:8.0.3-v2' + image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.3' deprecated: true distribution: Official exporter: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.11.0' + image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' gitSyncer: image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.0.0-rc5' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/toybox") $) }}:0.8.4' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:8.0.3' podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: @@ -175,20 +174,22 @@ spec: apiVersion: catalog.kubedb.com/v1alpha1 kind: MySQLVersion metadata: - name: '8.0.3-v3' + name: '8.0.3-v4' labels: {{- include "kubedb-catalog.labels" . | nindent 4 }} spec: + coordinator: + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.3' deprecated: true distribution: Official exporter: - image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' gitSyncer: image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.0.0-rc5' initContainer: - image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:8.0.3' + image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-init") $) }}:8.0.3-v2' podSecurityPolicies: databasePolicyName: mysql-db replicationModeDetector: diff --git a/charts/kubedb-catalog/templates/mysql/mysql-5.7.36-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-5.7.36-official.yaml index 27e21a404..8bde09ad6 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-5.7.36-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-5.7.36-official.yaml @@ -10,6 +10,7 @@ spec: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:5.7.36' + depricated: true distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-5.7.41-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-5.7.41-official.yaml index aaa833bb8..f974c2368 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-5.7.41-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-5.7.41-official.yaml @@ -9,7 +9,7 @@ spec: coordinator: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:5.7.41' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mysql") $) }}:5.7.41-oracle' distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml index 792ac665d..bec5517ec 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-mysql.yaml @@ -9,7 +9,7 @@ spec: coordinator: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.dockerHub" (merge (dict "_repo" "mysql/mysql-server") $) }}:8.0.31' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mysql") $) }}:8.0.31-oracle' distribution: MySQL exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml index 0bef0c98f..2e1392c1a 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.0.31-official.yaml @@ -9,7 +9,7 @@ spec: coordinator: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.31' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mysql") $) }}:8.0.31-oracle' distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1' diff --git a/charts/kubedb-catalog/templates/mysql/mysql-8.0.32-official.yaml b/charts/kubedb-catalog/templates/mysql/mysql-8.0.32-official.yaml index 400431a86..339eb6c8b 100644 --- a/charts/kubedb-catalog/templates/mysql/mysql-8.0.32-official.yaml +++ b/charts/kubedb-catalog/templates/mysql/mysql-8.0.32-official.yaml @@ -9,7 +9,7 @@ spec: coordinator: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysql-coordinator") $) }}:v0.15.0' db: - image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mysql") $) }}:8.0.32' + image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mysql") $) }}:8.0.32-oracle' distribution: Official exporter: image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mysqld-exporter") $) }}:v0.13.1'