2133 remove consul and all related assets (#2180)

* refactor(#2133): Remove consul dependencies from code * refactor(#2133): Remove consul dependencies from installer options * Remove Consul Migration from available migrations * refactor(#2133): Fix ui build * refactor(#2133): Remove consul references from ui code * refactor(#2133): Remove consul references from backend code --------- Co-authored-by: Dominik Riemer <[email protected]>
apache · Nov 29, 2023 · 0f845b7 · 0f845b7
1 parent a2cd003
commit 0f845b7
Show file tree

Hide file tree

Showing 96 changed files with 85 additions and 1,549 deletions.
diff --git a/...reampipes-archetype-extensions-jvm/src/main/resources/archetype-resources/development/env b/...reampipes-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
diff --git a/...ipes-archetype-pe-processors-flink/src/main/resources/archetype-resources/development/env b/...ipes-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/...reampipes-archetype-pe-sinks-flink/src/main/resources/archetype-resources/development/env b/...reampipes-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
@@ -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
@@ -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
@@ -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
@@ -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 extensions-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 extensions-all-jvm
 ```

diff --git 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
@@ -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
@@ -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
@@ -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
diff --git a/installer/cli/deploy/standalone/consul/docker-compose.yml b/installer/cli/deploy/standalone/consul/docker-compose.yml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,6 @@
 
 [environment:adapter]
 backend
-consul
 couchdb
 kafka
 ui

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -17,7 +17,6 @@
 ui
 backend
 extensions-all-jvm
-consul
 couchdb
 jobmanager
 taskmanager

diff --git 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
@@ -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
@@ -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
@@ -16,7 +16,6 @@
 [environment:minimal]
 ui
 backend
-consul
 couchdb
 influxdb
 mosquitto
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
     [environment:adapter]
     backend
-    consul
     couchdb
     kafka
     ui
@@ Expand Down @@