You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ze...@apache.org on 2021/10/12 09:07:24 UTC
[incubator-streampipes-installer] branch dev updated:
[STREAMPIPES-387] Split StreamPipes Connect worker into two different
services
This is an automated email from the ASF dual-hosted git repository.
zehnder pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes-installer.git
The following commit(s) were added to refs/heads/dev by this push:
new e4da46b [STREAMPIPES-387] Split StreamPipes Connect worker into two different services
e4da46b is described below
commit e4da46bffad5cd179e896d80577697a01f4c9ab1
Author: Philipp Zehnder <ze...@fzi.de>
AuthorDate: Tue Oct 12 11:07:03 2021 +0200
[STREAMPIPES-387] Split StreamPipes Connect worker into two different services
---
.../docker-compose.dev.yml | 4 ++--
.../docker-compose.yml | 7 +++----
.../docker-compose.dev.yml | 4 ++--
.../docker-compose.yml | 7 +++----
cli/environments/backend | 2 +-
cli/environments/full | 3 ++-
cli/environments/lite | 2 +-
cli/environments/minimal | 2 +-
cli/environments/pipeline-element | 2 +-
cli/environments/ui | 2 +-
compose/docker-compose.full.yml | 21 +++++++++++++++++----
compose/docker-compose.yml | 7 +++----
...oyment.yaml => connect-adapters-deployment.yaml} | 12 ++++++------
...t.yaml => connect-adapters-iiot-deployment.yaml} | 12 ++++++------
...vice.yaml => connect-adapters-iiot-service.yaml} | 8 ++++----
...r-service.yaml => connect-adapters-service.yaml} | 8 ++++----
16 files changed, 57 insertions(+), 46 deletions(-)
diff --git a/cli/deploy/standalone/connect-worker-main/docker-compose.dev.yml b/cli/deploy/standalone/connect-adapters-iiot/docker-compose.dev.yml
similarity index 94%
copy from cli/deploy/standalone/connect-worker-main/docker-compose.dev.yml
copy to cli/deploy/standalone/connect-adapters-iiot/docker-compose.dev.yml
index 771cff1..e26e633 100644
--- a/cli/deploy/standalone/connect-worker-main/docker-compose.dev.yml
+++ b/cli/deploy/standalone/connect-adapters-iiot/docker-compose.dev.yml
@@ -15,6 +15,6 @@
version: "3.4"
services:
- connect-worker-main:
+ connect-adapters-iiot:
ports:
- - "8098:8098"
+ - "8002:8090"
diff --git a/cli/deploy/standalone/connect-worker-main/docker-compose.yml b/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
similarity index 87%
copy from cli/deploy/standalone/connect-worker-main/docker-compose.yml
copy to cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
index 67ed026..30e1500 100644
--- a/cli/deploy/standalone/connect-worker-main/docker-compose.yml
+++ b/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml
@@ -15,14 +15,13 @@
version: "3.4"
services:
- connect-worker-main:
- image: ${SP_DOCKER_REGISTRY}/connect-worker:${SP_VERSION}
+ connect-adapters-iiot:
+ image: ${SP_DOCKER_REGISTRY}/connect-adapters-iiot:${SP_VERSION}
depends_on:
- consul
- - couchdb
environment:
- SP_BACKEND_HOST=backend
- - SP_CONNECT_CONTAINER_WORKER_HOST=connect-worker-main
+ - SP_CONNECT_CONTAINER_WORKER_HOST=connect-adapters-iiot
volumes:
- connect:/data/
logging:
diff --git a/cli/deploy/standalone/connect-worker-main/docker-compose.dev.yml b/cli/deploy/standalone/connect-adapters/docker-compose.dev.yml
similarity index 95%
rename from cli/deploy/standalone/connect-worker-main/docker-compose.dev.yml
rename to cli/deploy/standalone/connect-adapters/docker-compose.dev.yml
index 771cff1..1950893 100644
--- a/cli/deploy/standalone/connect-worker-main/docker-compose.dev.yml
+++ b/cli/deploy/standalone/connect-adapters/docker-compose.dev.yml
@@ -15,6 +15,6 @@
version: "3.4"
services:
- connect-worker-main:
+ connect-adapters:
ports:
- - "8098:8098"
+ - "8001:8090"
diff --git a/cli/deploy/standalone/connect-worker-main/docker-compose.yml b/cli/deploy/standalone/connect-adapters/docker-compose.yml
similarity index 87%
rename from cli/deploy/standalone/connect-worker-main/docker-compose.yml
rename to cli/deploy/standalone/connect-adapters/docker-compose.yml
index 67ed026..70fa81e 100644
--- a/cli/deploy/standalone/connect-worker-main/docker-compose.yml
+++ b/cli/deploy/standalone/connect-adapters/docker-compose.yml
@@ -15,14 +15,13 @@
version: "3.4"
services:
- connect-worker-main:
- image: ${SP_DOCKER_REGISTRY}/connect-worker:${SP_VERSION}
+ connect-adapters:
+ image: ${SP_DOCKER_REGISTRY}/connect-adapters:${SP_VERSION}
depends_on:
- consul
- - couchdb
environment:
- SP_BACKEND_HOST=backend
- - SP_CONNECT_CONTAINER_WORKER_HOST=connect-worker-main
+ - SP_CONNECT_CONTAINER_WORKER_HOST=connect-adapters
volumes:
- connect:/data/
logging:
diff --git a/cli/environments/backend b/cli/environments/backend
index ba7e25f..5094860 100644
--- a/cli/environments/backend
+++ b/cli/environments/backend
@@ -20,6 +20,6 @@ consul
zookeeper
couchdb
influxdb
-connect-worker-main
+connect-adapters-iiot
pipeline-elements-all-jvm
ui
diff --git a/cli/environments/full b/cli/environments/full
index d9938c6..2f50bb8 100644
--- a/cli/environments/full
+++ b/cli/environments/full
@@ -16,7 +16,8 @@
[environment:full]
ui
backend
-connect-worker-main
+connect-adapters
+connect-adapters-iiot
activemq
consul
couchdb
diff --git a/cli/environments/lite b/cli/environments/lite
index f822fed..d8737b0 100644
--- a/cli/environments/lite
+++ b/cli/environments/lite
@@ -16,7 +16,7 @@
[environment:lite]
ui
backend
-connect-worker-main
+connect-adapters-iiot
activemq
consul
couchdb
diff --git a/cli/environments/minimal b/cli/environments/minimal
index 9580470..d31a4fe 100644
--- a/cli/environments/minimal
+++ b/cli/environments/minimal
@@ -16,7 +16,7 @@
[environment:minimal]
ui
backend
-connect-worker-main
+connect-adapters-iiot
activemq
consul
couchdb
diff --git a/cli/environments/pipeline-element b/cli/environments/pipeline-element
index be1e105..625c075 100644
--- a/cli/environments/pipeline-element
+++ b/cli/environments/pipeline-element
@@ -17,7 +17,7 @@
activemq
backend
consul
-connect-worker-main
+connect-adapters-iiot
couchdb
kafka
ui
diff --git a/cli/environments/ui b/cli/environments/ui
index c02ede6..9f73304 100644
--- a/cli/environments/ui
+++ b/cli/environments/ui
@@ -17,7 +17,7 @@
activemq
backend
consul
-connect-worker-main
+connect-adapters-iiot
couchdb
kafka
sources-watertank-simulator
diff --git a/compose/docker-compose.full.yml b/compose/docker-compose.full.yml
index ae33f50..0ce6919 100644
--- a/compose/docker-compose.full.yml
+++ b/compose/docker-compose.full.yml
@@ -38,14 +38,27 @@ services:
networks:
spnet:
- connect-worker-main:
- image: "${SP_DOCKER_REGISTRY}/connect-worker:${SP_VERSION}"
+ connect-adapters:
+ image: "${SP_DOCKER_REGISTRY}/connect-adapters:${SP_VERSION}"
+ depends_on:
+ - consul
+ environment:
+ - SP_BACKEND_HOST=backend
+ - SP_CONNECT_CONTAINER_WORKER=connect-adapters
+ volumes:
+ - connect:/data/
+ logging: *default-logging
+ restart: unless-stopped
+ networks:
+ spnet:
+
+ connect-adapters-iiot:
+ image: "${SP_DOCKER_REGISTRY}/connect-adapters-iiot:${SP_VERSION}"
depends_on:
- consul
- - couchdb
environment:
- SP_BACKEND_HOST=backend
- - SP_CONNECT_CONTAINER_WORKER=connect-worker-main
+ - SP_CONNECT_CONTAINER_WORKER=connect-adapters
volumes:
- connect:/data/
logging: *default-logging
diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index a4bbac0..fecab0c 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -38,14 +38,13 @@ services:
networks:
spnet:
- connect-worker-main:
- image: "${SP_DOCKER_REGISTRY}/connect-worker:${SP_VERSION}"
+ connect-adapters-iiot:
+ image: "${SP_DOCKER_REGISTRY}/connect-adapters-iiot:${SP_VERSION}"
depends_on:
- consul
- - couchdb
environment:
- SP_BACKEND_HOST=backend
- - SP_CONNECT_CONTAINER_WORKER=connect-worker-main
+ - SP_CONNECT_CONTAINER_WORKER=connect-adapters
volumes:
- connect:/data/
logging: *default-logging
diff --git a/k8s/templates/extensions/connect-adapters/connect-worker-deployment.yaml b/k8s/templates/extensions/connect-adapters/connect-adapters-deployment.yaml
similarity index 80%
copy from k8s/templates/extensions/connect-adapters/connect-worker-deployment.yaml
copy to k8s/templates/extensions/connect-adapters/connect-adapters-deployment.yaml
index 022c78d..1dc5526 100644
--- a/k8s/templates/extensions/connect-adapters/connect-worker-deployment.yaml
+++ b/k8s/templates/extensions/connect-adapters/connect-adapters-deployment.yaml
@@ -16,20 +16,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: connect-worker
+ name: connect-adapters
spec:
selector:
matchLabels:
- app: connect-worker
+ app: connect-adapters
replicas: 1
template:
metadata:
labels:
- app: connect-worker
+ app: connect-adapters
spec:
containers:
- - name: connect-worker
- image: {{ .Values.streampipes.registry }}/connect-worker:{{ .Values.streampipes.version }}
+ - name: connect-adapters
+ image: {{ .Values.streampipes.registry }}/connect-adapters:{{ .Values.streampipes.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- - containerPort: 8098
+ - containerPort: 8090
diff --git a/k8s/templates/extensions/connect-adapters/connect-worker-deployment.yaml b/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-deployment.yaml
similarity index 78%
rename from k8s/templates/extensions/connect-adapters/connect-worker-deployment.yaml
rename to k8s/templates/extensions/connect-adapters/connect-adapters-iiot-deployment.yaml
index 022c78d..a67ff5e 100644
--- a/k8s/templates/extensions/connect-adapters/connect-worker-deployment.yaml
+++ b/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-deployment.yaml
@@ -16,20 +16,20 @@
apiVersion: apps/v1
kind: Deployment
metadata:
- name: connect-worker
+ name: connect-adapters-iiot
spec:
selector:
matchLabels:
- app: connect-worker
+ app: connect-adapters-iiot
replicas: 1
template:
metadata:
labels:
- app: connect-worker
+ app: connect-adapters-iiot
spec:
containers:
- - name: connect-worker
- image: {{ .Values.streampipes.registry }}/connect-worker:{{ .Values.streampipes.version }}
+ - name: connect-adapters-iiot
+ image: {{ .Values.streampipes.registry }}/connect-adapters-iiot:{{ .Values.streampipes.version }}
imagePullPolicy: {{ .Values.pullPolicy }}
ports:
- - containerPort: 8098
+ - containerPort: 8090
diff --git a/k8s/templates/extensions/connect-adapters/connect-worker-service.yaml b/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-service.yaml
similarity index 89%
copy from k8s/templates/extensions/connect-adapters/connect-worker-service.yaml
copy to k8s/templates/extensions/connect-adapters/connect-adapters-iiot-service.yaml
index 3481761..d4ec559 100644
--- a/k8s/templates/extensions/connect-adapters/connect-worker-service.yaml
+++ b/k8s/templates/extensions/connect-adapters/connect-adapters-iiot-service.yaml
@@ -16,12 +16,12 @@
apiVersion: v1
kind: Service
metadata:
- name: connect-worker-main
+ name: connect-adapters-iiot
spec:
selector:
- app: connect-worker
+ app: connect-adapters-iiot
ports:
- name: main
protocol: TCP
- port: 8098
- targetPort: 8098
\ No newline at end of file
+ port: 8090
+ targetPort: 8002
diff --git a/k8s/templates/extensions/connect-adapters/connect-worker-service.yaml b/k8s/templates/extensions/connect-adapters/connect-adapters-service.yaml
similarity index 90%
rename from k8s/templates/extensions/connect-adapters/connect-worker-service.yaml
rename to k8s/templates/extensions/connect-adapters/connect-adapters-service.yaml
index 3481761..213aef3 100644
--- a/k8s/templates/extensions/connect-adapters/connect-worker-service.yaml
+++ b/k8s/templates/extensions/connect-adapters/connect-adapters-service.yaml
@@ -16,12 +16,12 @@
apiVersion: v1
kind: Service
metadata:
- name: connect-worker-main
+ name: connect-adapters
spec:
selector:
- app: connect-worker
+ app: connect-adapters
ports:
- name: main
protocol: TCP
- port: 8098
- targetPort: 8098
\ No newline at end of file
+ port: 8090
+ targetPort: 8001