deprecate all older official versions for mongodb

Signed-off-by: Arnob kumar saha <[email protected]>
kubedb · Dec 8, 2023 · 3b16a0f · 3b16a0f
1 parent c78e18f
commit 3b16a0f
Show file tree

Hide file tree

Showing 17 changed files with 330 additions and 73 deletions.
diff --git a/catalog/kubedb/active_versions.json b/catalog/kubedb/active_versions.json
@@ -103,13 +103,12 @@
     "1.5.4-v1"
   ],
   "MongoDB": [
-    "6.0.5",
-    "5.0.15",
+    "6.0.12",
+    "5.0.23",
+    "4.4.25",
     "percona-4.4.10",
-    "4.4.6",
     "4.2.24",
-    "percona-4.2.7",
-    "4.2.3"
+    "percona-4.2.7"
   ],
   "MySQL": [
     "8.1.0",

diff --git a/catalog/kubedb/backup_tasks.json b/catalog/kubedb/backup_tasks.json
@@ -102,18 +102,17 @@
   ],
   "mongodb-backup-4.2.3": [
     "percona-4.2.7",
-    "4.2.24",
-    "4.2.3"
+    "4.2.24"
   ],
   "mongodb-backup-4.4.6": [
     "percona-4.4.10",
-    "4.4.6"
+    "4.4.25"
   ],
   "mongodb-backup-5.0.15": [
-    "5.0.15"
+    "5.0.23"
   ],
   "mongodb-backup-6.0.5": [
-    "6.0.5"
+    "6.0.12"
   ],
   "mysql-backup-5.7.25": [
     "5.7.41"

diff --git a/...b/raw/mongodb/mongodb-4.2.3-official.yaml → ...db/deprecated-mongodb-4.2.3-official.yaml b/...b/raw/mongodb/mongodb-4.2.3-official.yaml → ...db/deprecated-mongodb-4.2.3-official.yaml
@@ -1,5 +1,27 @@
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MongoDBVersion
+metadata:
+  name: "4.2"
+spec:
+  db:
+    image: ghcr.io/kubedb/mongo:4.2
+  deprecated: true
+  distribution: Official
+  exporter:
+    image: ghcr.io/kubedb/mongodb_exporter:v0.20.4
+  gitSyncer:
+    image: registry.k8s.io/git-sync/git-sync:v4.1.0
+  initContainer:
+    image: ghcr.io/kubedb/mongodb-init:0.3.0
+  podSecurityPolicies:
+    databasePolicyName: mongodb-db
+  replicationModeDetector:
+    image: ghcr.io/kubedb/replication-mode-detector:v0.25.0-rc.1
+  version: 4.2.3
+
+---
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MongoDBVersion
 metadata:
   name: 4.2.3
 spec:
@@ -17,6 +39,7 @@ spec:
       image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
   db:
     image: ghcr.io/appscode-images/mongo:4.2.3
+  deprecated: true
   distribution: Official
   exporter:
     image: ghcr.io/kubedb/mongodb_exporter:v0.32.0
@@ -40,25 +63,3 @@ spec:
     allowlist:
     - '>= 4.4.0, < 5.0.0'
   version: 4.2.3
-
----
-apiVersion: catalog.kubedb.com/v1alpha1
-kind: MongoDBVersion
-metadata:
-  name: "4.2"
-spec:
-  db:
-    image: ghcr.io/kubedb/mongo:4.2
-  deprecated: true
-  distribution: Official
-  exporter:
-    image: ghcr.io/kubedb/mongodb_exporter:v0.20.4
-  gitSyncer:
-    image: registry.k8s.io/git-sync/git-sync:v4.1.0
-  initContainer:
-    image: ghcr.io/kubedb/mongodb-init:0.3.0
-  podSecurityPolicies:
-    databasePolicyName: mongodb-db
-  replicationModeDetector:
-    image: ghcr.io/kubedb/replication-mode-detector:v0.25.0-rc.1
-  version: 4.2.3
diff --git a/...b/raw/mongodb/mongodb-4.4.6-official.yaml → ...db/deprecated-mongodb-4.4.6-official.yaml b/...b/raw/mongodb/mongodb-4.4.6-official.yaml → ...db/deprecated-mongodb-4.4.6-official.yaml
@@ -17,6 +17,7 @@ spec:
       image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
   db:
     image: ghcr.io/appscode-images/mongo:4.4.6
+  deprecated: true
   distribution: Official
   exporter:
     image: ghcr.io/kubedb/mongodb_exporter:v0.32.0

diff --git a/.../raw/mongodb/mongodb-5.0.15-official.yaml → ...b/deprecated-mongodb-5.0.15-official.yaml b/.../raw/mongodb/mongodb-5.0.15-official.yaml → ...b/deprecated-mongodb-5.0.15-official.yaml
@@ -17,6 +17,7 @@ spec:
       image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
   db:
     image: ghcr.io/appscode-images/mongo:5.0.15
+  deprecated: true
   distribution: Official
   exporter:
     image: ghcr.io/kubedb/mongodb_exporter:v0.32.0

diff --git a/...b/raw/mongodb/mongodb-6.0.5-official.yaml → ...db/deprecated-mongodb-6.0.5-official.yaml b/...b/raw/mongodb/mongodb-6.0.5-official.yaml → ...db/deprecated-mongodb-6.0.5-official.yaml
@@ -17,6 +17,7 @@ spec:
       image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
   db:
     image: ghcr.io/appscode-images/mongo:6.0.5
+  deprecated: true
   distribution: Official
   exporter:
     image: ghcr.io/kubedb/mongodb_exporter:v0.32.0

diff --git a/catalog/kubedb/raw/mongodb/mongodb-4.4.25-official.yaml b/catalog/kubedb/raw/mongodb/mongodb-4.4.25-official.yaml
@@ -0,0 +1,42 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MongoDBVersion
+metadata:
+  name: 4.4.25
+spec:
+  archiver:
+    addon:
+      name: mongodb-addon
+      tasks:
+        manifestBackup:
+          name: ManifestBackup
+        manifestRestore:
+          name: ManifestRestore
+        volumeSnapshot:
+          name: VolumeSnapshot
+    walg:
+      image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
+  db:
+    image: ghcr.io/appscode-images/mongo:4.4.25
+  distribution: Official
+  exporter:
+    image: ghcr.io/kubedb/mongodb_exporter:v0.32.0
+  gitSyncer:
+    image: registry.k8s.io/git-sync/git-sync:v4.1.0
+  initContainer:
+    image: ghcr.io/kubedb/mongodb-init:4.2-v9
+  podSecurityPolicies:
+    databasePolicyName: mongodb-db
+  replicationModeDetector:
+    image: ghcr.io/kubedb/replication-mode-detector:v0.25.0-rc.1
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: mongodb-backup-4.4.6
+      restoreTask:
+        name: mongodb-restore-4.4.6
+  updateConstraints:
+    allowlist:
+    - '>= 5.0.0'
+  version: 4.4.25
diff --git a/catalog/kubedb/raw/mongodb/mongodb-5.0.23-official.yaml b/catalog/kubedb/raw/mongodb/mongodb-5.0.23-official.yaml
@@ -0,0 +1,39 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MongoDBVersion
+metadata:
+  name: 5.0.23
+spec:
+  archiver:
+    addon:
+      name: mongodb-addon
+      tasks:
+        manifestBackup:
+          name: ManifestBackup
+        manifestRestore:
+          name: ManifestRestore
+        volumeSnapshot:
+          name: VolumeSnapshot
+    walg:
+      image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
+  db:
+    image: ghcr.io/appscode-images/mongo:5.0.23
+  distribution: Official
+  exporter:
+    image: ghcr.io/kubedb/mongodb_exporter:v0.32.0
+  gitSyncer:
+    image: registry.k8s.io/git-sync/git-sync:v4.1.0
+  initContainer:
+    image: ghcr.io/kubedb/mongodb-init:4.2-v9
+  podSecurityPolicies:
+    databasePolicyName: mongodb-db
+  replicationModeDetector:
+    image: ghcr.io/kubedb/replication-mode-detector:v0.25.0-rc.1
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: mongodb-backup-5.0.15
+      restoreTask:
+        name: mongodb-restore-5.0.15
+  version: 5.0.23
diff --git a/catalog/kubedb/raw/mongodb/mongodb-6.0.12-official.yaml b/catalog/kubedb/raw/mongodb/mongodb-6.0.12-official.yaml
@@ -0,0 +1,39 @@
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MongoDBVersion
+metadata:
+  name: 6.0.12
+spec:
+  archiver:
+    addon:
+      name: mongodb-addon
+      tasks:
+        manifestBackup:
+          name: ManifestBackup
+        manifestRestore:
+          name: ManifestRestore
+        volumeSnapshot:
+          name: VolumeSnapshot
+    walg:
+      image: ghcr.io/kubedb/wal-g:v2023.11.30_mongo
+  db:
+    image: ghcr.io/appscode-images/mongo:6.0.12
+  distribution: Official
+  exporter:
+    image: ghcr.io/kubedb/mongodb_exporter:v0.32.0
+  gitSyncer:
+    image: registry.k8s.io/git-sync/git-sync:v4.1.0
+  initContainer:
+    image: ghcr.io/kubedb/mongodb-init:6.0-v9
+  podSecurityPolicies:
+    databasePolicyName: mongodb-db
+  replicationModeDetector:
+    image: ghcr.io/kubedb/replication-mode-detector:v0.25.0-rc.1
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: mongodb-backup-6.0.5
+      restoreTask:
+        name: mongodb-restore-6.0.5
+  version: 6.0.12
diff --git a/catalog/kubedb/restore_tasks.json b/catalog/kubedb/restore_tasks.json
@@ -102,18 +102,17 @@
   ],
   "mongodb-restore-4.2.3": [
     "percona-4.2.7",
-    "4.2.24",
-    "4.2.3"
+    "4.2.24"
   ],
   "mongodb-restore-4.4.6": [
     "percona-4.4.10",
-    "4.4.6"
+    "4.4.25"
   ],
   "mongodb-restore-5.0.15": [
-    "5.0.15"
+    "5.0.23"
   ],
   "mongodb-restore-6.0.5": [
-    "6.0.5"
+    "6.0.12"
   ],
   "mysql-restore-5.7.25": [
     "5.7.41"

diff --git a/...lates/mongodb/mongodb-4.2.3-official.yaml → ...db/deprecated-mongodb-4.2.3-official.yaml b/...lates/mongodb/mongodb-4.2.3-official.yaml → ...db/deprecated-mongodb-4.2.3-official.yaml
@@ -1,4 +1,30 @@
-{{ if .Values.catalog.mongodb }}
+{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MongoDBVersion
+metadata:
+  name: '4.2'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongo") $) }}:4.2'
+  deprecated: true
+  distribution: Official
+  exporter:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb_exporter") $) }}:v0.20.4'
+  gitSyncer:
+    image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.1.0'
+  initContainer:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb-init") $) }}:0.3.0'
+  podSecurityPolicies:
+    databasePolicyName: mongodb-db
+  replicationModeDetector:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.25.0-rc.1'
+  version: 4.2.3
+{{ end }}
+
+---
+{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }}
 apiVersion: catalog.kubedb.com/v1alpha1
 kind: MongoDBVersion
 metadata:
@@ -20,6 +46,7 @@ spec:
       image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/wal-g") $) }}:v2023.11.30_mongo'
   db:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mongo") $) }}:4.2.3'
+  deprecated: true
   distribution: Official
   exporter:
     image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb_exporter") $) }}:v0.32.0'
@@ -44,29 +71,3 @@ spec:
     - '>= 4.4.0, < 5.0.0'
   version: 4.2.3
 {{ end }}
-
----
-{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }}
-apiVersion: catalog.kubedb.com/v1alpha1
-kind: MongoDBVersion
-metadata:
-  name: '4.2'
-  labels:
-    {{- include "kubedb-catalog.labels" . | nindent 4 }}
-spec:
-  db:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongo") $) }}:4.2'
-  deprecated: true
-  distribution: Official
-  exporter:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb_exporter") $) }}:v0.20.4'
-  gitSyncer:
-    image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.1.0'
-  initContainer:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb-init") $) }}:0.3.0'
-  podSecurityPolicies:
-    databasePolicyName: mongodb-db
-  replicationModeDetector:
-    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.25.0-rc.1'
-  version: 4.2.3
-{{ end }}
diff --git a/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.4.6-official.yaml b/charts/kubedb-catalog/templates/mongodb/deprecated-mongodb-4.4.6-official.yaml
@@ -0,0 +1,47 @@
+{{ if and .Values.catalog.mongodb (not .Values.skipDeprecated) }}
+apiVersion: catalog.kubedb.com/v1alpha1
+kind: MongoDBVersion
+metadata:
+  name: '4.4.6'
+  labels:
+    {{- include "kubedb-catalog.labels" . | nindent 4 }}
+spec:
+  archiver:
+    addon:
+      name: mongodb-addon
+      tasks:
+        manifestBackup:
+          name: ManifestBackup
+        manifestRestore:
+          name: ManifestRestore
+        volumeSnapshot:
+          name: VolumeSnapshot
+    walg:
+      image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/wal-g") $) }}:v2023.11.30_mongo'
+  db:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "appscode-images/mongo") $) }}:4.4.6'
+  deprecated: true
+  distribution: Official
+  exporter:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb_exporter") $) }}:v0.32.0'
+  gitSyncer:
+    image: '{{ include "image.kubernetes" (merge (dict "_repo" "git-sync/git-sync") $) }}:v4.1.0'
+  initContainer:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/mongodb-init") $) }}:4.2-v9'
+  podSecurityPolicies:
+    databasePolicyName: mongodb-db
+  replicationModeDetector:
+    image: '{{ include "image.ghcr" (merge (dict "_repo" "kubedb/replication-mode-detector") $) }}:v0.25.0-rc.1'
+  securityContext:
+    runAsUser: 999
+  stash:
+    addon:
+      backupTask:
+        name: mongodb-backup-4.4.6
+      restoreTask:
+        name: mongodb-restore-4.4.6
+  updateConstraints:
+    allowlist:
+    - '>= 5.0.0'
+  version: 4.4.6
+{{ end }}