Update helm chart

OpenG2P · Oct 20, 2024 · 0134bca · 0134bca
1 parent 95dcb24
commit 0134bca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml b/charts/openg2p-g2p-bridge-celery-beat-producers/values.yaml
@@ -206,7 +206,7 @@ envVars:
   G2P_BRIDGE_CELERY_BEAT_STATEMENT_PROCESS_ATTEMPTS: 3
   G2P_BRIDGE_CELERY_BEAT_CELERY_BROKER_URL: redis://{{ include "common.names.fullname" .Subcharts.redis }}-master:6379/0
   G2P_BRIDGE_CELERY_BEAT_CELERY_BACKEND_URL: redis://{{ include "common.names.fullname" .Subcharts.redis }}-master:6379/0
-
+  G2P_BRIDGE_CELERY_BEAT_PROCESS_FUTURE_DISBURSEMENT_SCHEDULES: false
 
 envVarsFrom:
   G2P_BRIDGE_CELERY_BEAT_DB_PASSWORD:

diff --git a/charts/openg2p-g2p-bridge/values.yaml b/charts/openg2p-g2p-bridge/values.yaml
@@ -1,12 +1,12 @@
 global:
-  g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net
+  g2pBridgeHostname: g2p-bridge.dev.openg2p.org
 
 openg2p-g2p-bridge-api:
   enabled: true
   image:
     registry: docker.io
     repository: openg2p/openg2p-g2p-bridge-api
-    tag: 1.0
+    tag: '1.0'
   common:
     enabled: false
   postgresql:
@@ -24,7 +24,7 @@ openg2p-g2p-bridge-celery-beat-producers:
   image:
     registry: docker.io
     repository: openg2p/openg2p-g2p-bridge-celery-beat-producers
-    tag: 1.0
+    tag: '1.0'
   common:
     enabled: false
   postgresql:
@@ -36,11 +36,15 @@ openg2p-g2p-bridge-celery-beat-producers:
     G2P_BRIDGE_CELERY_BEAT_DB_HOSTNAME: '{{ .Release.Name }}-postgresql'
     G2P_BRIDGE_CELERY_BEAT_CELERY_BROKER_URL: redis://{{ .Release.Name }}-redis-master:6379/0
     G2P_BRIDGE_CELERY_BEAT_CELERY_BACKEND_URL: redis://{{ .Release.Name }}-redis-master:6379/0
+    G2P_BRIDGE_CELERY_BEAT_BANK_FA_DECONSTRUCT_STRATEGY: ^account_number:(?P<account_number>.*)\.branch_code:(?P<branch_code>.*)\.bank_code:(?P<bank_code>.*)\.fa_type:(?P<fa_type>.*)$
+    G2P_BRIDGE_CELERY_BEAT_MOBILE_WALLET_DECONSTRUCT_STRATEGY: ^mobile_number:(?P<mobile_number>.*)\.wallet_provider_name:(?P<wallet_provider_name>.*)\.wallet_provider_code:(?P<wallet_provider_code>.*)\.fa_type:(?P<fa_type>.*)$
+    G2P_BRIDGE_CELERY_BEAT_EMAIL_WALLET_DECONSTRUCT_STRATEGY: ^email_address:(?P<email_address>.*)\.wallet_provider_name:(?P<wallet_provider_name>.*)\.wallet_provider_code:(?P<wallet_provider_code>.*)\.fa_type:(?P<fa_type>.*)$
     G2P_BRIDGE_CELERY_BEAT_MAPPER_RESOLVE_FREQUENCY: 10
     G2P_BRIDGE_CELERY_BEAT_FUNDS_AVAILABLE_CHECK_FREQUENCY: 10
     G2P_BRIDGE_CELERY_BEAT_FUNDS_BLOCKED_FREQUENCY: 10
     G2P_BRIDGE_CELERY_BEAT_FUNDS_DISBURSEMENT_FREQUENCY: 10
     G2P_BRIDGE_CELERY_BEAT_MT940_PROCESSOR_FREQUENCY: 10
+    G2P_BRIDGE_CELERY_BEAT_PROCESS_FUTURE_DISBURSEMENT_SCHEDULES: false
 
   envVarsFrom:
     G2P_BRIDGE_CELERY_BEAT_DB_PASSWORD:
@@ -53,7 +57,7 @@ openg2p-g2p-bridge-celery-workers:
   image:
     registry: docker.io
     repository: openg2p/openg2p-g2p-bridge-celery-workers
-    tag: 1.0
+    tag: '1.0'
   common:
     enabled: false
   postgresql:
@@ -65,9 +69,9 @@ openg2p-g2p-bridge-celery-workers:
     G2P_BRIDGE_CELERY_WORKERS_DB_DBNAME: openg2p_g2p_bridge_db
     G2P_BRIDGE_CELERY_WORKERS_DB_USERNAME: bridgeuser
     G2P_BRIDGE_CELERY_WORKERS_DB_HOSTNAME: '{{ .Release.Name }}-postgresql'
-    G2P_BRIDGE_CELERY_WORKERS_BANK_FA_DECONSTRUCT_STRATEGY: ^account_number:(?P<account_number>\w+)\.branch_code:(?P<branch_code>\w+)\.bank_code:(?P<bank_code>\w+)\.mobile_number:(?P<mobile_number>\w+)\.email_address:(?P<email_address>[\w.@]+)\.fa_type:(?P<fa_type>[A-Z_]+)$
-    G2P_BRIDGE_CELERY_WORKERS_MOBILE_WALLET_DECONSTRUCT_STRATEGY: mobile_(?P<mobile_number>\d+)_(?P<mobile_wallet_provider>\w+)
-    G2P_BRIDGE_CELERY_WORKERS_EMAIL_WALLET_DECONSTRUCT_STRATEGY: email_(?P<email_address>\w+)_(?P<email_wallet_provider>\w+)
+    G2P_BRIDGE_CELERY_WORKERS_BANK_FA_DECONSTRUCT_STRATEGY: ^account_number:(?P<account_number>.*)\.branch_code:(?P<branch_code>.*)\.bank_code:(?P<bank_code>.*)\.fa_type:(?P<fa_type>.*)$
+    G2P_BRIDGE_CELERY_WORKERS_MOBILE_WALLET_DECONSTRUCT_STRATEGY: ^mobile_number:(?P<mobile_number>.*)\.wallet_provider_name:(?P<wallet_provider_name>.*)\.wallet_provider_code:(?P<wallet_provider_code>.*)\.fa_type:(?P<fa_type>.*)$
+    G2P_BRIDGE_CELERY_WORKERS_EMAIL_WALLET_DECONSTRUCT_STRATEGY: ^email_address:(?P<email_address>.*)\.wallet_provider_name:(?P<wallet_provider_name>.*)\.wallet_provider_code:(?P<wallet_provider_code>.*)\.fa_type:(?P<fa_type>.*)$
     G2P_BRIDGE_CELERY_PRODUCERS_FUNDS_AVAILABLE_CHECK_URL_EXAMPLE_BANK: 'http://openg2p-g2p-bridge-example-bank-api/check_funds'
     G2P_BRIDGE_CELERY_PRODUCERS_FUNDS_BLOCK_URL_EXAMPLE_BANK: 'http://openg2p-g2p-bridge-example-bank-api/block_funds'
     G2P_BRIDGE_CELERY_PRODUCERS_FUNDS_DISBURSEMENT_URL_EXAMPLE_BANK: 'http://openg2p-g2p-bridge-example-bank-api/initiate_payment'