refactor: use only one distributed cache system

Author: cshezi

Diff for: .env

@@ -4,21 +4,21 @@
 GH_TOKEN=${GH_TOKEN}
 
 # Branches
-TMS_BRANCH=main
-ED_BRANCH=main
-RULE_901_BRANCH=main
-TP_BRANCH=main
-TADP_BRANCH=main
-NATS_UTILITIES_BRANCH=main
-CMS_BRANCH=main
-BATCH_PPA_BRANCH=main
+TMS_BRANCH=dev
+ED_BRANCH=dev
+RULE_901_BRANCH=dev
+TP_BRANCH=dev
+TADP_BRANCH=dev
+NATS_UTILITIES_BRANCH=dev
+CMS_BRANCH=dev
+BATCH_PPA_BRANCH=dev
 
-SIDECAR_BRANCH=main
-LUMBERJACK_BRANCH=main
+SIDECAR_BRANCH=dev
+LUMBERJACK_BRANCH=dev
 
-ADMIN_BRANCH=main
-AUTH_SERVICE_BRANCH=main
-EVENT_FLOW_BRANCH=main
+ADMIN_BRANCH=dev
+AUTH_SERVICE_BRANCH=dev
+EVENT_FLOW_BRANCH=dev
 
 # Ports
 TMS_PORT=5000

Diff for: docker-compose.infrastructure.yaml

@@ -1,14 +1,14 @@
 # base infrastructure
 
 services:
-  redis:
-    image: redis:latest
-    hostname: redis
-    healthcheck:
-      test: ["CMD-SHELL", "redis-cli -p 6379 ping | grep PONG"]
-      interval: 1s
-      timeout: 3s
-      retries: 5
+  # redis:
+  #   image: redis:latest
+  #   hostname: redis
+  #   healthcheck:
+  #     test: ["CMD-SHELL", "redis-cli -p 6379 ping | grep PONG"]
+  #     interval: 1s
+  #     timeout: 3s
+  #     retries: 5
 
   valkey:
     hostname: valkey

Diff for: docker-compose.override.yaml

@@ -1,9 +1,9 @@
 # For local testing
 
 services:
-  redis:
-    ports:
-      - 16379:6379
+  # redis:
+  #   ports:
+  #     - 16379:6379
 
   arango:
     environment:
@@ -30,6 +30,6 @@ services:
       - .env
     restart: always
     depends_on:
-      - redis
+      - valkey
       - arango
 

Diff for: docker-compose.yaml

@@ -17,7 +17,7 @@ services:
     ports:
       - ${TMS_PORT}:3000
     depends_on:
-      - redis
+      - valkey
       - arango
       - nats
 
@@ -32,7 +32,7 @@ services:
       - .env
     restart: always
     depends_on:
-      - redis
+      - valkey
       - arango
       - nats
 
@@ -47,7 +47,7 @@ services:
       - .env
     restart: always
     depends_on:
-      - redis
+      - valkey
       - arango
       - nats
 
@@ -62,7 +62,7 @@ services:
       - .env
     restart: always
     depends_on:
-      - redis
+      - valkey
       - arango
       - nats
 

Diff for: env/ed.env

@@ -16,7 +16,7 @@ APM_SERVICE_NAME="event-director"
 # DB
 # # REDIS
 REDIS_DATABASE=0
-REDIS_SERVERS=[{"host":"redis", "port":6379}]
+REDIS_SERVERS=[{"host":"valkey", "port":6380}]
 REDIS_AUTH=
 REDIS_IS_CLUSTER=false
 DISTRIBUTED_CACHETTL=300

Diff for: env/rule-executer.env

@@ -17,7 +17,7 @@ APM_SERVICE_NAME="rule-901"
 
 # REDIS
 REDIS_DATABASE=0
-REDIS_SERVERS=[{"host":"redis", "port":6379}]
+REDIS_SERVERS=[{"host":"valkey", "port":6380}]
 REDIS_AUTH=
 REDIS_IS_CLUSTER=false
 DISTRIBUTED_CACHETTL=300

Diff for: env/tadp.env

@@ -15,7 +15,7 @@ APM_SERVICE_NAME="tadp"
 
 # REDIS
 REDIS_DATABASE=0
-REDIS_SERVERS=[{"host":"redis", "port":6379}]
+REDIS_SERVERS=[{"host":"valkey", "port":6380}]
 REDIS_AUTH=
 REDIS_IS_CLUSTER=false
 DISTRIBUTED_CACHETTL=300

Diff for: env/tms.env

@@ -17,7 +17,7 @@ APM_ACTIVE=false
 # DB
 # # REDIS
 REDIS_DATABASE=0
-REDIS_SERVERS=[{"host":"redis", "port":6379}]
+REDIS_SERVERS=[{"host":"valkey", "port":6380}]
 REDIS_AUTH=
 REDIS_IS_CLUSTER=false
 DISTRIBUTED_CACHETTL=300

Diff for: env/tp.env

@@ -15,7 +15,7 @@ APM_ACTIVE=false
 
 # REDIS
 REDIS_DATABASE=0
-REDIS_SERVERS=[{"host":"redis", "port":6379}]
+REDIS_SERVERS=[{"host":"valkey", "port":6380}]
 REDIS_AUTH=
 REDIS_IS_CLUSTER=false
 DISTRIBUTED_CACHETTL=300