Skip to content

Commit

Permalink
'Updating development release to v6.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
info@mojaloop.io committed Dec 3, 2024
2 parents 5340e9b + fa9fd9e commit 94c4182
Show file tree
Hide file tree
Showing 37 changed files with 2,097 additions and 1,835 deletions.
14 changes: 7 additions & 7 deletions local-deployment-methods/helmfile/values-fp-min.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@ global:
keto:
readURL: "http://keto-read:80"
reportingDB:
host: centralledger-mysql
host: mysqldb
port: 3306
user: user
database: default
user: central_ledger
database: central_ledger
# secret: {}
secret:
name: mysql
name: mysqldb
key: mysql-password
reportingEventsDB:
host: reporting-events-db
port: 27017
user: user
database: default
user: finance_portal
database: finance_portal
# secret: {}
secret:
name: reporting-events-db
key: mongodb-password
key: mongodb-passwords
kafka:
host: test1-kafka-headless
port: 9092
Expand Down
10 changes: 5 additions & 5 deletions mojaloop/finance-portal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ dependencies:
tags:
- mojaloop
- reporting-hub-bop-shell
version: 1.0.3
version: 1.1.0
- name: reporting-hub-bop-api-svc
condition: reporting-hub-bop-api-svc.enabled
repository: "file://../reporting-hub-bop-api-svc"
tags:
- mojaloop
- reporting-hub-bop-api-svc
version: 2.0.0
version: 2.1.0
- name: reporting-legacy-api
condition: reporting-legacy-api.enabled
repository: "file://../reporting-legacy-api"
Expand Down Expand Up @@ -77,21 +77,21 @@ dependencies:
tags:
- mojaloop
- reporting-hub-bop-trx-ui
version: 1.0.0
version: 1.1.0
- name: reporting-hub-bop-settlements-ui
condition: reporting-hub-bop-settlements-ui.enabled
repository: "file://../reporting-hub-bop-settlements-ui"
tags:
- mojaloop
- reporting-hub-bop-settlements-ui
version: 1.0.3
version: 1.1.0
- name: reporting-hub-bop-positions-ui
condition: reporting-hub-bop-positions-ui.enabled
repository: "file://../reporting-hub-bop-positions-ui"
tags:
- mojaloop
- reporting-hub-bop-positions-ui
version: 1.0.3
version: 1.0.4
- name: reporting-hub-bop-experience-api-svc
condition: reporting-hub-bop-experience-api-svc.enabled
repository: "file://../reporting-hub-bop-experience-api-svc"
Expand Down
4 changes: 2 additions & 2 deletions mojaloop/reporting-hub-bop-api-svc/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
description: Reporting API service
name: reporting-hub-bop-api-svc
version: 2.0.0
appVersion: "2.0.3"
version: 2.1.0
appVersion: "2.1.0"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-api-svc/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ containerSecurityContext:
image:
registry: docker.io
repository: mojaloop/reporting-hub-bop-api-svc
tag: v2.0.3
tag: v2.1.1-snapshot-4
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
4 changes: 2 additions & 2 deletions mojaloop/reporting-hub-bop-positions-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: >-
This is the role microfrontend of the BizOps framework that handles tracing
of transfers.
name: reporting-hub-bop-positions-ui
version: 1.0.3
appVersion: "0.0.6"
version: 1.0.4
appVersion: "1.0.4"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-positions-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ containerSecurityContext:
image:
registry: docker.io
repository: mojaloop/reporting-hub-bop-positions-ui
tag: v0.0.6
tag: v0.0.7
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
4 changes: 2 additions & 2 deletions mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: >-
This is the role microfrontend of the BizOps framework that handles tracing
of transfers.
name: reporting-hub-bop-settlements-ui
version: 1.0.3
appVersion: "0.0.12"
version: 1.1.0
appVersion: "1.1.0"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-settlements-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ containerSecurityContext:
image:
registry: docker.io
repository: mojaloop/reporting-hub-bop-settlements-ui
tag: v0.0.12
tag: v0.0.19-snapshot.3
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
4 changes: 2 additions & 2 deletions mojaloop/reporting-hub-bop-shell/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
description: This is the Shell application that accommodates BizOps microfrontends.
name: reporting-hub-bop-shell
version: 1.0.3
appVersion: "2.2.3"
version: 1.1.0
appVersion: "1.1.0"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
7 changes: 6 additions & 1 deletion mojaloop/reporting-hub-bop-shell/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ containerSecurityContext:
image:
registry: docker.io
repository: mojaloop/reporting-hub-bop-shell
tag: v2.2.3
tag: v2.3.1
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down Expand Up @@ -198,6 +198,11 @@ config:
REMOTE_2_URL: http://reporting-hub-bop-trx-ui.local
REMOTE_3_URL: http://reporting-hub-bop-settlements-ui.local
REMOTE_4_URL: http://reporting-hub-bop-positions-ui.local
# REACT_APP_TITLE: Mojaloop Finance Portal
# REACT_APP_SUBTITLE: Accelarating regional trade through supporting cross boarder, instant lowcost, payments and transfers.
# REACT_APP_TITLE_IMAGE: http://reporting-hub-bop-positions-ui.local/images/logo.png
# REACT_APP_TITLE_BAR_COLOR: '#911414'
# REACT_APP_DFSP_IMG: http://reporting-hub-bop-positions-ui.local/images/dfsp.png

