Skip to content

Commit 6861a13

Browse files
committed
Update deployment files and unit tests to use MongoDB 6.0
Signed-off-by: Thomas Jäckle <[email protected]>
1 parent aaeda1e commit 6861a13

File tree

9 files changed

+10
-12
lines changed

9 files changed

+10
-12
lines changed

deployment/docker/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ version: '3.4'
1212

1313
services:
1414
mongodb:
15-
image: docker.io/mongo:5.0
15+
image: docker.io/mongo:6.0
1616
deploy:
1717
resources:
1818
limits:

deployment/docker/sandbox/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ version: '3.4'
1212

1313
services:
1414
mongodb:
15-
image: docker.io/mongo:5.0
15+
image: docker.io/mongo:6.0
1616
deploy:
1717
resources:
1818
limits:

deployment/helm/ditto/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ description: |
1616
A digital twin is a virtual, cloud based, representation of his real world counterpart
1717
(real world “Things”, e.g. devices like sensors, smart heating, connected cars, smart grids, EV charging stations etc).
1818
type: application
19-
version: 3.5.3 # chart version is effectively set by release-job
19+
version: 3.5.4-0 # chart version is effectively set by release-job
2020
appVersion: 3.5.2
2121
keywords:
2222
- iot-chart
@@ -32,5 +32,5 @@ maintainers:
3232
dependencies:
3333
- name: mongodb
3434
repository: https://charts.bitnami.com/bitnami
35-
version: ^12.x
35+
version: ^13.x
3636
condition: mongodb.enabled

deployment/helm/ditto/README.md

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ This chart uses `eclipse/ditto-XXX` containers to run Ditto inside Kubernetes.
1010

1111
## Prerequisites
1212

13-
Installing Ditto using the chart requires the Helm tool to be installed as described on the
14-
[IoT Packages chart repository prerequisites](https://www.eclipse.org/packages/prereqs/) page.
15-
1613
TL;DR:
1714

1815
* have a correctly configured [`kubectl`](https://kubernetes.io/docs/tasks/tools/#kubectl) (either against a local or remote k8s cluster)

deployment/kubernetes/deploymentFiles/mongodb-statefulset/mongodb-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
terminationGracePeriodSeconds: 30
3434
containers:
3535
- name: mongodb
36-
image: docker.io/mongo:5.0
36+
image: docker.io/mongo:6.0
3737
command:
3838
- mongod
3939
- --bind_ip

deployment/kubernetes/deploymentFiles/mongodb/mongodb.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
spec:
3232
containers:
3333
- name: mongodb
34-
image: docker.io/mongo:5.0
34+
image: docker.io/mongo:6.0
3535
command:
3636
- mongod
3737
- --storageEngine

documentation/src/main/resources/pages/ditto/installation-running.md

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ In order to start Ditto, you'll need:
2020
* 4.2
2121
* 4.4
2222
* 5.0
23+
* 6.0
2324
* Alternatively, [Amazon DocumentDB (with MongoDB compatibility)](https://aws.amazon.com/documentdb/) may also be used,
2425
however with some limitations, see the [section about DocumentDB below](#managed-amazon-documentdb-with-mongodb-compatibility)
2526
* the built Docker images of Ditto

internal/utils/test/src/test/java/org/eclipse/ditto/internal/utils/test/docker/mongo/MongoContainerFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
final class MongoContainerFactory extends ContainerFactory {
2626

2727
private static final String MONGO_IMAGE_NAME = "mongo";
28-
private static final String DEFAULT_MONGO_VERSION = "4.2";
28+
private static final String DEFAULT_MONGO_VERSION = "6.0";
2929
private static final int MONGO_INTERNAL_PORT = 27017;
3030
private static final List<String> MONGO_COMMANDS = List.of("mongod", "--storageEngine", "wiredTiger");
3131

thingsearch/service/src/test/java/org/eclipse/ditto/thingsearch/service/persistence/write/mapping/BsonDiffVisitorV5IT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
import org.junit.ClassRule;
1717

1818
/**
19-
* Tests incremental update against MongoDB 5.0.
19+
* Tests incremental update against MongoDB 6.0.
2020
*/
2121
public final class BsonDiffVisitorV5IT extends BsonDiffVisitorIT {
2222

2323
@ClassRule
24-
public static final MongoDbResource MONGO_RESOURCE = new MongoDbResource("5.0");
24+
public static final MongoDbResource MONGO_RESOURCE = new MongoDbResource("6.0");
2525

2626
@Override
2727
protected MongoDbResource getMongoDbResource() {

0 commit comments

Comments
 (0)