1.0

.github/workflows/publish-trigger.yml

@@ -2,8 +2,6 @@ name: Publish OpenG2P Helm charts
 
 on:
   push:
-    tags:
-      - '**'
     branches-ignore:
       - develop
       - main
@@ -68,7 +66,7 @@ jobs:
           echo "SKIP=TRUE" >> $GITHUB_ENV
         fi
     - name: Upload tar as Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
           name: charts
           path: ./*.tgz
@@ -83,7 +81,7 @@ jobs:
       if: env.SKIP != 'TRUE'
 
     - name: Download tar from Artifacts
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
           name: charts
           path: ./

.github/workflows/tag.yml

@@ -0,0 +1,21 @@
+name: Tag the repo
+on:
+  workflow_dispatch:
+    inputs:
+      new-tag:
+        description: Tag in "vN.N.N" format
+        required: true
+        type: string
+      previous-tag:
+        description: Previous tag. "None" if no previous tag
+        required: true
+        type: string
+        default: latest
+jobs:
+  tag-repo:
+    uses: openg2p/openg2p-packaging/.github/workflows/tag.yml@main
+    with:
+      new-tag: ${{ inputs.new-tag }}
+      previous-tag: ${{ inputs.previous-tag }}
+    secrets:
+      OPENG2P_BOT_GITHUB_PAT: ${{ secrets.OPENG2P_BOT_GITHUB_PAT }}

README.md

@@ -1,2 +1,2 @@
 # openg2p-g2p-bridge-deployment
-Deployment Helm charts for openg2p-g2p-bridge and example-bank
+Deployment Helm charts for openg2p-g2p-bridge

charts/openg2p-g2p-bridge-api/.gitignore

@@ -1,2 +1,2 @@
-charts/
 Chart.lock
+*.tgz

charts/openg2p-g2p-bridge-celery-beat-producers/.gitignore

@@ -1,2 +1,2 @@
-charts/
 Chart.lock
+*.tgz

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:

charts/openg2p-g2p-bridge/.gitignore

@@ -1,2 +1,2 @@
-charts/
 Chart.lock
+*.tgz

charts/openg2p-g2p-bridge/charts/openg2p-g2p-bridge-api

@@ -0,0 +1 @@
+../../openg2p-g2p-bridge-api

charts/openg2p-g2p-bridge/charts/openg2p-g2p-bridge-celery-beat-producers

@@ -0,0 +1 @@
+../../openg2p-g2p-bridge-celery-beat-producers

charts/openg2p-g2p-bridge/charts/openg2p-g2p-bridge-celery-workers

@@ -0,0 +1 @@
+../../openg2p-g2p-bridge-celery-workers

charts/openg2p-g2p-bridge/values.yaml

@@ -1,12 +1,12 @@
 global:
-  g2pBridgeHostname: g2p-bridge.sandbox.openg2p.net
+  g2pBridgeHostname: g2p-bridge.explore.openg2p.org
 
 openg2p-g2p-bridge-api:
   enabled: true
   image:
     registry: docker.io
     repository: openg2p/openg2p-g2p-bridge-api
-    tag: develop
+    tag: '1.0.2'
   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: develop
+    tag: '1.0.2'
   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>.*)\.mobile_number:(?P<mobile_number>.*)\.email_address:(?P<email_address>.*)\.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: develop
+    tag: '1.0.2'
   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>.*)\.mobile_number:(?P<mobile_number>.*)\.email_address:(?P<email_address>.*)\.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'
@@ -82,6 +86,14 @@ openg2p-g2p-bridge-celery-workers:
 
 postgresql:
   enabled: true
+  resourcesPreset: "small"
+  resources:
+    limits:
+      cpu: 1000m
+      memory: 500Mi
+    requests:
+      cpu: 200m
+      memory: 200Mi
   auth:
     username: bridgeuser
     database: openg2p_g2p_bridge_db
@@ -93,8 +105,9 @@ postgresql:
 
 redis:
   enabled: true
-  cluster:
-    enabled: false
-  replicaCount: 1
+  architecture: standalone
+  master:
+    persistence:
+      enabled: false
   auth:
     enabled: false

deployment/README.md

@@ -1 +1,3 @@
 ## OpenG2P G2P Bridge Deployment
+
+Refer to the [OpenG2P G2P Bridge Deployment Guide](https://docs.openg2p.org/g2p-bridge/deployment/deployment-of-g2p-bridge) for detailed instructions on how to deploy the OpenG2P G2P Bridge.