You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2023/01/25 14:52:20 UTC

[streampipes] 01/01: Use latest CouchDB version 3.3.1 (#1157)

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch sp-1157-upgrade-third-party-services
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 592c59eccfe58c63155ce76c2febc9b6d2719173
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 25 15:48:18 2023 +0100

    Use latest CouchDB version 3.3.1 (#1157)
---
 docker-compose.yml                                               | 3 +++
 installer/cli/deploy/standalone/couchdb/docker-compose.yml       | 5 ++++-
 installer/compose/docker-compose.full.yml                        | 5 ++++-
 installer/compose/docker-compose.nats.yml                        | 5 ++++-
 installer/compose/docker-compose.yml                             | 5 ++++-
 installer/k8s/templates/external/couchdb/couchdb-deployment.yaml | 5 +++++
 installer/k8s/values.yaml                                        | 2 +-
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 96be1ae7b..63b9aa959 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -101,6 +101,9 @@ services:
 
   couchdb:
     image: couchdb:2.3.1
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=admin
     logging: *default-logging
     volumes:
       - couchdb:/opt/couchdb/data
diff --git a/installer/cli/deploy/standalone/couchdb/docker-compose.yml b/installer/cli/deploy/standalone/couchdb/docker-compose.yml
index e5ed6f3c7..c2f0662eb 100644
--- a/installer/cli/deploy/standalone/couchdb/docker-compose.yml
+++ b/installer/cli/deploy/standalone/couchdb/docker-compose.yml
@@ -16,9 +16,12 @@
 version: "3.4"
 services:
   couchdb:
-    image: couchdb:2.3.1
+    image: couchdb:3.3.1
     volumes:
       - couchdb:/opt/couchdb/data
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=admin
     logging:
       driver: "json-file"
       options:
diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
index 83bf879a4..ec91c4886 100644
--- a/installer/compose/docker-compose.full.yml
+++ b/installer/compose/docker-compose.full.yml
@@ -107,7 +107,10 @@ services:
         ipv4_address: ${SP_CONSUL_CONTAINER_IP}
 
   couchdb:
-    image: couchdb:2.3.1
+    image: couchdb:3.3.1
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=admin
     volumes:
       - couchdb:/opt/couchdb/data
     logging: *default-logging
diff --git a/installer/compose/docker-compose.nats.yml b/installer/compose/docker-compose.nats.yml
index ba115d92d..a9fe87680 100644
--- a/installer/compose/docker-compose.nats.yml
+++ b/installer/compose/docker-compose.nats.yml
@@ -80,7 +80,10 @@ services:
         ipv4_address: ${SP_CONSUL_CONTAINER_IP}
 
   couchdb:
-    image: couchdb:2.3.1
+    image: couchdb:3.3.1
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=admin
     volumes:
       - couchdb:/opt/couchdb/data
     logging: *default-logging
diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
index a5d7e4727..2278d8bb5 100644
--- a/installer/compose/docker-compose.yml
+++ b/installer/compose/docker-compose.yml
@@ -79,7 +79,10 @@ services:
         ipv4_address: ${SP_CONSUL_CONTAINER_IP}
 
   couchdb:
-    image: couchdb:2.3.1
+    image: couchdb:3.3.1
+    environment:
+      - COUCHDB_USER=admin
+      - COUCHDB_PASSWORD=admin
     volumes:
       - couchdb:/opt/couchdb/data
     logging: *default-logging
diff --git a/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml b/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
index 9b9367f4a..368b44ed2 100644
--- a/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
+++ b/installer/k8s/templates/external/couchdb/couchdb-deployment.yaml
@@ -35,6 +35,11 @@ spec:
         - name: couchdb
           image: couchdb:{{ .Values.external.couchdbVersion }}
           imagePullPolicy: {{ .Values.pullPolicy }}
+          env:
+            - name: COUCHDB_USER
+              value: "admin"
+            - name: COUCHDB_PASSWORD
+              value: "admin"
           ports:
             - containerPort: 5984
           volumeMounts:
diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
index cea3b6fbf..6df0636cd 100644
--- a/installer/k8s/values.yaml
+++ b/installer/k8s/values.yaml
@@ -26,7 +26,7 @@ streampipes:
 
 external:
   consulVersion: 1.9.6
-  couchdbVersion: 2.3.1
+  couchdbVersion: 3.3.1
   flinkVersion: 1.13.5-scala_2.11
   kafkaVersion: 2.2.0
   zookeeperVersion: 3.4.13