Merge pull request #1897 from eclipse-ditto/update-using-mongodb-6

Update deployment files and unit tests to use MongoDB 6.0
eclipse-ditto · Feb 7, 2024 · beb7318 · beb7318
2 parents aaeda1e + 6861a13
commit beb7318
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 12 deletions.
diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml
@@ -12,7 +12,7 @@ version: '3.4'
 
 services:
   mongodb:
-    image: docker.io/mongo:5.0
+    image: docker.io/mongo:6.0
     deploy:
       resources:
         limits:

diff --git a/deployment/docker/sandbox/docker-compose.yml b/deployment/docker/sandbox/docker-compose.yml
@@ -12,7 +12,7 @@ version: '3.4'
 
 services:
   mongodb:
-    image: docker.io/mongo:5.0
+    image: docker.io/mongo:6.0
     deploy:
       resources:
         limits:

diff --git a/deployment/helm/ditto/Chart.yaml b/deployment/helm/ditto/Chart.yaml
@@ -16,7 +16,7 @@ description: |
   A digital twin is a virtual, cloud based, representation of his real world counterpart
   (real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
 type: application
-version: 3.5.3  # chart version is effectively set by release-job
+version: 3.5.4-0  # chart version is effectively set by release-job
 appVersion: 3.5.2
 keywords:
   - iot-chart
@@ -32,5 +32,5 @@ maintainers:
 dependencies:
   - name: mongodb
     repository: https://charts.bitnami.com/bitnami
-    version: ^12.x
+    version: ^13.x
     condition: mongodb.enabled
diff --git a/deployment/helm/ditto/README.md b/deployment/helm/ditto/README.md
@@ -10,9 +10,6 @@ This chart uses `eclipse/ditto-XXX` containers to run Ditto inside Kubernetes.
 
 ## Prerequisites
 
-Installing Ditto using the chart requires the Helm tool to be installed as described on the
-[IoT Packages chart repository prerequisites](https://www.eclipse.org/packages/prereqs/) page.
-
 TL;DR:
 
 * have a correctly configured [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) (either against a local or remote k8s cluster)

diff --git a/deployment/kubernetes/deploymentFiles/mongodb-statefulset/mongodb-statefulset.yaml b/deployment/kubernetes/deploymentFiles/mongodb-statefulset/mongodb-statefulset.yaml
@@ -33,7 +33,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
         - name: mongodb
-          image: docker.io/mongo:5.0
+          image: docker.io/mongo:6.0
           command:
             - mongod
             - --bind_ip

diff --git a/deployment/kubernetes/deploymentFiles/mongodb/mongodb.yaml b/deployment/kubernetes/deploymentFiles/mongodb/mongodb.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
         - name: mongodb
-          image: docker.io/mongo:5.0
+          image: docker.io/mongo:6.0
           command:
             - mongod
             - --storageEngine

diff --git a/documentation/src/main/resources/pages/ditto/installation-running.md b/documentation/src/main/resources/pages/ditto/installation-running.md
@@ -20,6 +20,7 @@ In order to start Ditto, you'll need:
      * 4.2
      * 4.4
      * 5.0
+     * 6.0
    * Alternatively, [Amazon DocumentDB (with MongoDB compatibility)](https://aws.amazon.com/documentdb/) may also be used,
      however with some limitations, see the [section about DocumentDB below](#managed-amazon-documentdb-with-mongodb-compatibility)
 * the built Docker images of Ditto

diff --git a/...c/test/java/org/eclipse/ditto/internal/utils/test/docker/mongo/MongoContainerFactory.java b/...c/test/java/org/eclipse/ditto/internal/utils/test/docker/mongo/MongoContainerFactory.java
@@ -25,7 +25,7 @@
 final class MongoContainerFactory extends ContainerFactory {
 
     private static final String MONGO_IMAGE_NAME = "mongo";
-    private static final String DEFAULT_MONGO_VERSION = "4.2";
+    private static final String DEFAULT_MONGO_VERSION = "6.0";
     private static final int MONGO_INTERNAL_PORT = 27017;
     private static final List<String> MONGO_COMMANDS = List.of("mongod", "--storageEngine", "wiredTiger");
 

diff --git a/.../org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitorV5IT.java b/.../org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitorV5IT.java
@@ -16,12 +16,12 @@
 import org.junit.ClassRule;
 
 /**
- * Tests incremental update against MongoDB 5.0.
+ * Tests incremental update against MongoDB 6.0.
  */
 public final class BsonDiffVisitorV5IT extends BsonDiffVisitorIT {
 
     @ClassRule
-    public static final MongoDbResource MONGO_RESOURCE = new MongoDbResource("5.0");
+    public static final MongoDbResource MONGO_RESOURCE = new MongoDbResource("6.0");
 
     @Override
     protected MongoDbResource getMongoDbResource() {