service:
internalPort: 8080
Expand Down
4 changes: 2 additions & 2 deletions mojaloop/reporting-hub-bop-trx-ui/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ description: >-
This is the role microfrontend of the BizOps framework that handles tracing
of transfers.
name: reporting-hub-bop-trx-ui
version: 1.0.0
appVersion: "1.7.2"
version: 1.1.0
appVersion: "1.1.0"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/reporting-hub-bop-trx-ui/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ containerSecurityContext:
image:
registry: docker.io
repository: mojaloop/reporting-hub-bop-trx-ui
tag: v1.7.2
tag: v2.0.0-snapshot.0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
Expand Down
2 changes: 1 addition & 1 deletion mojaloop/reporting-legacy-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ dependencies:
tags:
- mojaloop
- reporting-templates
version: 1.1.10
version: 1.1.12
14 changes: 7 additions & 7 deletions mojaloop/reporting-nifi-processor-svc/configs/flow.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"Upsert": "true",
"ssl-client-auth": "NONE",
"Mode": "update",
"Mongo Database Name": "${EVENT_STORE_DB_DATABASE}",
"Mongo Database Name": "{{ include "common.backends.reportingEventsDB.database" . }}",
"Mongo Collection Name": "transaction",
"putmongo-update-query": "{ \"transferId\": \"${transferId}\" }",
"put-mongo-update-mode": "operators",
Expand Down Expand Up @@ -1014,7 +1014,7 @@
"Upsert": "true",
"ssl-client-auth": "NONE",
"Mode": "update",
"Mongo Database Name": "${EVENT_STORE_DB_DATABASE}",
"Mongo Database Name": "{{ include "common.backends.reportingEventsDB.database" . }}",
"Mongo Collection Name": "transaction",
"putmongo-update-query": "{ \"transferId\": \"${transferId}\" }",
"put-mongo-update-mode": "operators",
Expand Down Expand Up @@ -1060,7 +1060,7 @@
"Upsert": "true",
"ssl-client-auth": "NONE",
"Mode": "update",
"Mongo Database Name": "${EVENT_STORE_DB_DATABASE}",
"Mongo Database Name": "{{ include "common.backends.reportingEventsDB.database" . }}",
"Mongo Collection Name": "settlement",
"putmongo-update-query": "{ \"settlementId\": NumberLong(${settlementId}) }",
"put-mongo-update-mode": "operators",
Expand Down Expand Up @@ -4741,9 +4741,9 @@
"dbcp-min-evictable-idle-time": "30 mins",
"Max Total Connections": "8",
"dbcp-max-conn-lifetime": "-1",
"Database Connection URL": "jdbc:mysql://${REPORTING_DB_HOST}:${REPORTING_DB_PORT}/${REPORTING_DB_SCHEMA}",
"Database Connection URL": "jdbc:mysql://{{ include "common.backends.reportingDB.host" . }}:{{ include "common.backends.reportingDB.port" . }}/{{ include "common.backends.reportingDB.database" . }}",
"dbcp-time-between-eviction-runs": "-1",
"Database User": "${REPORTING_DB_USER}",
"Database User": "{{ include "common.backends.reportingDB.user" . }}",
"dbcp-soft-min-evictable-idle-time": "-1",
"dbcp-max-idle-conns": "8",
"Password": "${REPORTING_DB_PASSWORD}"
Expand Down Expand Up @@ -4777,8 +4777,8 @@
},
"properties": {
"ssl-client-auth": "REQUIRED",
"mongo-uri": "mongodb://${EVENT_STORE_DB_HOST}:${EVENT_STORE_DB_PORT}/?authSource=${EVENT_STORE_DB_DATABASE}",
"Database User": "${EVENT_STORE_DB_USER}",
"mongo-uri": "mongodb://{{ include "common.backends.reportingEventsDB.host" . }}:{{ include "common.backends.reportingEventsDB.port" . }}/?authSource={{ include "common.backends.reportingEventsDB.database" . }}",
"Database User": "{{ include "common.backends.reportingEventsDB.user" . }}",
"Password": "${EVENT_STORE_DB_PASSWORD}"
},
"propertyDescriptors": {},
Expand Down
18 changes: 18 additions & 0 deletions mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,24 @@ spec:
- name: NIFI_WEB_HTTPS_HOST
value: 0.0.0.0
{{- end }}
- name: EVENT_STORE_DB_PASSWORD
{{- if (include "common.backends.reportingEventsDB.secret.name" .) }}
valueFrom:
secretKeyRef:
name: '{{ include "common.backends.reportingEventsDB.secret.name" . }}'
key: '{{ include "common.backends.reportingEventsDB.secret.key" . }}'
{{- else }}
value: '{{ include "common.backends.reportingEventsDB.password" . }}'
{{- end }}
- name: REPORTING_DB_PASSWORD
{{- if (include "common.backends.reportingDB.secret.name" .) }}
valueFrom:
secretKeyRef:
name: '{{ include "common.backends.reportingDB.secret.name" . }}'
key: '{{ include "common.backends.reportingDB.secret.key" . }}'
{{- else }}
value: '{{ include "common.backends.reportingDB.password" . }}'
{{- end }}
{{- if .Values.env }}
{{ toYaml .Values.env | indent 8 }}
{{- end }}
Expand Down
79 changes: 51 additions & 28 deletions mojaloop/reporting-nifi-processor-svc/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,27 @@
---
## @section Global parameters
global:
reportingDB:
host: centralledger-mysql
port: 3306
user: central_ledger
database: central_ledger
password: ''
# secret: {}
secret:
name: centralledger-mysql
key: mysql-password

