From 9ca6621b5ef9692c9b5bec992a1c882c7b07b439 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 29 Nov 2024 19:05:41 +0530 Subject: [PATCH 1/3] chore: refactor params --- .../helmfile/values-fp-min.yaml | 14 ++-- .../configs/flow.json | 14 ++-- .../templates/statefulset.yaml | 18 +++++ .../reporting-nifi-processor-svc/values.yaml | 79 ++++++++++++------- 4 files changed, 83 insertions(+), 42 deletions(-) diff --git a/local-deployment-methods/helmfile/values-fp-min.yaml b/local-deployment-methods/helmfile/values-fp-min.yaml index 05f1584..f62680d 100644 --- a/local-deployment-methods/helmfile/values-fp-min.yaml +++ b/local-deployment-methods/helmfile/values-fp-min.yaml @@ -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 diff --git a/mojaloop/reporting-nifi-processor-svc/configs/flow.json b/mojaloop/reporting-nifi-processor-svc/configs/flow.json index 7d40b92..e7ee9ee 100644 --- a/mojaloop/reporting-nifi-processor-svc/configs/flow.json +++ b/mojaloop/reporting-nifi-processor-svc/configs/flow.json @@ -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", @@ -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", @@ -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", @@ -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}" @@ -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": {}, diff --git a/mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml b/mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml index 14fbfab..bdacb79 100644 --- a/mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml +++ b/mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml @@ -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 }} diff --git a/mojaloop/reporting-nifi-processor-svc/values.yaml b/mojaloop/reporting-nifi-processor-svc/values.yaml index cb92057..12ec6e6 100644 --- a/mojaloop/reporting-nifi-processor-svc/values.yaml +++ b/mojaloop/reporting-nifi-processor-svc/values.yaml @@ -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 @@ -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. '-'. + # 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. '-'. + # 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 @@ -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: [] From 166b603438675f756d155e3b7c58a532fc4bade2 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 29 Nov 2024 20:43:29 +0530 Subject: [PATCH 2/3] fix: ver --- mojaloop/reporting-legacy-api/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mojaloop/reporting-legacy-api/Chart.yaml b/mojaloop/reporting-legacy-api/Chart.yaml index 4538af9..94e7f64 100644 --- a/mojaloop/reporting-legacy-api/Chart.yaml +++ b/mojaloop/reporting-legacy-api/Chart.yaml @@ -25,4 +25,4 @@ dependencies: tags: - mojaloop - reporting-templates - version: 1.1.10 + version: 1.1.12 From fa9fd9e4feca9d7340715933fefb01118108ec92 Mon Sep 17 00:00:00 2001 From: Vijay Date: Tue, 3 Dec 2024 16:44:15 +0530 Subject: [PATCH 3/3] chore: update versions --- mojaloop/finance-portal/Chart.yaml | 10 +++++----- mojaloop/reporting-hub-bop-api-svc/Chart.yaml | 4 ++-- mojaloop/reporting-hub-bop-api-svc/values.yaml | 2 +- mojaloop/reporting-hub-bop-positions-ui/Chart.yaml | 4 ++-- mojaloop/reporting-hub-bop-positions-ui/values.yaml | 2 +- mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml | 4 ++-- mojaloop/reporting-hub-bop-settlements-ui/values.yaml | 2 +- mojaloop/reporting-hub-bop-shell/Chart.yaml | 4 ++-- mojaloop/reporting-hub-bop-shell/values.yaml | 7 ++++++- mojaloop/reporting-hub-bop-trx-ui/Chart.yaml | 4 ++-- mojaloop/reporting-hub-bop-trx-ui/values.yaml | 2 +- 11 files changed, 25 insertions(+), 20 deletions(-) diff --git a/mojaloop/finance-portal/Chart.yaml b/mojaloop/finance-portal/Chart.yaml index 10a2401..400c1f0 100644 --- a/mojaloop/finance-portal/Chart.yaml +++ b/mojaloop/finance-portal/Chart.yaml @@ -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" @@ -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" diff --git a/mojaloop/reporting-hub-bop-api-svc/Chart.yaml b/mojaloop/reporting-hub-bop-api-svc/Chart.yaml index 0ace928..c457ec7 100644 --- a/mojaloop/reporting-hub-bop-api-svc/Chart.yaml +++ b/mojaloop/reporting-hub-bop-api-svc/Chart.yaml @@ -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: diff --git a/mojaloop/reporting-hub-bop-api-svc/values.yaml b/mojaloop/reporting-hub-bop-api-svc/values.yaml index f81e329..9777543 100644 --- a/mojaloop/reporting-hub-bop-api-svc/values.yaml +++ b/mojaloop/reporting-hub-bop-api-svc/values.yaml @@ -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 diff --git a/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml b/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml index 7b99f9f..42bfaff 100644 --- a/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml +++ b/mojaloop/reporting-hub-bop-positions-ui/Chart.yaml @@ -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: diff --git a/mojaloop/reporting-hub-bop-positions-ui/values.yaml b/mojaloop/reporting-hub-bop-positions-ui/values.yaml index 48cbd7f..654feeb 100644 --- a/mojaloop/reporting-hub-bop-positions-ui/values.yaml +++ b/mojaloop/reporting-hub-bop-positions-ui/values.yaml @@ -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 diff --git a/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml b/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml index e137124..4bf9715 100644 --- a/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml +++ b/mojaloop/reporting-hub-bop-settlements-ui/Chart.yaml @@ -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: diff --git a/mojaloop/reporting-hub-bop-settlements-ui/values.yaml b/mojaloop/reporting-hub-bop-settlements-ui/values.yaml index 8828e7f..44aad71 100644 --- a/mojaloop/reporting-hub-bop-settlements-ui/values.yaml +++ b/mojaloop/reporting-hub-bop-settlements-ui/values.yaml @@ -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 diff --git a/mojaloop/reporting-hub-bop-shell/Chart.yaml b/mojaloop/reporting-hub-bop-shell/Chart.yaml index e594591..5a579d3 100644 --- a/mojaloop/reporting-hub-bop-shell/Chart.yaml +++ b/mojaloop/reporting-hub-bop-shell/Chart.yaml @@ -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: diff --git a/mojaloop/reporting-hub-bop-shell/values.yaml b/mojaloop/reporting-hub-bop-shell/values.yaml index b8dff41..74c3663 100644 --- a/mojaloop/reporting-hub-bop-shell/values.yaml +++ b/mojaloop/reporting-hub-bop-shell/values.yaml @@ -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 @@ -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 diff --git a/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml b/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml index e852f3e..1262da0 100644 --- a/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml +++ b/mojaloop/reporting-hub-bop-trx-ui/Chart.yaml @@ -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: diff --git a/mojaloop/reporting-hub-bop-trx-ui/values.yaml b/mojaloop/reporting-hub-bop-trx-ui/values.yaml index c07c5d5..82cc5ef 100644 --- a/mojaloop/reporting-hub-bop-trx-ui/values.yaml +++ b/mojaloop/reporting-hub-bop-trx-ui/values.yaml @@ -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