fix: Remove redis and consul files and script

Signed-off-by: Cherry Wang <[email protected]>

Makefile

@@ -94,8 +94,3 @@ get-token:
 	DEV=$(DEV) \
 	ARCH=$(ARCH) \
 	cd ./compose-builder; sh get-api-gateway-token.sh
-
-get-consul-acl-token:
-	DEV=$(DEV) \
-	ARCH=$(ARCH) \
-	cd ./compose-builder; sh ./get-consul-acl-token.sh

README.md

@@ -118,9 +118,6 @@ The compose files under the `taf` subfolder are used for the automated TAF tests
 - `make get-token`
     For secure mode only. Runs commands via docker to generate a new API Gateway token.
 
-- `make get-consul-acl-token`
-  For secure mode only. Runs commands via docker to retrieve a Consul Access token.
-
 ### Additional compose files
 
 - **docker-compose-portainer.yml**

compose-builder/.env

@@ -42,26 +42,9 @@ DEVICE_UART_VERSION=latest
 DEVICE_ONVIFCAM_VERSION=latest
 DEVICE_USBCAM_VERSION=latest
 DEVICE_S7_VERSION=latest
-CP_FLAGS='-cp=keeper.http://edgex-core-keeper:59890'
-DATABASE_HOST=edgex-postgres
-DATABASE_TYPE=postgres
-DATABASE_PORT=5432
-MESSAGEBUS_HOST=edgex-mqtt-broker
-MESSAGEBUS_SECRETNAME=message-bus
-MESSAGEBUS_AUTHMODE=usernamepassword
-MESSAGEBUS_PORT=1883
-MESSAGEBUS_PROTOCOL=tcp
-MESSAGEBUS_TYPE=mqtt
-WRITABLE_INSECURESECRETS_DB_SECRETNAME=postgres
-WRITABLE_INSECURESECRETS_DB_SECRETDATA_USERNAME=postgres
-WRITABLE_INSECURESECRETS_DB_SECRETDATA_PASSWORD=postgres
 
 # Lock on OpenBao 2.0 (last MPL-2.0 version)
 BAO_VERSION=2.0
-# Lock on Consul 1.16 (last MPL-2.0 version)
-CONSUL_VERSION=1.16
-# Lock on Redis 7.0 until EdgeX 4.0
-REDIS_VERSION=7.0-alpine
 POSTGRES_VERSION=16.3-alpine3.20
 KUIPER_VERSION=v1.14.0-alpha.2
 MOSQUITTO_VERSION=2.0
@@ -70,3 +53,13 @@ NATS_VERSION=2.9-alpine
 NGINX_VERSION=1.25-alpine-slim
 EDGEX_USER=2002
 EDGEX_GROUP=2001
+
+CP_FLAGS='-cp=keeper.http://edgex-core-keeper:59890'
+DATABASE_HOST=edgex-postgres
+DATABASE_PORT=5432
+MESSAGEBUS_HOST=edgex-mqtt-broker
+MESSAGEBUS_SECRETNAME=message-bus
+MESSAGEBUS_AUTHMODE=usernamepassword
+MESSAGEBUS_PORT=1883
+MESSAGEBUS_PROTOCOL=tcp
+MESSAGEBUS_TYPE=mqtt

compose-builder/README.md

@@ -57,8 +57,6 @@ This folder contains the following compose files:
   Base non-secure mode compose file with PostgreSQL as database. Contains all the services that run in the non-secure configuration, including the UI.
 - **add-security.yml**<br/>
     Security **extending** compose file. Adds the additional security services and configuration of services so that all the services are running in the secure configuration.
-- **add-secure-redis-messagebus.yml**<br/>
-    Secure Redis MessageBus **extending** compose file. Adds the additional security configuration for when Redis is used as MessageBus in secure mode so Kuiper can connect to the secure MessageBus.
 - **add-delayed-start-services.yml**<br/>
     Secure delayed start services **extending** compose file. Adds additional delayed start services based on spire/spiffe implementation to provide the secret store token on the runtime secure configuration.
 - **add-device-bacnet-ip.yml**<br/>
@@ -387,13 +385,6 @@ Options:
     KEY_INPUT_FILE=<full_path_to_key_file>: the full file name path to your own key file, this is required
 ```
 
-#### Get-consul-acl-token
-
-```
-get-consul-acl-token 
-Retrieves the Consul ACL token
-```
-
 #### Build Canned
 ```
 build-canned
@@ -458,8 +449,6 @@ Options:
     as-record-replay: Generates compose file with App Record & Replay included
     asc-ex-mqtt:      Generates compose file with App Service External MQTT Trigger included
     mqtt-broker:      Generates compose file with a MQTT Broker service included