reportingEventsDB:
host: reporting-events-db
port: 27017
user: user
database: default
password: ''
# secret: {}
secret:
name: reporting-events-db
key: mongodb-password

# Number of nifi nodes
replicaCount: 1

Expand Down Expand Up @@ -61,6 +84,33 @@ sts:
# - myconf.conf
# mountPath: /opt/nifi/custom-config

reportingDB:
## This is the same as setting the host explicitly, i.e. will set the host as set below. It is included to support importing MySQL charts as a dependency.
# fullnameOverride: reporting-db
## This will override the name of kafka and add the release prefix, e.g. '<RELEASE_NAME>-<nameOverride>'.
# nameOverride: reporting-db
# host: reporting-db
# port: 90925
# user: central_ledger
# database: central_ledger
# password: ''
secret: {}
# name: reporting-db
# key: password

reportingEventsDB:
## This is the same as setting the host explicitly, i.e. will set the host as set below. It is included to support importing MySQL charts as a dependency.
# fullnameOverride: reporting-events-db
## This will override the name of reporting-events-db and add the release prefix, e.g. '<RELEASE_NAME>-<nameOverride>'.
# nameOverride: reporting-events-db
# host: reporting-events-db
# port: 27017
# user: event_store
# database: event_store
# password: ''
secret: {}
# name: reporting-events-db
# key: password

properties:
sensitiveKey: xzNViQSKL/GsLIKR6IraZimhNjI7X0cO # Must have at least 12 characters
Expand Down Expand Up @@ -301,33 +351,6 @@ env:
value: "changeMe"
- name: KEYSTORE_PASSWORD
value: "changeMe"
## DB Configuration
- name: REPORTING_DB_HOST
value: mysqldb
- name: REPORTING_DB_PORT
value: "3306"
- name: REPORTING_DB_USER
value: central_ledger
- name: REPORTING_DB_SCHEMA
value: central_ledger
- name: REPORTING_DB_PASSWORD
valueFrom:
secretKeyRef:
name: mysqldb
key: mysql-password
- name: EVENT_STORE_DB_HOST
value: reporting-events-db
- name: EVENT_STORE_DB_PORT
value: "27017"
- name: EVENT_STORE_DB_USER
value: finance_portal
- name: EVENT_STORE_DB_DATABASE
value: finance_portal
- name: EVENT_STORE_DB_PASSWORD
valueFrom:
secretKeyRef:
name: reporting-events-db
key: mongodb-passwords

## Extra environment variables from secrets and config maps
envFrom: []
Expand Down
Binary file modified repo/account-lookup-service-13.0.0.tgz
Binary file not shown.
Binary file modified repo/account-lookup-service-admin-13.0.0.tgz
Binary file not shown.
Binary file modified repo/admin-api-svc-12.0.0.tgz
Binary file not shown.
Binary file modified repo/backend-0.1.0.tgz
Binary file not shown.
Binary file modified repo/bof-5.1.0.tgz
Binary file not shown.
Binary file modified repo/common-3.1.1.tgz
Binary file not shown.
Binary file added repo/finance-portal-4.3.0.tgz
Binary file not shown.
Binary file modified repo/fspiop-transfer-api-svc-12.0.1.tgz
Binary file not shown.
Loading

0 comments on commit 94c4182

Please sign in to comment.