Skip to content

Commit

Permalink
Merge pull request #17 from OpenG2P/1.0
Browse files Browse the repository at this point in the history
1.0
  • Loading branch information
venky-ganapathy authored Dec 6, 2024
2 parents c8b8ba4 + 1017ab4 commit cc2e7d1
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 29 deletions.
6 changes: 2 additions & 4 deletions .github/workflows/publish-trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ name: Publish OpenG2P Helm charts

on:
push:
tags:
- '**'
branches-ignore:
- develop
- main
Expand Down Expand Up @@ -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
Expand All @@ -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: ./
Expand Down
21 changes: 21 additions & 0 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
@@ -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 }}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion charts/openg2p-g2p-bridge-api/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
charts/
Chart.lock
*.tgz
2 changes: 1 addition & 1 deletion charts/openg2p-g2p-bridge-celery-beat-producers/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
charts/
Chart.lock
*.tgz
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion charts/openg2p-g2p-bridge/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
charts/
Chart.lock
*.tgz
1 change: 1 addition & 0 deletions charts/openg2p-g2p-bridge/charts/openg2p-g2p-bridge-api
33 changes: 23 additions & 10 deletions charts/openg2p-g2p-bridge/values.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -93,8 +105,9 @@ postgresql:
redis:
enabled: true
cluster:
enabled: false
replicaCount: 1
architecture: standalone
master:
persistence:
enabled: false
auth:
enabled: false
2 changes: 2 additions & 0 deletions deployment/README.md
Original file line number Diff line number Diff line change
@@ -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.
10 changes: 0 additions & 10 deletions deployment/install.sh

This file was deleted.

0 comments on commit cc2e7d1

Please sign in to comment.