Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deployment/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version: '3.4'

services:
mongodb:
image: docker.io/mongo:5.0
image: docker.io/mongo:6.0
deploy:
resources:
limits:
Expand Down
2 changes: 1 addition & 1 deletion deployment/docker/sandbox/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version: '3.4'

services:
mongodb:
image: docker.io/mongo:5.0
image: docker.io/mongo:6.0
deploy:
resources:
limits:
Expand Down
4 changes: 2 additions & 2 deletions deployment/helm/ditto/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -32,5 +32,5 @@ maintainers:
dependencies:
- name: mongodb
repository: https://charts.bitnami.com/bitnami
version: ^12.x
version: ^13.x
condition: mongodb.enabled
3 changes: 0 additions & 3 deletions deployment/helm/ditto/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deployment/kubernetes/deploymentFiles/mongodb/mongodb.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ spec:
spec:
containers:
- name: mongodb
image: docker.io/mongo:5.0
image: docker.io/mongo:6.0
command:
- mongod
- --storageEngine
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down