This is an automated email from the ASF dual-hosted git repository. zehnder pushed a commit to branch 2133-remove-consul-and-all-related-assets in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 5ca5b84b4b823a219402819f37d4db02d187c533 Author: Philipp Zehnder <[email protected]> AuthorDate: Wed Nov 15 08:38:24 2023 +0100 refactor(#2133): Remove consul dependencies from installer options --- .../resources/archetype-resources/development/env | 2 +- .../resources/archetype-resources/development/env | 2 +- .../resources/archetype-resources/development/env | 2 +- development/.env | 2 +- docker-compose.yml | 29 -------- installer/cli/.env | 1 - installer/cli/README.md | 10 +-- installer/cli/bin/commands/add | 1 - .../deploy/standalone/backend/docker-compose.yml | 1 - .../connect-adapters-iiot/docker-compose.yml | 2 - .../standalone/connect-adapters/docker-compose.yml | 2 - .../standalone/consul/docker-compose.dev.yml | 21 ------ .../deploy/standalone/consul/docker-compose.yml | 53 -------------- .../extensions-all-jvm/docker-compose.yml | 3 +- .../pipeline-elements-all-flink/docker-compose.yml | 1 - .../pipeline-elements-all-jvm/docker-compose.yml | 2 - .../sinks-internal-jvm/docker-compose.yml | 2 - .../standalone/ui-custom-conf/docker-compose.yml | 1 - .../cli/deploy/standalone/ui/docker-compose.yml | 1 - installer/cli/environments/adapter | 1 - installer/cli/environments/backend | 1 - installer/cli/environments/backend-nats | 1 - installer/cli/environments/backend-pulsar | 1 - installer/cli/environments/basic | 1 - installer/cli/environments/basic-nats | 1 - installer/cli/environments/basic-pulsar | 1 - installer/cli/environments/full | 1 - installer/cli/environments/lite | 1 - installer/cli/environments/lite-nats | 1 - installer/cli/environments/lite-pulsar | 1 - installer/cli/environments/minimal | 1 - installer/cli/environments/pipeline-element | 1 - installer/cli/environments/pipeline-element-nats | 1 - installer/cli/environments/pipeline-element-pulsar | 1 - installer/cli/environments/ui | 1 - installer/compose/.env | 1 - installer/compose/docker-compose.full.yml | 31 -------- installer/compose/docker-compose.minimal.yml | 29 -------- installer/compose/docker-compose.nats.yml | 30 -------- installer/compose/docker-compose.pulsar.yml | 30 -------- installer/compose/docker-compose.quickstart.yml | 30 -------- installer/compose/docker-compose.yml | 30 -------- installer/k8s/README.md | 16 ---- .../k8s/templates/core/backend-deployment.yaml | 4 +- installer/k8s/templates/core/ui-deployment.yaml | 4 +- .../external/consul/consul-deployment.yaml | 85 ---------------------- .../templates/external/consul/consul-pv-pvc.yaml | 28 ------- .../templates/external/consul/consul-service.yaml | 31 -------- .../templates/external/kafka/kafka-deployment.yaml | 2 +- .../templates/external/nats/nats-deployment.yaml | 4 - .../monitor/grafana/grafana-deployment.yml | 4 +- .../monitor/prometheus/prometheus-deployment.yml | 2 +- installer/k8s/values.yaml | 14 ---- .../tests/experimental/testJvmArchetype/.env | 1 - .../testJvmArchetype/armDockerFile/Dockerfile | 2 - .../experimental/testJvmArchetype/backend/.env | 1 - .../testJvmArchetype/docker-compose.yml | 29 -------- .../configuration/shared/configuration.service.ts | 9 +-- 58 files changed, 20 insertions(+), 551 deletions(-) diff --git a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env index e46f6d76b..a9ee6e1e7 100644 --- a/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env +++ b/archetypes/streampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Those parameters are used by IntelliJ to set the default consul parameters for development +# Those parameters are used by IntelliJ to set the default parameters for development SP_PORT=8005 SP_HOST=host.docker.internal SP_DEBUG=true \ No newline at end of file diff --git a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env index 2eaca6f67..077ddab6f 100644 --- a/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env +++ b/archetypes/streampipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Those parameters are used by IntelliJ to set the default consul parameters for development +# Those parameters are used by IntelliJ to set the default parameters for development SP_PORT=8005 SP_HOST=host.docker.internal SP_DEBUG=true diff --git a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env index 2eaca6f67..077ddab6f 100644 --- a/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env +++ b/archetypes/streampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Those parameters are used by IntelliJ to set the default consul parameters for development +# Those parameters are used by IntelliJ to set the default parameters for development SP_PORT=8005 SP_HOST=host.docker.internal SP_DEBUG=true diff --git a/development/.env b/development/.env index 285230a42..6584644ee 100644 --- a/development/.env +++ b/development/.env @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Those parameters are used by IntelliJ to set the default consul parameters for development +# Those parameters are used by IntelliJ to set the default parameters for development SP_PORT=6009 SP_HOST=host.docker.internal SP_DEBUG=true diff --git a/docker-compose.yml b/docker-compose.yml index 5570b5f3d..860c6e779 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,6 @@ services: dockerfile: Dockerfile image: streampipes_backend:release-validation depends_on: - - consul - couchdb volumes: - backend:/root/.streampipes @@ -58,7 +57,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend logging: *default-logging networks: @@ -75,32 +73,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"rpc_streaming\": false, \"disable_update_check\": true, \"rpc\": {\"enable_streaming\": false}, \"use_streaming_backend\": false}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - - "CONSUL_RPC_ENABLE_STREAMING=false" - - "CONSUL_USE_STREAMING_BACKEND=false" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - logging: *default-logging - volumes: - - consul:/consul/data - networks: - spnet: - ipv4_address: 172.31.0.9 - couchdb: image: couchdb:2.3.1 environment: @@ -162,7 +134,6 @@ services: volumes: kafka: files: - consul: couchdb: zookeeper: influxdb: diff --git a/installer/cli/.env b/installer/cli/.env index d0ed018c9..4f899ce21 100644 --- a/installer/cli/.env +++ b/installer/cli/.env @@ -16,7 +16,6 @@ SP_DOCKER_REGISTRY=apachestreampipes SP_VERSION=0.93.0-SNAPSHOT SP_SUBNET=172.31.0.0/16 -SP_CONSUL_CONTAINER_IP=172.31.0.9 COMPOSE_PROJECT_NAME=streampipes # ------------------------------------------------------------- diff --git a/installer/cli/README.md b/installer/cli/README.md index 478b22d8d..e4d3bdba3 100644 --- a/installer/cli/README.md +++ b/installer/cli/README.md @@ -98,7 +98,7 @@ streampipes env --set pipeline-element ``` **Start** environment ( default: `dev` mode). Here the service definition in the selected environment is used to start the multi-container landscape. -> **NOTE**: `dev` mode is enabled by default since we rely on open ports to core service such as `consul`, `couchdb`, `kafka` etc. to reach from the IDE when developing. If you don't want to map ports (except the UI port), then use the `--no-ports` flag. +> **NOTE**: `dev` mode is enabled by default since we rely on open ports to core service such as `couchdb`, `kafka` etc. to reach from the IDE when developing. If you don't want to map ports (except the UI port), then use the `--no-ports` flag. ```bash streampipes up -d @@ -120,12 +120,12 @@ streampipes down ## Additionally, useful commands -**Start individual services only?** We got you! You chose a template that suits your needs and now you only want to start individual services from it, e.g. only Kafka and Consul. +**Start individual services only?** We got you! You chose a template that suits your needs and now you only want to start individual services from it, e.g. only Kafka and CouchDB. > **NOTE**: the service names need to be present and match your current > `.spenv` environment. ```bash -streampipes up -d kafka consul +streampipes up -d kafka couchdb ``` **Get current environment** (if previously set using `streampipes env --set <environment>`). @@ -162,8 +162,8 @@ streampipes start pipeline-elements-all-jvm **Restart** existing services ```bash -# restart backend consul container -streampipes restart backend consul +# restart backend couchdb container +streampipes restart backend couchdb # restart existing services by removing and recreating container instance streampipes restart --force-create pipeline-elements-all-jvm ``` diff --git a/installer/cli/bin/commands/add b/installer/cli/bin/commands/add index f86bd44f0..cb8e6fbfe 100755 --- a/installer/cli/bin/commands/add +++ b/installer/cli/bin/commands/add @@ -125,7 +125,6 @@ services: ${svc_name}: image: ${svc_img_tag} depends_on: - - "consul" - "backend" environment: - SP_HOST=${svc_name} diff --git a/installer/cli/deploy/standalone/backend/docker-compose.yml b/installer/cli/deploy/standalone/backend/docker-compose.yml index 4d014eb27..c6f320022 100644 --- a/installer/cli/deploy/standalone/backend/docker-compose.yml +++ b/installer/cli/deploy/standalone/backend/docker-compose.yml @@ -18,7 +18,6 @@ services: backend: image: ${SP_DOCKER_REGISTRY}/backend:${SP_VERSION} depends_on: - - consul - couchdb volumes: - backend:/root/.streampipes diff --git a/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml b/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml index 30e150096..eb45b3747 100644 --- a/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml +++ b/installer/cli/deploy/standalone/connect-adapters-iiot/docker-compose.yml @@ -17,8 +17,6 @@ version: "3.4" services: connect-adapters-iiot: image: ${SP_DOCKER_REGISTRY}/connect-adapters-iiot:${SP_VERSION} - depends_on: - - consul environment: - SP_BACKEND_HOST=backend - SP_CONNECT_CONTAINER_WORKER_HOST=connect-adapters-iiot diff --git a/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml b/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml index 70fa81eb0..03c2bece5 100644 --- a/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml +++ b/installer/cli/deploy/standalone/connect-adapters/docker-compose.yml @@ -17,8 +17,6 @@ version: "3.4" services: connect-adapters: image: ${SP_DOCKER_REGISTRY}/connect-adapters:${SP_VERSION} - depends_on: - - consul environment: - SP_BACKEND_HOST=backend - SP_CONNECT_CONTAINER_WORKER_HOST=connect-adapters diff --git a/installer/cli/deploy/standalone/consul/docker-compose.dev.yml b/installer/cli/deploy/standalone/consul/docker-compose.dev.yml deleted file mode 100644 index e9011ae3a..000000000 --- a/installer/cli/deploy/standalone/consul/docker-compose.dev.yml +++ /dev/null @@ -1,21 +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. - -version: "3.4" -services: - consul: - ports: - - "8500:8500" - - "8600:8600" diff --git a/installer/cli/deploy/standalone/consul/docker-compose.yml b/installer/cli/deploy/standalone/consul/docker-compose.yml deleted file mode 100644 index dd26e0af9..000000000 --- a/installer/cli/deploy/standalone/consul/docker-compose.yml +++ /dev/null @@ -1,53 +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. - -version: "3.4" -services: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"rpc_streaming\": false, \"disable_update_check\": true, \"rpc\": {\"enable_streaming\": false}, \"use_streaming_backend\": false}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - - "CONSUL_RPC_ENABLE_STREAMING=false" - - "CONSUL_USE_STREAMING_BACKEND=false" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: - driver: "json-file" - options: - max-size: "1m" - max-file: "1" - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - -volumes: - consul: - -networks: - spnet: - external: true diff --git a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml index 287b34dfd..a44655139 100644 --- a/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml +++ b/installer/cli/deploy/standalone/extensions-all-jvm/docker-compose.yml @@ -18,8 +18,7 @@ services: extensions-all-jvm: image: ${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION} depends_on: - - consul - - couchdb + - couchdb volumes: - files:/spImages logging: diff --git a/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml b/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml index d18367f45..d1496ec8f 100644 --- a/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml +++ b/installer/cli/deploy/standalone/pipeline-elements-all-flink/docker-compose.yml @@ -18,7 +18,6 @@ services: pipeline-elements-all-flink: image: ${SP_DOCKER_REGISTRY}/pipeline-elements-all-flink:${SP_VERSION} depends_on: - - "consul" - "jobmanager" logging: driver: "json-file" diff --git a/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml b/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml index 6f024ab0e..8ecc75f68 100644 --- a/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml +++ b/installer/cli/deploy/standalone/pipeline-elements-all-jvm/docker-compose.yml @@ -17,8 +17,6 @@ version: "3.4" services: pipeline-elements-all-jvm: image: ${SP_DOCKER_REGISTRY}/pipeline-elements-all-jvm:${SP_VERSION} - depends_on: - - "consul" volumes: - files:/spImages logging: diff --git a/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml b/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml index 93db02e88..5ef951161 100644 --- a/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml +++ b/installer/cli/deploy/standalone/sinks-internal-jvm/docker-compose.yml @@ -17,8 +17,6 @@ version: "3.4" services: sinks-internal-jvm: image: ${SP_DOCKER_REGISTRY}/sinks-internal-jvm:${SP_VERSION} - depends_on: - - "consul" volumes: - files:/spImages logging: diff --git a/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml index 917e90b54..7d9efb089 100644 --- a/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml +++ b/installer/cli/deploy/standalone/ui-custom-conf/docker-compose.yml @@ -21,7 +21,6 @@ services: - "80:80" depends_on: - couchdb - - consul volumes: - "../ui-custom-conf/default.conf:/etc/nginx/conf.d/default.conf" logging: diff --git a/installer/cli/deploy/standalone/ui/docker-compose.yml b/installer/cli/deploy/standalone/ui/docker-compose.yml index bd88b873d..0985c3a7d 100644 --- a/installer/cli/deploy/standalone/ui/docker-compose.yml +++ b/installer/cli/deploy/standalone/ui/docker-compose.yml @@ -21,7 +21,6 @@ services: - "80:8088" depends_on: - couchdb - - consul volumes: - nginx:/etc/nginx/ logging: diff --git a/installer/cli/environments/adapter b/installer/cli/environments/adapter index 851165714..ce6599f80 100644 --- a/installer/cli/environments/adapter +++ b/installer/cli/environments/adapter @@ -15,7 +15,6 @@ [environment:adapter] backend -consul couchdb kafka ui diff --git a/installer/cli/environments/backend b/installer/cli/environments/backend index 798a732ce..c556a3347 100644 --- a/installer/cli/environments/backend +++ b/installer/cli/environments/backend @@ -15,7 +15,6 @@ [environment:backend] kafka -consul zookeeper couchdb influxdb diff --git a/installer/cli/environments/backend-nats b/installer/cli/environments/backend-nats index 550c54169..b83bc8b65 100644 --- a/installer/cli/environments/backend-nats +++ b/installer/cli/environments/backend-nats @@ -14,7 +14,6 @@ # limitations under the License. [environment:backend] -consul couchdb influxdb nats diff --git a/installer/cli/environments/backend-pulsar b/installer/cli/environments/backend-pulsar index 0e3a8d803..c2bcd9daa 100644 --- a/installer/cli/environments/backend-pulsar +++ b/installer/cli/environments/backend-pulsar @@ -14,7 +14,6 @@ # limitations under the License. [environment:backend-pulsar] -consul couchdb influxdb ui-custom-conf diff --git a/installer/cli/environments/basic b/installer/cli/environments/basic index ce25e8e74..94404b70e 100644 --- a/installer/cli/environments/basic +++ b/installer/cli/environments/basic @@ -15,7 +15,6 @@ [environment:basic] kafka -consul zookeeper couchdb influxdb diff --git a/installer/cli/environments/basic-nats b/installer/cli/environments/basic-nats index fb7ef1c89..d9a7aa929 100644 --- a/installer/cli/environments/basic-nats +++ b/installer/cli/environments/basic-nats @@ -14,7 +14,6 @@ # limitations under the License. [environment:basic] -consul couchdb influxdb nats diff --git a/installer/cli/environments/basic-pulsar b/installer/cli/environments/basic-pulsar index fe220cc7e..1c857e99f 100644 --- a/installer/cli/environments/basic-pulsar +++ b/installer/cli/environments/basic-pulsar @@ -14,7 +14,6 @@ # limitations under the License. [environment:basic-pulsar] -consul couchdb influxdb pulsar diff --git a/installer/cli/environments/full b/installer/cli/environments/full index fee496d0e..bcb62c194 100644 --- a/installer/cli/environments/full +++ b/installer/cli/environments/full @@ -18,7 +18,6 @@ ui backend connect-adapters connect-adapters-iiot -consul couchdb jobmanager taskmanager diff --git a/installer/cli/environments/lite b/installer/cli/environments/lite index b41a6a09a..5dc3305ff 100644 --- a/installer/cli/environments/lite +++ b/installer/cli/environments/lite @@ -16,7 +16,6 @@ [environment:lite] ui backend -consul couchdb kafka zookeeper diff --git a/installer/cli/environments/lite-nats b/installer/cli/environments/lite-nats index 89966075b..312fc18af 100644 --- a/installer/cli/environments/lite-nats +++ b/installer/cli/environments/lite-nats @@ -16,7 +16,6 @@ [environment:lite] ui backend -consul couchdb influxdb extensions-all-jvm diff --git a/installer/cli/environments/lite-pulsar b/installer/cli/environments/lite-pulsar index 791e49ab1..a80e85cf9 100644 --- a/installer/cli/environments/lite-pulsar +++ b/installer/cli/environments/lite-pulsar @@ -16,7 +16,6 @@ [environment:lite-pulsar] ui backend -consul couchdb influxdb extensions-all-jvm diff --git a/installer/cli/environments/minimal b/installer/cli/environments/minimal index 3f51549a1..63c4b987c 100644 --- a/installer/cli/environments/minimal +++ b/installer/cli/environments/minimal @@ -16,7 +16,6 @@ [environment:minimal] ui backend -consul couchdb influxdb mosquitto diff --git a/installer/cli/environments/pipeline-element b/installer/cli/environments/pipeline-element index 3c0e735bd..f30bf1a76 100644 --- a/installer/cli/environments/pipeline-element +++ b/installer/cli/environments/pipeline-element @@ -15,7 +15,6 @@ [environment:pipeline-element] backend -consul couchdb kafka ui diff --git a/installer/cli/environments/pipeline-element-nats b/installer/cli/environments/pipeline-element-nats index 25cda9368..3eede5658 100644 --- a/installer/cli/environments/pipeline-element-nats +++ b/installer/cli/environments/pipeline-element-nats @@ -15,7 +15,6 @@ [environment:pipeline-element] backend -consul couchdb ui nats diff --git a/installer/cli/environments/pipeline-element-pulsar b/installer/cli/environments/pipeline-element-pulsar index 280810eb2..88f6d91b6 100644 --- a/installer/cli/environments/pipeline-element-pulsar +++ b/installer/cli/environments/pipeline-element-pulsar @@ -15,7 +15,6 @@ [environment:pipeline-element-pulsar] backend-pulsar -consul couchdb ui influxdb diff --git a/installer/cli/environments/ui b/installer/cli/environments/ui index 91c75baab..125c42904 100644 --- a/installer/cli/environments/ui +++ b/installer/cli/environments/ui @@ -15,7 +15,6 @@ [environment:ui] backend -consul extensions-all-jvm couchdb kafka diff --git a/installer/compose/.env b/installer/compose/.env index 6d48dab97..194e36be6 100644 --- a/installer/compose/.env +++ b/installer/compose/.env @@ -16,7 +16,6 @@ SP_VERSION=0.93.0-SNAPSHOT SP_DOCKER_REGISTRY=apachestreampipes SP_SUBNET=172.31.0.0/16 -SP_CONSUL_CONTAINER_IP=172.31.0.9 COMPOSE_PROJECT_NAME=streampipes # For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an existing installation diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml index 00029cddd..a8f88f6e4 100644 --- a/installer/compose/docker-compose.full.yml +++ b/installer/compose/docker-compose.full.yml @@ -28,7 +28,6 @@ services: backend: image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}" depends_on: - - consul - couchdb volumes: - backend:/root/.streampipes @@ -44,7 +43,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend volumes: - nginx:/etc/nginx/ @@ -53,31 +51,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - volumes: - - consul:/consul/data - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:3.3.1 environment: @@ -170,8 +143,6 @@ services: # Lite version pipeline elements extensions-all-jvm: image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}" - depends_on: - - consul volumes: - files:/spImages logging: *default-logging @@ -183,7 +154,6 @@ services: pipeline-elements-all-flink: image: "${SP_DOCKER_REGISTRY}/pipeline-elements-all-flink:${SP_VERSION}" depends_on: - - consul - jobmanager logging: *default-logging restart: unless-stopped @@ -193,7 +163,6 @@ services: volumes: backend: - consul: connect: couchdb: kafka: diff --git a/installer/compose/docker-compose.minimal.yml b/installer/compose/docker-compose.minimal.yml index 0a4246298..948dd0d35 100644 --- a/installer/compose/docker-compose.minimal.yml +++ b/installer/compose/docker-compose.minimal.yml @@ -28,7 +28,6 @@ services: backend: image: "${SP_DOCKER_REGISTRY}/backend-nats:${SP_VERSION}" depends_on: - - consul - couchdb environment: - SP_PRIORITIZED_PROTOCOL=nats @@ -45,7 +44,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend volumes: - nginx:/etc/nginx/ @@ -54,31 +52,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:3.3.1 environment: @@ -120,7 +93,6 @@ services: extensions-iiot-minimal: image: "${SP_DOCKER_REGISTRY}/extensions-iiot-minimal:${SP_VERSION}" depends_on: - - consul logging: *default-logging restart: unless-stopped networks: @@ -128,7 +100,6 @@ services: volumes: backend: - consul: couchdb: influxdb: influxdb2: diff --git a/installer/compose/docker-compose.nats.yml b/installer/compose/docker-compose.nats.yml index 210532139..b9e5fff61 100644 --- a/installer/compose/docker-compose.nats.yml +++ b/installer/compose/docker-compose.nats.yml @@ -28,7 +28,6 @@ services: backend: image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}" depends_on: - - consul - couchdb environment: - SP_PRIORITIZED_PROTOCOL=nats @@ -45,7 +44,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend volumes: - nginx:/etc/nginx/ @@ -54,31 +52,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:3.3.1 environment: @@ -120,8 +93,6 @@ services: # Lite version pipeline elements extensions-all-jvm: image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}" - depends_on: - - consul logging: *default-logging restart: unless-stopped networks: @@ -129,7 +100,6 @@ services: volumes: backend: - consul: connect: couchdb: influxdb: diff --git a/installer/compose/docker-compose.pulsar.yml b/installer/compose/docker-compose.pulsar.yml index ca11f9c02..c657b18bb 100644 --- a/installer/compose/docker-compose.pulsar.yml +++ b/installer/compose/docker-compose.pulsar.yml @@ -28,7 +28,6 @@ services: backend: image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}" depends_on: - - consul - couchdb environment: - SP_PRIORITIZED_PROTOCOL=pulsar @@ -46,7 +45,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend volumes: - nginx:/etc/nginx/ @@ -55,31 +53,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:3.3.1 environment: @@ -115,8 +88,6 @@ services: # Lite version pipeline elements extensions-all-jvm: image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}" - depends_on: - - consul logging: *default-logging restart: unless-stopped networks: @@ -124,7 +95,6 @@ services: volumes: backend: - consul: connect: couchdb: influxdb: diff --git a/installer/compose/docker-compose.quickstart.yml b/installer/compose/docker-compose.quickstart.yml index c676359ea..5fea61fc4 100644 --- a/installer/compose/docker-compose.quickstart.yml +++ b/installer/compose/docker-compose.quickstart.yml @@ -28,7 +28,6 @@ services: backend: image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}" depends_on: - - consul - couchdb volumes: - backend:/root/.streampipes @@ -44,7 +43,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend volumes: - nginx:/etc/nginx/ @@ -53,31 +51,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:3.3.1 environment: @@ -145,8 +118,6 @@ services: # Lite version pipeline elements extensions-all-jvm: image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}" - depends_on: - - consul volumes: - files:/spImages logging: *default-logging @@ -167,7 +138,6 @@ services: volumes: backend: - consul: connect: couchdb: kafka: diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml index 4f9bb5bad..25a5be84b 100644 --- a/installer/compose/docker-compose.yml +++ b/installer/compose/docker-compose.yml @@ -28,7 +28,6 @@ services: backend: image: "${SP_DOCKER_REGISTRY}/backend:${SP_VERSION}" depends_on: - - consul - couchdb volumes: - backend:/root/.streampipes @@ -44,7 +43,6 @@ services: - "80:8088" depends_on: - couchdb - - consul - backend volumes: - nginx:/etc/nginx/ @@ -53,31 +51,6 @@ services: networks: spnet: - consul: - image: consul:1.14.3 - environment: - - "CONSUL_LOCAL_CONFIG={\"disable_update_check\": true}" - - "CONSUL_BIND_INTERFACE=eth0" - - "CONSUL_HTTP_ADDR=0.0.0.0" - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:3.3.1 environment: @@ -145,8 +118,6 @@ services: # Lite version pipeline elements extensions-all-jvm: image: "${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}" - depends_on: - - consul volumes: - files:/spImages logging: *default-logging @@ -157,7 +128,6 @@ services: volumes: backend: - consul: connect: couchdb: kafka: diff --git a/installer/k8s/README.md b/installer/k8s/README.md index adeca3ea0..500c15ad1 100644 --- a/installer/k8s/README.md +++ b/installer/k8s/README.md @@ -60,7 +60,6 @@ After a while, all containers should successfully started, indicated by the `Run kubectl get pods NAME READY STATUS RESTARTS AGE backend-76ddc486c8-nswpc 1/1 Running 0 3m27s -consul-55965f966b-gwb7l 1/1 Running 0 3m27s couchdb-77db98cf7b-xnnvb 1/1 Running 0 3m27s influxdb-b95b6479-r8wh8 1/1 Running 0 3m27s extensions-all-jvm-79c445dbd9-m8xcs 1/1 Running 0 3m27s @@ -148,21 +147,6 @@ rm -rf ${HOME}/streampipes-k8s ###External common parameters -####Consul common parameters -| Parameter Name | Description | Value | -|-------------------------------------------------|----------------------------------------------------------|------------------------------------------| -| external.consul.appName | Consul application name | "consul" | -| external.consul.version | Consul version | 1.14.3 | -| external.consul.webPort | Port number for the Consul web interface | 8500 | -| external.consul.dnsPort | Port number for the Consul DNS interface | 8600 | -| external.consul.persistence.storageClassName | Storage class name for Consul PVs | "hostpath" | -| external.consul.persistence.storageSize | Size of the Consul PV | "1Gi" | -| external.consul.persistence.claimName | Name of the Consul PersistentVolumeClaim | "consul-pvc" | -| external.consul.persistence.pvName | Name of the Consul PersistentVolume | "consul-pv" | -| external.consul.service.name | Name of the Consul service | "consul" | -| external.consul.service.webPort | TargetPort of the Consul service for web interface | 8500 | -| external.consul.service.dnsPort | TargetPort of the Consul service for DNS interface | 8600 | - ####Couchdb common parameters | Parameter Name | Description | Value | |-------------------------------------------------|----------------------------------------------------------|------------------------------------------| diff --git a/installer/k8s/templates/core/backend-deployment.yaml b/installer/k8s/templates/core/backend-deployment.yaml index a8d4e8e26..96d09ee9c 100644 --- a/installer/k8s/templates/core/backend-deployment.yaml +++ b/installer/k8s/templates/core/backend-deployment.yaml @@ -37,9 +37,9 @@ spec: claimName: {{ .Values.streampipes.core.persistence.claimName }} restartPolicy: {{ .Values.restartPolicy }} initContainers: - - name: init-wait-consul-couchdb + - name: init-wait-couchdb image: alpine - command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.external.consul.service.name }} {{ .Values.external.consul.service.webPort }} && nc -zvw1 {{ .Values.external.couchdb.service.name }} {{ .Values.external.couchdb.service.port }} && exit 0 || sleep 3; done; exit 1"] + command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.external.couchdb.service.name }} {{ .Values.external.couchdb.service.port }} && exit 0 || sleep 3; done; exit 1"] containers: - name: {{ .Values.streampipes.core.appName }} image: {{ .Values.streampipes.registry }}/backend:{{ .Values.streampipes.version }} diff --git a/installer/k8s/templates/core/ui-deployment.yaml b/installer/k8s/templates/core/ui-deployment.yaml index 7383f0ce0..d04c2f1f5 100644 --- a/installer/k8s/templates/core/ui-deployment.yaml +++ b/installer/k8s/templates/core/ui-deployment.yaml @@ -33,9 +33,9 @@ spec: name: nginx-conf restartPolicy: {{ .Values.restartPolicy }} initContainers: - - name: init-wait-consul-couchdb-core + - name: init-wait-couchdb-core image: alpine - command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{.Values.external.consul.service.name }} {{.Values.external.consul.service.webPort }} && nc -zvw1 {{.Values.external.couchdb.service.name }} {{.Values.external.couchdb.service.port }} && nc -zvw1 {{.Values.streampipes.core.service.name }} {{.Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"] + command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{.Values.external.couchdb.service.name }} {{.Values.external.couchdb.service.port }} && nc -zvw1 {{.Values.streampipes.core.service.name }} {{.Values.streampipes.core.service.port }} && exit 0 || sleep 3; done; exit 1"] containers: - name: {{ .Values.streampipes.ui.appName }} image: {{ .Values.streampipes.registry }}/ui:{{ .Values.streampipes.version }} diff --git a/installer/k8s/templates/external/consul/consul-deployment.yaml b/installer/k8s/templates/external/consul/consul-deployment.yaml deleted file mode 100644 index 7b84ef8b2..000000000 --- a/installer/k8s/templates/external/consul/consul-deployment.yaml +++ /dev/null @@ -1,85 +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: {{ .Values.external.consul.appName }} -spec: - selector: - matchLabels: - app: {{ .Values.external.consul.appName }} - replicas: 1 - template: - metadata: - labels: - app: {{ .Values.external.consul.appName }} - spec: - volumes: - - name: {{ .Values.external.consul.persistence.pvName }} - persistentVolumeClaim: - claimName: {{ .Values.external.consul.persistence.claimName }} - restartPolicy: {{ .Values.restartPolicy }} - containers: - - name: {{ .Values.external.consul.appName }} - image: consul:{{ .Values.external.consul.version }} - imagePullPolicy: {{ .Values.pullPolicy }} - command: - - "/bin/sh" - - "-ec" - - | - exec /bin/consul agent \ - -server \ - -bind=0.0.0.0 \ - -bootstrap-expect=1 \ - -data-dir=/consul/data \ - -node=consule-one \ - -client=0.0.0.0 \ - -enable-script-checks=true \ - -ui - env: - - name: CONSUL_BIND_INTERFACE - value: "eth0" - - name: CONSUL_HTTP_ADDR - value: "0.0.0.0" - - name: CONSUL_LOCAL_CONFIG - value: "{\"disable_update_check\": true}" - ports: - - containerPort: {{ .Values.external.consul.webPort }} - - containerPort: {{ .Values.external.consul.dnsPort }} - volumeMounts: - - mountPath: "/consul/data" - name: {{ .Values.external.consul.persistence.pvName }} - livenessProbe: - httpGet: - path: /v1/status/leader - port: {{ .Values.external.consul.webPort }} - initialDelaySeconds: {{ .Values.initialDelaySeconds }} - periodSeconds: {{ .Values.periodSeconds }} - failureThreshold: {{ .Values.failureThreshold }} - readinessProbe: - httpGet: - path: /v1/status/leader - port: {{ .Values.external.consul.webPort }} - initialDelaySeconds: {{ .Values.initialDelaySeconds }} - periodSeconds: {{ .Values.periodSeconds }} - failureThreshold: {{ .Values.failureThreshold }} - startupProbe: - httpGet: - path: /v1/status/leader - port: {{ .Values.external.consul.webPort }} - initialDelaySeconds: {{ .Values.initialDelaySeconds }} - periodSeconds: {{ .Values.periodSeconds }} - failureThreshold: {{ .Values.failureThreshold }} \ No newline at end of file diff --git a/installer/k8s/templates/external/consul/consul-pv-pvc.yaml b/installer/k8s/templates/external/consul/consul-pv-pvc.yaml deleted file mode 100644 index 200350e46..000000000 --- a/installer/k8s/templates/external/consul/consul-pv-pvc.yaml +++ /dev/null @@ -1,28 +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: PersistentVolumeClaim -metadata: - labels: - app: {{ .Values.external.consul.appName }} - name: {{ .Values.external.consul.persistence.claimName }} -spec: - storageClassName: {{ .Values.external.consul.persistence.storageClassName }} - accessModes: - - {{ .Values.persistentVolumeAccessModes }} - resources: - requests: - storage: {{ .Values.external.consul.persistence.storageSize }} \ No newline at end of file diff --git a/installer/k8s/templates/external/consul/consul-service.yaml b/installer/k8s/templates/external/consul/consul-service.yaml deleted file mode 100644 index 6090b3ca8..000000000 --- a/installer/k8s/templates/external/consul/consul-service.yaml +++ /dev/null @@ -1,31 +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: {{ .Values.external.consul.service.name }} -spec: - selector: - app: {{ .Values.external.consul.appName }} - ports: - - name: main - protocol: TCP - port: {{ .Values.external.consul.webPort }} - targetPort: {{ .Values.external.consul.service.webPort }} - - name: test - protocol: TCP - port: {{ .Values.external.consul.dnsPort }} - targetPort: {{ .Values.external.consul.service.dnsPort }} \ No newline at end of file diff --git a/installer/k8s/templates/external/kafka/kafka-deployment.yaml b/installer/k8s/templates/external/kafka/kafka-deployment.yaml index f5680ace4..76ac96f04 100644 --- a/installer/k8s/templates/external/kafka/kafka-deployment.yaml +++ b/installer/k8s/templates/external/kafka/kafka-deployment.yaml @@ -30,7 +30,7 @@ spec: spec: restartPolicy: {{ .Values.restartPolicy }} initContainers: - - name: init-wait-consul + - name: init-wait image: alpine command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.external.zookeeper.service.name }} {{ .Values.external.zookeeper.service.port }} && exit 0 || sleep 3; done; exit 1"] volumes: diff --git a/installer/k8s/templates/external/nats/nats-deployment.yaml b/installer/k8s/templates/external/nats/nats-deployment.yaml index 2d6ae4219..88eba9035 100644 --- a/installer/k8s/templates/external/nats/nats-deployment.yaml +++ b/installer/k8s/templates/external/nats/nats-deployment.yaml @@ -29,10 +29,6 @@ spec: app: {{ .Values.external.nats.appName }} spec: restartPolicy: {{ .Values.restartPolicy }} - initContainers: - - name: init-wait-consul - image: alpine - command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.external.consul.appName }} {{ .Values.external.consul.webPort }} && exit 0 || sleep 3; done; exit 1"] containers: - name: {{ .Values.external.nats.appName }} image: nats diff --git a/installer/k8s/templates/monitor/grafana/grafana-deployment.yml b/installer/k8s/templates/monitor/grafana/grafana-deployment.yml index 11743fed4..5670d5a1b 100644 --- a/installer/k8s/templates/monitor/grafana/grafana-deployment.yml +++ b/installer/k8s/templates/monitor/grafana/grafana-deployment.yml @@ -36,9 +36,9 @@ spec: claimName: {{ .Values.monitoring.grafana.persistence.claimName }} restartPolicy: {{ .Values.restartPolicy }} initContainers: - - name: init-wait-consul-couchdb-core + - name: init-wait-couchdb-core image: alpine - command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.streampipes.core.service.name }} {{ .Values.streampipes.core.service.port }} && nc -zvw1 {{ .Values.extensions.iiot.service.name }} {{ .Values.extensions.iiot.service.port }} && exit 0 || sleep 3; done; exit 1"] + command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.extensions.iiot.service.name }} {{ .Values.extensions.iiot.service.port }} && exit 0 || sleep 3; done; exit 1"] containers: - name: {{ .Values.monitoring.grafana.appName }} image: grafana/grafana:{{ .Values.monitoring.grafana.version }} diff --git a/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml b/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml index 161a9e510..ee28b43c7 100644 --- a/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml +++ b/installer/k8s/templates/monitor/prometheus/prometheus-deployment.yml @@ -42,7 +42,7 @@ spec: name: prometheus-conf restartPolicy: {{ .Values.restartPolicy }} initContainers: - - name: init-wait-consul-couchdb-core + - name: init-wait-couchdb-core image: alpine command: ["sh", "-c", "for i in $(seq 1 300); do nc -zvw1 {{ .Values.streampipes.core.service.name }} {{ .Values.streampipes.core.service.port }} && nc -zvw1 {{ .Values.extensions.iiot.service.name }} {{ .Values.extensions.iiot.service.port }} && exit 0 || sleep 3; done; exit 1"] containers: diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml index 33885487c..36ae91f3a 100644 --- a/installer/k8s/values.yaml +++ b/installer/k8s/values.yaml @@ -87,20 +87,6 @@ extensions: port: 8090 external: - consul: - appName: "consul" - version: 1.14.3 - webPort: 8500 - dnsPort: 8600 - persistence: - storageClassName: "hostpath" - storageSize: "1Gi" - claimName: "consul-pvc" - pvName: "consul-pv" - service: - name: "consul" - webPort: 8500 - dnsPort: 8600 couchdb: appName: "couchdb" version: 3.3.1 diff --git a/ui/cypress/tests/experimental/testJvmArchetype/.env b/ui/cypress/tests/experimental/testJvmArchetype/.env index 0330973bc..0ad93efe8 100644 --- a/ui/cypress/tests/experimental/testJvmArchetype/.env +++ b/ui/cypress/tests/experimental/testJvmArchetype/.env @@ -16,5 +16,4 @@ SP_VERSION=0.70.0 SP_DOCKER_REGISTRY=apachestreampipes SP_SUBNET=172.31.0.0/16 -SP_CONSUL_CONTAINER_IP=172.31.0.9 COMPOSE_PROJECT_NAME=streampipes diff --git a/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile b/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile index abe2a24ae..3d6915677 100644 --- a/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile +++ b/ui/cypress/tests/experimental/testJvmArchetype/armDockerFile/Dockerfile @@ -16,8 +16,6 @@ ARG BASE_IMAGE=arm32v7/openjdk:11-jre-slim FROM $BASE_IMAGE -ENV CONSUL_LOCATION consul - EXPOSE 8090 COPY ../../../../../../../delme/automated-test/target/automated-test.jar /streampipes-extensions-service.jar diff --git a/ui/cypress/tests/experimental/testJvmArchetype/backend/.env b/ui/cypress/tests/experimental/testJvmArchetype/backend/.env index 0330973bc..0ad93efe8 100644 --- a/ui/cypress/tests/experimental/testJvmArchetype/backend/.env +++ b/ui/cypress/tests/experimental/testJvmArchetype/backend/.env @@ -16,5 +16,4 @@ SP_VERSION=0.70.0 SP_DOCKER_REGISTRY=apachestreampipes SP_SUBNET=172.31.0.0/16 -SP_CONSUL_CONTAINER_IP=172.31.0.9 COMPOSE_PROJECT_NAME=streampipes diff --git a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml index 0c9653baa..41ea68cc5 100644 --- a/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml +++ b/ui/cypress/tests/experimental/testJvmArchetype/docker-compose.yml @@ -29,7 +29,6 @@ services: depends_on: - couchdb - activemq - - consul logging: *default-logging restart: unless-stopped networks: @@ -43,31 +42,6 @@ services: networks: spnet: - consul: - image: fogsyio/consul:1.9.6 - environment: - - 'CONSUL_LOCAL_CONFIG={"disable_update_check": true}' - - 'CONSUL_BIND_INTERFACE=eth0' - - 'CONSUL_HTTP_ADDR=0.0.0.0' - entrypoint: - - consul - - agent - - -server - - -bootstrap-expect=1 - - -data-dir=/consul/data - - -node=consul-one - - -bind={{ GetInterfaceIP "eth0" }} - - -client=0.0.0.0 - - -enable-script-checks=true - - -ui - volumes: - - consul:/consul/data - logging: *default-logging - restart: unless-stopped - networks: - spnet: - ipv4_address: ${SP_CONSUL_CONTAINER_IP} - couchdb: image: couchdb:2.3.1 volumes: @@ -125,8 +99,6 @@ services: # Lite version pipeline elements extensions-all-jvm: image: '${SP_DOCKER_REGISTRY}/extensions-all-jvm:${SP_VERSION}' - depends_on: - - consul volumes: - files:/spImages logging: *default-logging @@ -144,7 +116,6 @@ services: spnet: volumes: - consul: connect: couchdb: kafka: diff --git a/ui/src/app/configuration/shared/configuration.service.ts b/ui/src/app/configuration/shared/configuration.service.ts index 2e71d8037..65425309e 100644 --- a/ui/src/app/configuration/shared/configuration.service.ts +++ b/ui/src/app/configuration/shared/configuration.service.ts @@ -100,13 +100,8 @@ export class ConfigurationService { ); } - adjustConfigurationKey(consulKey) { - const removedKey = consulKey.substr( - consulKey.lastIndexOf('/') + 1, - consulKey.length, - ); - - // console.log(removedKey); + adjustConfigurationKey(key) { + const removedKey = key.substr(key.lastIndexOf('/') + 1, key.length); let str1 = removedKey.replace(/SP/g, ''); str1 = str1.replace(/_/g, ' ');
