You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by wi...@apache.org on 2020/12/11 08:04:39 UTC
[incubator-streampipes-installer] branch edge-extensions updated
(b2321fd -> 36d9f74)
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a change to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git.
from b2321fd use dummy hosts for edge nodes
new b050b47 [STREAMPIPES-263] add extensions-all-jvm service
add f979bcf [STREAMPIPES-263] add extensions-all-jvm service
add cf7f21b [STREAMPIPES-264] use host path volume for persistent storage for local testing
add 3dac44e Add timescaledb test instance to cli
add a897e6d edit k8s/README.md
new 79d0aa5 Merge branch 'dev' into edge-extensions
new 36d9f74 add mosquitto instances for local multi-broker event relay setup using the node controller
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../docker-compose.dev.yml | 2 +-
.../docker-compose.yml | 8 ++--
.../docker-compose.dev.yml | 4 +-
.../docker-compose.yml | 2 +-
.../docker-compose.dev.yml | 4 +-
.../docker-compose.yml | 2 +-
.../docker-compose.dev.yml | 2 +-
.../{postgis => timescaledb}/docker-compose.yml | 13 ++++---
cli/environments/edge | 2 +
k8s/README.md | 44 +++++++++++++---------
.../core/{backend => }/backend-deployment.yaml | 28 ++++++++------
.../backend-pvc.yaml => backend-pv-pvc.yaml} | 21 ++++++++++-
.../core/{backend => }/backend-service.yaml | 2 +-
k8s/templates/core/{ui => }/ui-ingress.yaml | 2 +-
k8s/templates/core/{ui => }/ui-service.yaml | 2 +-
.../core/{ui/ui-deployment.yaml => ui.yaml} | 13 -------
.../connect-worker-deployment.yaml | 22 +----------
.../extensions/pipeline-elements/files-pvc.yaml | 22 +++++++++--
.../pipeline-elements-all-flink-deployment.yaml | 7 ----
.../pipeline-elements-all-jvm-deployment.yaml | 5 ---
.../pipeline-elements-all-jvm-service.yaml | 2 +-
.../sources-vehicle-simulator-deployment.yaml | 3 --
.../sources-watertank-simulator-deployment.yaml | 5 +--
.../sources-watertank-simulator-service.yaml | 29 --------------
.../external/activemq/activemq-deployment.yaml | 26 +++++++++++++
.../external/activemq/activemq-service.yaml | 2 +-
.../external/consul/consul-deployment.yaml | 20 ++++++++++
.../consul/{consul-pvc.yaml => consul-pv-pvc.yaml} | 21 ++++++++++-
.../{couchdb-pvc.yaml => couchdb-pv-pvc.yaml} | 21 ++++++++++-
.../external/flink/jobmanager-service.yaml | 2 +-
.../external/flink/taskmanager-service.yaml | 29 --------------
k8s/templates/external/influxdb/influxdb-pvc.yaml | 21 ++++++++++-
k8s/templates/external/kafka/kafka-deployment.yaml | 2 +
k8s/templates/external/kafka/kafka-pvc.yaml | 23 ++++++++++-
k8s/templates/external/kafka/kafka-service.yaml | 2 +
.../external/zookeeper/zookeeper-deployment.yaml | 2 +
.../external/zookeeper/zookeeper-pvc.yaml | 23 ++++++++++-
.../external/zookeeper/zookeeper-service.yaml | 4 +-
k8s/values.yaml | 11 ++++--
39 files changed, 272 insertions(+), 183 deletions(-)
copy cli/deploy/standalone/{sinks-internal-jvm => extensions-all-jvm}/docker-compose.dev.yml (97%)
copy cli/deploy/standalone/{sinks-internal-jvm => extensions-all-jvm}/docker-compose.yml (88%)
copy cli/deploy/standalone/{app-container => mosquitto-cloud}/docker-compose.dev.yml (95%)
copy cli/deploy/standalone/{mosquitto => mosquitto-cloud}/docker-compose.yml (98%)
copy cli/deploy/standalone/{app-container => mosquitto-fog}/docker-compose.dev.yml (95%)
copy cli/deploy/standalone/{mosquitto => mosquitto-fog}/docker-compose.yml (98%)
copy cli/deploy/standalone/{postgres => timescaledb}/docker-compose.dev.yml (98%)
copy cli/deploy/standalone/{postgis => timescaledb}/docker-compose.yml (84%)
rename k8s/templates/core/{backend => }/backend-deployment.yaml (72%)
rename k8s/templates/core/{backend/backend-pvc.yaml => backend-pv-pvc.yaml} (65%)
rename k8s/templates/core/{backend => }/backend-service.yaml (97%)
rename k8s/templates/core/{ui => }/ui-ingress.yaml (97%)
rename k8s/templates/core/{ui => }/ui-service.yaml (97%)
rename k8s/templates/core/{ui/ui-deployment.yaml => ui.yaml} (68%)
delete mode 100644 k8s/templates/extensions/pipeline-elements/sources-watertank-simulator-service.yaml
rename k8s/templates/external/consul/{consul-pvc.yaml => consul-pv-pvc.yaml} (65%)
rename k8s/templates/external/couchdb/{couchdb-pvc.yaml => couchdb-pv-pvc.yaml} (65%)
delete mode 100644 k8s/templates/external/flink/taskmanager-service.yaml
[incubator-streampipes-installer] 01/03: [STREAMPIPES-263] add
extensions-all-jvm service
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git
commit b050b471bbff70abc7e89db35f6eead6f29a65e4
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Wed Dec 2 11:51:59 2020 +0100
[STREAMPIPES-263] add extensions-all-jvm service
---
.../extensions-all-jvm/docker-compose.dev.yml | 20 +++++++++++
.../extensions-all-jvm/docker-compose.yml | 39 ++++++++++++++++++++++
2 files changed, 59 insertions(+)
diff --git a/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml b/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml
new file mode 100644
index 0000000..a46712c
--- /dev/null
+++ b/cli/deploy/standalone/extensions-all-jvm/docker-compose.dev.yml
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: "3.4"
+services:
+ extensions-all-jvm:
+# ports:
+# - "8098:8090"
diff --git a/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml b/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
new file mode 100644
index 0000000..2c689d7
--- /dev/null
+++ b/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml
@@ -0,0 +1,39 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+version: "3.4"
+services:
+ extensions-all-jvm:
+ image: ${SP_DOCKER_REGISTRY}extensions-all-jvm:${SP_VERSION}
+ depends_on:
+ - consul
+ - backend
+ - couchdb
+ volumes:
+ - files:/spImages
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "1"
+ networks:
+ spnet:
+
+volumes:
+ files:
+
+networks:
+ spnet:
+ external: true
[incubator-streampipes-installer] 03/03: add mosquitto instances
for local multi-broker event relay setup using the node controller
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git
commit 36d9f740ad3505fd992fffc716aa7400d0e3b9f3
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Fri Dec 11 09:03:51 2020 +0100
add mosquitto instances for local multi-broker event relay setup using the node controller
---
.../mosquitto-cloud/docker-compose.dev.yml} | 13 +++++-------
.../standalone/mosquitto-cloud/docker-compose.yml} | 23 ++++++++++++++--------
.../mosquitto-fog/docker-compose.dev.yml} | 13 +++++-------
.../standalone/mosquitto-fog/docker-compose.yml} | 23 ++++++++++++++--------
cli/environments/edge | 2 ++
5 files changed, 42 insertions(+), 32 deletions(-)
diff --git a/cli/environments/edge b/cli/deploy/standalone/mosquitto-cloud/docker-compose.dev.yml
similarity index 90%
copy from cli/environments/edge
copy to cli/deploy/standalone/mosquitto-cloud/docker-compose.dev.yml
index 4b9dd4f..83bcf9c 100644
--- a/cli/environments/edge
+++ b/cli/deploy/standalone/mosquitto-cloud/docker-compose.dev.yml
@@ -13,11 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-[environment:edge]
-activemq
-kafka
-consul
-zookeeper
-couchdb
-influxdb
-mosquitto
+version: "3.4"
+services:
+ mosquitto-cloud:
+ ports:
+ - "1885:1883"
diff --git a/cli/environments/edge b/cli/deploy/standalone/mosquitto-cloud/docker-compose.yml
similarity index 76%
copy from cli/environments/edge
copy to cli/deploy/standalone/mosquitto-cloud/docker-compose.yml
index 4b9dd4f..8e76980 100644
--- a/cli/environments/edge
+++ b/cli/deploy/standalone/mosquitto-cloud/docker-compose.yml
@@ -13,11 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-[environment:edge]
-activemq
-kafka
-consul
-zookeeper
-couchdb
-influxdb
-mosquitto
+version: "3.4"
+services:
+ mosquitto-cloud:
+ image: eclipse-mosquitto:1.6.12
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "1"
+ networks:
+ spnet:
+
+networks:
+ spnet:
+ external: true
diff --git a/cli/environments/edge b/cli/deploy/standalone/mosquitto-fog/docker-compose.dev.yml
similarity index 90%
copy from cli/environments/edge
copy to cli/deploy/standalone/mosquitto-fog/docker-compose.dev.yml
index 4b9dd4f..5d82f14 100644
--- a/cli/environments/edge
+++ b/cli/deploy/standalone/mosquitto-fog/docker-compose.dev.yml
@@ -13,11 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-[environment:edge]
-activemq
-kafka
-consul
-zookeeper
-couchdb
-influxdb
-mosquitto
+version: "3.4"
+services:
+ mosquitto-fog:
+ ports:
+ - "1886:1883"
diff --git a/cli/environments/edge b/cli/deploy/standalone/mosquitto-fog/docker-compose.yml
similarity index 76%
copy from cli/environments/edge
copy to cli/deploy/standalone/mosquitto-fog/docker-compose.yml
index 4b9dd4f..d91bd78 100644
--- a/cli/environments/edge
+++ b/cli/deploy/standalone/mosquitto-fog/docker-compose.yml
@@ -13,11 +13,18 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-[environment:edge]
-activemq
-kafka
-consul
-zookeeper
-couchdb
-influxdb
-mosquitto
+version: "3.4"
+services:
+ mosquitto-fog:
+ image: eclipse-mosquitto:1.6.12
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1m"
+ max-file: "1"
+ networks:
+ spnet:
+
+networks:
+ spnet:
+ external: true
diff --git a/cli/environments/edge b/cli/environments/edge
index 4b9dd4f..8b18f49 100644
--- a/cli/environments/edge
+++ b/cli/environments/edge
@@ -21,3 +21,5 @@ zookeeper
couchdb
influxdb
mosquitto
+mosquitto-cloud
+mosquitto-fog
[incubator-streampipes-installer] 02/03: Merge branch 'dev' into
edge-extensions
Posted by wi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wiener pushed a commit to branch edge-extensions
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git
commit 79d0aa5364db696dd2556e7431ac5c1ad2a6109f
Merge: b050b47 a897e6d
Author: Patrick Wiener <wi...@fzi.de>
AuthorDate: Thu Dec 10 10:08:03 2020 +0100
Merge branch 'dev' into edge-extensions
.../standalone/timescaledb/docker-compose.dev.yml | 15 +++-----
.../standalone/timescaledb/docker-compose.yml | 33 +++++++++++-----
k8s/README.md | 44 +++++++++++++---------
.../core/{backend => }/backend-deployment.yaml | 28 ++++++++------
.../backend-pvc.yaml => backend-pv-pvc.yaml} | 21 ++++++++++-
.../core/{backend => }/backend-service.yaml | 2 +-
k8s/templates/core/{ui => }/ui-ingress.yaml | 2 +-
k8s/templates/core/{ui => }/ui-service.yaml | 2 +-
.../core/{ui/ui-deployment.yaml => ui.yaml} | 13 -------
.../connect-worker-deployment.yaml | 22 +----------
.../extensions/pipeline-elements/files-pvc.yaml | 22 +++++++++--
.../pipeline-elements-all-flink-deployment.yaml | 7 ----
.../pipeline-elements-all-jvm-deployment.yaml | 5 ---
.../pipeline-elements-all-jvm-service.yaml | 2 +-
.../sources-vehicle-simulator-deployment.yaml | 3 --
.../sources-watertank-simulator-deployment.yaml | 5 +--
.../sources-watertank-simulator-service.yaml | 29 --------------
.../external/activemq/activemq-deployment.yaml | 26 +++++++++++++
.../external/activemq/activemq-service.yaml | 2 +-
.../external/consul/consul-deployment.yaml | 20 ++++++++++
.../consul/{consul-pvc.yaml => consul-pv-pvc.yaml} | 21 ++++++++++-
.../{couchdb-pvc.yaml => couchdb-pv-pvc.yaml} | 21 ++++++++++-
.../external/flink/jobmanager-service.yaml | 2 +-
.../external/flink/taskmanager-service.yaml | 29 --------------
k8s/templates/external/influxdb/influxdb-pvc.yaml | 21 ++++++++++-
k8s/templates/external/kafka/kafka-deployment.yaml | 2 +
k8s/templates/external/kafka/kafka-pvc.yaml | 23 ++++++++++-
k8s/templates/external/kafka/kafka-service.yaml | 2 +
.../external/zookeeper/zookeeper-deployment.yaml | 2 +
.../external/zookeeper/zookeeper-pvc.yaml | 23 ++++++++++-
.../external/zookeeper/zookeeper-service.yaml | 4 +-
k8s/values.yaml | 11 ++++--
32 files changed, 278 insertions(+), 186 deletions(-)