-    mqtt-bus:         Generates compose file with services configure for MQTT Message Bus
-                      The MQTT Broker service is also included.
     nanomq:           ** Experimental ** 
                       Generates compose file with NonoMQ MQTT broker when mqtt-broker or mqtt-bus are specified
                       Not valid in secure mode when uses with mqtt-bus

compose-builder/add-postgres.yml

@@ -13,8 +13,6 @@
 #  *
 #  *******************************************************************************/
 
-# TODO: Move the content of this Docker Compose file to add-security.yml when the redis database support is removed
-
 volumes:
   db-data:
 
@@ -38,5 +36,3 @@ services:
       - no-new-privileges:true
     tmpfs:
       - /run
-
-

compose-builder/add-secure-postgres.yml

@@ -13,8 +13,6 @@
 #  *
 #  *******************************************************************************/
 
-# TODO: Move the content of this Docker Compose file to add-security.yml when the redis database support is removed
-
 volumes:
   postgres-data:
 

compose-builder/add-security.yml

@@ -54,8 +54,8 @@ services:
       EDGEX_GROUP: ${EDGEX_GROUP}
       # Uncomment and modify the following "EDGEX_ADD_SECRETSTORE_TOKENS" to add the additional secret store tokens on the fly
       # the secret store token is required if you have added registry acl roles from env "EDGEX_ADD_REGISTRY_ACL_ROLES"
-      # in service "consul".
-      #EDGEX_ADD_SECRETSTORE_TOKENS: app-sample,app-rules-engine-redis, app-rules-engine-mqtt, app-push-to-core
+      # in registry service.
+      #EDGEX_ADD_SECRETSTORE_TOKENS: app-sample,app-rules-engine, app-push-to-core
     read_only: true
     restart: always
     networks:
@@ -130,7 +130,6 @@ services:
     depends_on:
       - security-bootstrapper
       - security-secretstore-setup
-      - database
 
   support-notifications:
     env_file:
@@ -211,7 +210,6 @@ services:
       - security-secretstore-setup
 
   # this is to make sure the service is started after security-bootstrapper process is done
-  # because it needs to await Consul roles to be created
   app-rules-engine:
     entrypoint: ["/edgex-init/ready_to_run_wait_install.sh"]
     command: "/app-service-configurable --registry ${CP_FLAGS}"

compose-builder/docker-compose-base.yml

@@ -42,24 +42,21 @@ services:
     env_file:
       - common-non-security.env
     environment:
-      DATABASE_HOST: ${DATABASE_HOST}
-      DATABASE_TYPE: ${DATABASE_TYPE}
-      DATABASE_PORT: ${DATABASE_PORT}
       MESSAGEBUS_HOST: ${MESSAGEBUS_HOST}
       MESSAGEBUS_AUTHMODE: ${MESSAGEBUS_AUTHMODE}
       MESSAGEBUS_SECRETNAME: ${MESSAGEBUS_SECRETNAME}
       MESSAGEBUS_PORT: ${MESSAGEBUS_PORT}
       MESSAGEBUS_PROTOCOL: ${MESSAGEBUS_PROTOCOL}
       MESSAGEBUS_TYPE: ${MESSAGEBUS_TYPE}
-      WRITABLE_INSECURESECRETS_DB_SECRETNAME: ${WRITABLE_INSECURESECRETS_DB_SECRETNAME}
-      WRITABLE_INSECURESECRETS_DB_SECRETDATA_USERNAME: ${WRITABLE_INSECURESECRETS_DB_SECRETDATA_USERNAME}
-      WRITABLE_INSECURESECRETS_DB_SECRETDATA_PASSWORD: ${WRITABLE_INSECURESECRETS_DB_SECRETDATA_PASSWORD}
       SERVICE_HOST: edgex-core-keeper
+      DATABASE_HOST: ${DATABASE_HOST}
     security_opt:
       - no-new-privileges:true
     volumes:
       # use host timezone
       - /etc/localtime:/etc/localtime:ro
+    depends_on:
+      - database
 
   support-notifications:
     image: ${CORE_EDGEX_REPOSITORY}/support-notifications${ARCH}:${CORE_EDGEX_VERSION}
@@ -205,7 +202,7 @@ services:
       - common-non-security.env
     environment:
       ALL_SERVICES_REGISTRY_HOST: edgex-core-keeper
-      ALL_SERVICES_DATABASE_HOST: edgex-postgres
+      ALL_SERVICES_DATABASE_HOST: ${DATABASE_HOST}
       ALL_SERVICES_MESSAGEBUS_HOST: ${MESSAGEBUS_HOST}
       APP_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata
       DEVICE_SERVICES_CLIENTS_CORE_METADATA_HOST: edgex-core-metadata