Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(csi-334): updated CL to use proxyCache lib with redis cluster #70

Open
wants to merge 4 commits into
base: feat/fx-impl
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ACCOUNT_LOOKUP_SERVICE_VERSION=v14.2.3
# QUOTING_SERVICE_VERSION=v15.2.1
QUOTING_SERVICE_VERSION=v15.8.0-snapshot.15
## CL initial baseline with version included in Mojaloop v15.1.0 Helm Release
# CENTRAL_LEDGER_VERSION=v17.0.3
CENTRAL_LEDGER_VERSION=v17.8.0-snapshot.34
## Cl latest version
## v17.6.2-snapshot.0 for FX, docker image isn't published due to ci work
CENTRAL_LEDGER_VERSION=local
#CENTRAL_LEDGER_VERSION=local
## CL snapshot release with included fix: JSON.stringify disabled in logResponse function
# CENTRAL_LEDGER_VERSION=v17.0.4-snapshot.0
## Central Ledger version with batch processing capability
Expand Down
40 changes: 40 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,20 @@ networks:
mojaloop-net:
name: mojaloop-net

x-redis-node: &REDIS_NODE
image: docker.io/bitnami/redis-cluster:6.2.14
environment: &REDIS_ENVS
ALLOW_EMPTY_PASSWORD: yes
REDIS_NODES: redis-node-0 redis-node-1 redis-node-2 redis-node-3 redis-node-4 redis-node-5
healthcheck:
test: [ "CMD", "redis-cli", "ping" ]
timeout: 2s
networks:
- mojaloop-net
profiles:
- all-services
- fx

services:

## Switch
Expand Down Expand Up @@ -409,6 +423,32 @@ services:
- all-services
- fx

redis-node-0:
<<: *REDIS_NODE
environment:
<<: *REDIS_ENVS
REDIS_CLUSTER_CREATOR: yes
depends_on:
- redis-node-1
- redis-node-2
- redis-node-3
- redis-node-4
- redis-node-5
ports:
- "16379:6379"

redis-node-1:
<<: *REDIS_NODE
redis-node-2:
<<: *REDIS_NODE
redis-node-3:
<<: *REDIS_NODE
redis-node-4:
<<: *REDIS_NODE
redis-node-5:
<<: *REDIS_NODE


## Testing Toolkit
mojaloop-testing-toolkit:
image: mojaloop/ml-testing-toolkit:${TEST_TTK_SVC_VERSION}
Expand Down
5 changes: 4 additions & 1 deletion docker/config-modifier/configs/central-ledger.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ module.exports = {
},
"PROXY_CACHE": {
"enabled": true,
"type": "redis-cluster",
"proxyConfig": {
"host": "redis",
"cluster": [
{ "host": "redis-node-0", "port": 6379 }
]
}
},
"KAFKA": {
Expand Down