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 2022/02/06 18:38:42 UTC
[incubator-streampipes] 07/07: [STREAMPIPES-509] Remove ActiveMQ dependency from installer files
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation-494
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 6080ce8cf50b1bfff0582cbd0f47e6a52158175b
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Sun Feb 6 19:38:16 2022 +0100
[STREAMPIPES-509] Remove ActiveMQ dependency from installer files
---
installer/cli/environments/adapter | 1 -
installer/cli/environments/backend | 1 -
installer/cli/environments/basic | 1 -
installer/cli/environments/full | 1 -
installer/cli/environments/lite | 1 -
installer/cli/environments/minimal | 4 +--
installer/cli/environments/pipeline-element | 4 +--
installer/cli/environments/ui | 4 +--
installer/compose/docker-compose.full.yml | 9 -----
installer/compose/docker-compose.yml | 9 -----
.../external/activemq/activemq-deployment.yaml | 39 ----------------------
.../external/activemq/activemq-service.yaml | 39 ----------------------
installer/k8s/values.yaml | 1 -
13 files changed, 3 insertions(+), 111 deletions(-)
diff --git a/installer/cli/environments/adapter b/installer/cli/environments/adapter
index 5d4eb44..8511657 100644
--- a/installer/cli/environments/adapter
+++ b/installer/cli/environments/adapter
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:adapter]
-activemq
backend
consul
couchdb
diff --git a/installer/cli/environments/backend b/installer/cli/environments/backend
index 5094860..536f185 100644
--- a/installer/cli/environments/backend
+++ b/installer/cli/environments/backend
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:backend]
-activemq
kafka
consul
zookeeper
diff --git a/installer/cli/environments/basic b/installer/cli/environments/basic
index 6957fd3..ce25e8e 100644
--- a/installer/cli/environments/basic
+++ b/installer/cli/environments/basic
@@ -14,7 +14,6 @@
# limitations under the License.
[environment:basic]
-activemq
kafka
consul
zookeeper
diff --git a/installer/cli/environments/full b/installer/cli/environments/full
index 2f50bb8..f595613 100644
--- a/installer/cli/environments/full
+++ b/installer/cli/environments/full
@@ -18,7 +18,6 @@ ui
backend
connect-adapters
connect-adapters-iiot
-activemq
consul
couchdb
jobmanager
diff --git a/installer/cli/environments/lite b/installer/cli/environments/lite
index d8737b0..3e6053a 100644
--- a/installer/cli/environments/lite
+++ b/installer/cli/environments/lite
@@ -17,7 +17,6 @@
ui
backend
connect-adapters-iiot
-activemq
consul
couchdb
kafka
diff --git a/installer/cli/environments/minimal b/installer/cli/environments/minimal
index d31a4fe..3f51549 100644
--- a/installer/cli/environments/minimal
+++ b/installer/cli/environments/minimal
@@ -16,10 +16,8 @@
[environment:minimal]
ui
backend
-connect-adapters-iiot
-activemq
consul
couchdb
influxdb
mosquitto
-pipeline-elements-all-jvm
+extensions-all-jvm
diff --git a/installer/cli/environments/pipeline-element b/installer/cli/environments/pipeline-element
index 625c075..2f6f35c 100644
--- a/installer/cli/environments/pipeline-element
+++ b/installer/cli/environments/pipeline-element
@@ -14,14 +14,12 @@
# limitations under the License.
[environment:pipeline-element]
-activemq
backend
consul
-connect-adapters-iiot
+extensions-all-jvm
couchdb
kafka
ui
sources-watertank-simulator
zookeeper
-pipeline-elements-all-jvm
influxdb
diff --git a/installer/cli/environments/ui b/installer/cli/environments/ui
index 9f73304..6a246ef 100644
--- a/installer/cli/environments/ui
+++ b/installer/cli/environments/ui
@@ -14,13 +14,11 @@
# limitations under the License.
[environment:ui]
-activemq
backend
consul
-connect-adapters-iiot
+extensions-all-jvm
couchdb
kafka
sources-watertank-simulator
zookeeper
-pipeline-elements-all-jvm
influxdb
diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
index 38ae812..92a4ca5 100644
--- a/installer/compose/docker-compose.full.yml
+++ b/installer/compose/docker-compose.full.yml
@@ -72,7 +72,6 @@ services:
- "80:80"
depends_on:
- couchdb
- - activemq
- consul
- backend
logging: *default-logging
@@ -80,14 +79,6 @@ services:
networks:
spnet:
- # Mandatory external services
- activemq:
- image: fogsyio/activemq:5.15.9
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
consul:
image: fogsyio/consul:1.9.6
environment:
diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
index 99fa7d5..358493c 100644
--- a/installer/compose/docker-compose.yml
+++ b/installer/compose/docker-compose.yml
@@ -44,7 +44,6 @@ services:
- "80:80"
depends_on:
- couchdb
- - activemq
- consul
- backend
logging: *default-logging
@@ -52,14 +51,6 @@ services:
networks:
spnet:
- # Mandatory external services
- activemq:
- image: fogsyio/activemq:5.15.9
- logging: *default-logging
- restart: unless-stopped
- networks:
- spnet:
-
consul:
image: fogsyio/consul:1.9.6
environment:
diff --git a/installer/k8s/templates/external/activemq/activemq-deployment.yaml b/installer/k8s/templates/external/activemq/activemq-deployment.yaml
deleted file mode 100644
index 979cef3..0000000
--- a/installer/k8s/templates/external/activemq/activemq-deployment.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.
-
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: activemq
-spec:
- selector:
- matchLabels:
- app: activemq
- replicas: 1
- template:
- metadata:
- labels:
- app: activemq
- spec:
- containers:
- - name: activemq
- image: fogsyio/activemq:{{ .Values.external.activemqVersion }}
- imagePullPolicy: {{ .Values.pullPolicy }}
- ports:
- - containerPort: 61616
- - containerPort: 61614
- - containerPort: 8161
- - containerPort: 1883
diff --git a/installer/k8s/templates/external/activemq/activemq-service.yaml b/installer/k8s/templates/external/activemq/activemq-service.yaml
deleted file mode 100644
index 8b8c874..0000000
--- a/installer/k8s/templates/external/activemq/activemq-service.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.
-
-apiVersion: v1
-kind: Service
-metadata:
- name: activemq
-spec:
- selector:
- app: activemq
- ports:
- - name: main
- protocol: TCP
- port: 61616
- targetPort: 61616
- - name: websocket
- protocol: TCP
- port: 61614
- targetPort: 61614
- - name: ui
- protocol: TCP
- port: 8161
- targetPort: 8161
- - name: mqtt
- protocol: TCP
- port: 1883
- targetPort: 1883
\ No newline at end of file
diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
index 382f41e..55577f9 100644
--- a/installer/k8s/values.yaml
+++ b/installer/k8s/values.yaml
@@ -24,7 +24,6 @@ streampipes:
registry: "apachestreampipes"
external:
- activemqVersion: 5.15.9
consulVersion: 1.9.6
couchdbVersion: 2.3.1
flinkVersion: 1.13.5-scala_2.11