add mysql non root images

Signed-off-by: Mehedi Hasan <[email protected]>
kubedb · Nov 29, 2023 · 86b750c · 86b750c
1 parent cbc1a11
commit 86b750c
Show file tree

Hide file tree

Showing 25 changed files with 105 additions and 113 deletions.
diff --git 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
@@ -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/...bedb/raw/mysql/mysql-5.7.35-official.yaml → ...sql/deprecated-mysql-5.7.35-official.yaml b/...bedb/raw/mysql/mysql-5.7.35-official.yaml → ...sql/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/...bedb/raw/mysql/mysql-8.0.17-official.yaml → ...sql/deprecated-mysql-8.0.17-official.yaml b/...bedb/raw/mysql/mysql-8.0.17-official.yaml → ...sql/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/.../kubedb/raw/mysql/mysql-8.0.27-mysql.yaml → .../mysql/deprecated-mysql-8.0.27-mysql.yaml b/.../kubedb/raw/mysql/mysql-8.0.27-mysql.yaml → .../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/...bedb/raw/mysql/mysql-8.0.27-official.yaml → ...sql/deprecated-mysql-8.0.27-official.yaml b/...bedb/raw/mysql/mysql-8.0.27-official.yaml → ...sql/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/...bedb/raw/mysql/mysql-8.0.29-official.yaml → ...sql/deprecated-mysql-8.0.29-official.yaml b/...bedb/raw/mysql/mysql-8.0.29-official.yaml → ...sql/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/...ubedb/raw/mysql/mysql-8.0.3-official.yaml → ...ysql/deprecated-mysql-8.0.3-official.yaml b/...ubedb/raw/mysql/mysql-8.0.3-official.yaml → ...ysql/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,22 +85,28 @@ 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:
     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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...emplates/mysql/mysql-5.7.35-official.yaml → ...sql/deprecated-mysql-5.7.35-official.yaml b/...emplates/mysql/mysql-5.7.35-official.yaml → ...sql/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/...emplates/mysql/mysql-8.0.17-official.yaml → ...sql/deprecated-mysql-8.0.17-official.yaml b/...emplates/mysql/mysql-8.0.17-official.yaml → ...sql/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'