Add mariadb non-root images (#717)

Signed-off-by: TasdidurRahman <[email protected]> Co-authored-by: TasdidurRahman <[email protected]>
kubedb · Nov 29, 2023 · cbc1a11 · cbc1a11
1 parent dbed260
commit cbc1a11
Show file tree

Hide file tree

Showing 29 changed files with 374 additions and 19 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -86,12 +86,17 @@
     "3.3.0"
   ],
   "MariaDB": [
+    "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.8",
-    "10.4.31",
-    "10.4.17"
+    "10.5.23",
+    "10.4.32",
+    "10.4.31"
   ],
   "Memcached": [
     "1.5.22",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -88,12 +88,17 @@
     "kubedb-xpack-8.2.0"
   ],
   "mariadb-backup-10.5.8": [
+    "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.8",
-    "10.4.31",
-    "10.4.17"
+    "10.5.23",
+    "10.4.32",
+    "10.4.31"
   ],
   "mongodb-backup-3.4.17": [
     "3.4.17-v1"

diff --git a/...g/kubedb/raw/mariadb/mariadb-10.4.17.yaml → ...w/mariadb/deprecated-mariadb-10.4.17.yaml b/...g/kubedb/raw/mariadb/mariadb-10.4.17.yaml → ...w/mariadb/deprecated-mariadb-10.4.17.yaml
@@ -7,6 +7,7 @@ spec:
     image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
   db:
     image: mariadb:10.4.17
+  deprecated: true
   exporter:
     image: prom/mysqld-exporter:v0.13.0
   initContainer:

diff --git a/...og/kubedb/raw/mariadb/mariadb-10.5.8.yaml → ...aw/mariadb/deprecated-mariadb-10.5.8.yaml b/...og/kubedb/raw/mariadb/mariadb-10.5.8.yaml → ...aw/mariadb/deprecated-mariadb-10.5.8.yaml
@@ -7,6 +7,7 @@ spec:
     image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
   db:
     image: mariadb:10.5.8
+  deprecated: true
   exporter:
     image: prom/mysqld-exporter:v0.13.0
   initContainer:

diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.10.2.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.10.2.yaml
@@ -6,7 +6,7 @@ spec:
   coordinator:
     image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
   db:
-    image: mariadb:10.10.2
+    image: ghcr.io/appscode-images/mariadb:10.10.2-jammy
   exporter:
     image: prom/mysqld-exporter:v0.13.0
   initContainer:

diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.10.7.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.10.7.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 10.10.7
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:10.10.7-jammy
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.10.7
diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.11.2.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.11.2.yaml
@@ -6,7 +6,7 @@ spec:
   coordinator:
     image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
   db:
-    image: mariadb:10.11.2
+    image: ghcr.io/appscode-images/mariadb:10.11.2-jammy
   exporter:
     image: prom/mysqld-exporter:v0.13.0
   initContainer:

diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.11.6.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.11.6.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 10.11.6
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:10.11.6-jammy
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.11.6
diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.4.31.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.4.31.yaml
@@ -6,7 +6,7 @@ spec:
   coordinator:
     image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
   db:
-    image: mariadb:10.4.31
+    image: ghcr.io/appscode-images/mariadb:10.4.31-focal
   exporter:
     image: prom/mysqld-exporter:v0.13.0
   initContainer:

diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.4.32.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.4.32.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 10.4.32
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:10.4.32-focal
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.4.32
diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.5.23.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.5.23.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 10.5.23
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:10.5.23-focal
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.5.23
diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.6.16.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.6.16.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 10.6.16
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:10.6.16-focal
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.6.16
diff --git a/catalog/kubedb/raw/mariadb/mariadb-10.6.4.yaml b/catalog/kubedb/raw/mariadb/mariadb-10.6.4.yaml
@@ -6,7 +6,7 @@ spec:
   coordinator:
     image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
   db:
-    image: mariadb:10.6.4
+    image: ghcr.io/appscode-images/mariadb:10.6.4-focal
   exporter:
     image: prom/mysqld-exporter:v0.13.0
   initContainer:

diff --git a/catalog/kubedb/raw/mariadb/mariadb-11.0.4.yaml b/catalog/kubedb/raw/mariadb/mariadb-11.0.4.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 11.0.4
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:11.0.4-jammy
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 11.0.4
diff --git a/catalog/kubedb/raw/mariadb/mariadb-11.1.3.yaml b/catalog/kubedb/raw/mariadb/mariadb-11.1.3.yaml
@@ -0,0 +1,22 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: 11.1.3
+spec:
+  coordinator:
+    image: ghcr.io/kubedb/mariadb-coordinator:v0.17.0
+  db:
+    image: ghcr.io/appscode-images/mariadb:11.1.3-jammy
+  exporter:
+    image: prom/mysqld-exporter:v0.13.0
+  initContainer:
+    image: ghcr.io/kubedb/mariadb-init:0.5.0
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 11.1.3
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -88,12 +88,17 @@
     "kubedb-xpack-8.2.0"
   ],
   "mariadb-restore-10.5.8": [
+    "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.8",
-    "10.4.31",
-    "10.4.17"
+    "10.5.23",
+    "10.4.32",
+    "10.4.31"
   ],
   "mongodb-restore-3.4.17": [
     "3.4.17-v1"

diff --git a/...og/templates/mariadb/mariadb-10.4.17.yaml → ...s/mariadb/deprecated-mariadb-10.4.17.yaml b/...og/templates/mariadb/mariadb-10.4.17.yaml → ...s/mariadb/deprecated-mariadb-10.4.17.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.17.0'
   db:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mariadb") $) }}:10.4.17'
+  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.5.8.yaml → ...es/mariadb/deprecated-mariadb-10.5.8.yaml b/...log/templates/mariadb/mariadb-10.5.8.yaml → ...es/mariadb/deprecated-mariadb-10.5.8.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.17.0'
   db:
     image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mariadb") $) }}:10.5.8'
+  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.10.2.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.2.yaml
@@ -9,7 +9,7 @@ spec:
   coordinator:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.17.0'
   db:
-    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mariadb") $) }}:10.10.2'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.10.2-jammy'
   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.10.7.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.10.7.yaml
@@ -0,0 +1,26 @@
+{{ if .Values.catalog.mariadb }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: '10.10.7'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  coordinator:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.17.0'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.10.7-jammy'
+  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.0'
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.10.7
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.2.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.2.yaml
@@ -9,7 +9,7 @@ spec:
   coordinator:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.17.0'
   db:
-    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mariadb") $) }}:10.11.2'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.11.2-jammy'
   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.6.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.11.6.yaml
@@ -0,0 +1,26 @@
+{{ if .Values.catalog.mariadb }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MariaDBVersion
+metadata:
+  name: '10.11.6'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  coordinator:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.17.0'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.11.6-jammy'
+  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.0'
+  podSecurityPolicies:
+    databasePolicyName: maria-db
+  stash:
+    addon:
+      backupTask:
+        name: mariadb-backup-10.5.8
+      restoreTask:
+        name: mariadb-restore-10.5.8
+  version: 10.11.6
+{{ end }}
diff --git a/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.31.yaml b/charts/kubedb-catalog/templates/mariadb/mariadb-10.4.31.yaml
@@ -9,7 +9,7 @@ spec:
   coordinator:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mariadb-coordinator") $) }}:v0.17.0'
   db:
-    image: '{{ include "image.dockerLibrary" (merge (dict "_repo" "mariadb") $) }}:10.4.31'
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mariadb") $) }}:10.4.31-focal'
   exporter:
     image: '{{ include "image.dockerHub" (merge (dict "_repo" "prom/mysqld-exporter") $) }}:v0.13.0'
   initContainer: