diff --git a/CODEOWNERS b/CODEOWNERS index 4357f7aa2..1fd0bb102 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -2,4 +2,4 @@ # the repo. Unless a later match takes precedence, # @mdebarros, @elynry-sam-k and @rmothilal will be requested for # review when someone opens a pull request. -* @mdebarros @elnyry-sam-k @rmothilal +* @mdebarros @elnyry-sam-k @rmothilal @vijayg10 diff --git a/account-lookup-service/Chart.yaml b/account-lookup-service/Chart.yaml index 776d1a356..7a54dc958 100644 --- a/account-lookup-service/Chart.yaml +++ b/account-lookup-service/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 version: 12.1.0 -appVersion: "account-lookup-service: v11.3.2; als-oracle-pathfinder: v11.0.0" +appVersion: "account-lookup-service: v11.5.3; als-oracle-pathfinder: v11.0.0" description: Account Lookup Service Helm Chart for Mojaloop name: account-lookup-service diff --git a/account-lookup-service/chart-admin/Chart.yaml b/account-lookup-service/chart-admin/Chart.yaml index 5c2f425b4..23fa9bb95 100644 --- a/account-lookup-service/chart-admin/Chart.yaml +++ b/account-lookup-service/chart-admin/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 version: 12.1.0 -appVersion: "11.3.2" +appVersion: "11.5.3" description: A Helm chart for Kubernetes name: account-lookup-service-admin diff --git a/account-lookup-service/chart-admin/values.yaml b/account-lookup-service/chart-admin/values.yaml index 7e5bc1265..80bcf6a7e 100644 --- a/account-lookup-service/chart-admin/values.yaml +++ b/account-lookup-service/chart-admin/values.yaml @@ -7,7 +7,7 @@ containers: api: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--api"]' service: @@ -18,7 +18,7 @@ containers: admin: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--admin"]' service: @@ -60,7 +60,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: diff --git a/account-lookup-service/chart-service/Chart.yaml b/account-lookup-service/chart-service/Chart.yaml index 1f967eed3..8afb163d3 100644 --- a/account-lookup-service/chart-service/Chart.yaml +++ b/account-lookup-service/chart-service/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 version: 12.1.0 -appVersion: "11.3.2" +appVersion: "11.5.3" description: A Helm chart for Kubernetes name: account-lookup-service diff --git a/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 61a8d3362..612a05a6f 100644 --- a/account-lookup-service/chart-service/values.yaml +++ b/account-lookup-service/chart-service/values.yaml @@ -8,7 +8,7 @@ containers: api: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--api"]' service: @@ -19,7 +19,7 @@ containers: admin: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--admin"]' service: @@ -61,7 +61,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: diff --git a/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index 7f9d4d0fb..eca3b6944 100644 --- a/account-lookup-service/values.yaml +++ b/account-lookup-service/values.yaml @@ -9,7 +9,7 @@ account-lookup-service: api: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--api"]' service: @@ -20,7 +20,7 @@ account-lookup-service: admin: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--admin"]' service: @@ -168,7 +168,7 @@ account-lookup-service-admin: api: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--api"]' service: @@ -179,7 +179,7 @@ account-lookup-service-admin: admin: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--admin"]' service: diff --git a/bulk-api-adapter/Chart.yaml b/bulk-api-adapter/Chart.yaml index 439b204c2..dcbce0956 100644 --- a/bulk-api-adapter/Chart.yaml +++ b/bulk-api-adapter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: bulk-api-adapter Helm chart for Kubernetes name: bulk-api-adapter -version: 11.0.1 -appVersion: "11.1.1" +version: 11.0.2 +appVersion: "11.1.4" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-api-adapter/chart-handler-notification/Chart.yaml b/bulk-api-adapter/chart-handler-notification/Chart.yaml index 5a827d846..ad39793dd 100644 --- a/bulk-api-adapter/chart-handler-notification/Chart.yaml +++ b/bulk-api-adapter/chart-handler-notification/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: bulk-api-adapter Handler for Notifications component Helm chart for Kubernetes name: bulk-api-adapter-handler-notification -version: 11.0.1 -appVersion: "11.1.0" +version: 11.0.2 +appVersion: "11.1.4" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-api-adapter/chart-handler-notification/values.yaml b/bulk-api-adapter/chart-handler-notification/values.yaml index 4090c3414..de3db7502 100644 --- a/bulk-api-adapter/chart-handler-notification/values.yaml +++ b/bulk-api-adapter/chart-handler-notification/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bulk-api-adapter/chart-service/Chart.yaml b/bulk-api-adapter/chart-service/Chart.yaml index b452777f5..454b329b7 100644 --- a/bulk-api-adapter/chart-service/Chart.yaml +++ b/bulk-api-adapter/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: bulk-api-adapter API component Helm chart for Kubernetes name: bulk-api-adapter-service -version: 11.0.1 -appVersion: "11.1.0" +version: 11.0.2 +appVersion: "11.1.4" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-api-adapter/chart-service/values.yaml b/bulk-api-adapter/chart-service/values.yaml index b968fd8e1..bf9296de7 100644 --- a/bulk-api-adapter/chart-service/values.yaml +++ b/bulk-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bulk-api-adapter/requirements.yaml b/bulk-api-adapter/requirements.yaml index b57c96d9a..848dd2b23 100644 --- a/bulk-api-adapter/requirements.yaml +++ b/bulk-api-adapter/requirements.yaml @@ -1,10 +1,10 @@ # requirements.yaml dependencies: - name: bulk-api-adapter-service - version: 11.0.1 + version: 11.0.2 repository: "file://./chart-service" condition: bulk-api-adapter-service.enabled - name: bulk-api-adapter-handler-notification - version: 11.0.1 + version: 11.0.2 repository: "file://./chart-handler-notification" condition: bulk-api-adapter-handler-notification.enabled diff --git a/bulk-api-adapter/values.yaml b/bulk-api-adapter/values.yaml index cb1c0eab6..dff97940d 100644 --- a/bulk-api-adapter/values.yaml +++ b/bulk-api-adapter/values.yaml @@ -12,7 +12,7 @@ bulk-api-adapter-service: replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -131,7 +131,7 @@ bulk-api-adapter-handler-notification: replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/bulk-centralledger/Chart.yaml b/bulk-centralledger/Chart.yaml index d7e8b2871..bc991c334 100644 --- a/bulk-centralledger/Chart.yaml +++ b/bulk-centralledger/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Bulk Services Helm chart for Kubernetes name: bulk-centralledger -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml index 186178a8e..3e5b1afed 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Bulk Transfer Fulfil Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-fulfil -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/configs/default.json b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/configs/default.json index 85a307a35..879d9b34e 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/configs/default.json +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -118,7 +118,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -141,7 +142,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -164,7 +166,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -187,7 +190,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -212,7 +216,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -235,7 +240,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -258,7 +264,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -281,7 +288,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -306,7 +314,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml index 5768e92e2..89b60569b 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkfulfil"]' service: @@ -86,6 +86,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: false objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml index 2909b4eec..84f4c130c 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Bulk Transfer Get Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-get -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/configs/default.json b/bulk-centralledger/chart-handler-bulk-transfer-get/configs/default.json index e24ce2a47..03fc0e15f 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/configs/default.json +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/configs/default.json @@ -74,8 +74,8 @@ }, "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -115,7 +115,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml index 38bd0f982..873e675a1 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkget"]' service: @@ -86,6 +86,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: false objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml index e8f13930b..4cc46b77f 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Bulk Transfer Prepare Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-prepare -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/configs/default.json b/bulk-centralledger/chart-handler-bulk-transfer-prepare/configs/default.json index 85a307a35..879d9b34e 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/configs/default.json +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -118,7 +118,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -141,7 +142,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -164,7 +166,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -187,7 +190,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -212,7 +216,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -235,7 +240,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -258,7 +264,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -281,7 +288,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -306,7 +314,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml index 65a81c76e..cc53fba13 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprepare"]' service: @@ -86,6 +86,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: false objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml index 4f5ecb011..4511b8f56 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Bulk Transfer Processing Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-processing -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/configs/default.json b/bulk-centralledger/chart-handler-bulk-transfer-processing/configs/default.json index 85a307a35..879d9b34e 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/configs/default.json +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -118,7 +118,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -141,7 +142,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -164,7 +166,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -187,7 +190,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -212,7 +216,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -235,7 +240,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -258,7 +264,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -281,7 +288,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -306,7 +314,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml index 6d74ef45b..922ddd2ee 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml @@ -24,7 +24,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprocessing"]' service: @@ -99,6 +99,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: false objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/bulk-centralledger/requirements.yaml b/bulk-centralledger/requirements.yaml index d024a436d..ec997b251 100644 --- a/bulk-centralledger/requirements.yaml +++ b/bulk-centralledger/requirements.yaml @@ -1,18 +1,18 @@ # requirements.yaml dependencies: - name: cl-handler-bulk-transfer-prepare - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-bulk-transfer-prepare" condition: cl-handler-bulk-transfer-prepare.enabled - name: cl-handler-bulk-transfer-fulfil - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-bulk-transfer-fulfil" condition: cl-handler-bulk-transfer-fulfil.enabled - name: cl-handler-bulk-transfer-processing - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-bulk-transfer-processing" condition: cl-handler-bulk-transfer-processing.enabled - name: cl-handler-bulk-transfer-get - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-bulk-transfer-get" condition: cl-handler-bulk-transfer-get.enabled diff --git a/bulk-centralledger/values.yaml b/bulk-centralledger/values.yaml index f295f28f4..ced498580 100644 --- a/bulk-centralledger/values.yaml +++ b/bulk-centralledger/values.yaml @@ -14,7 +14,7 @@ cl-handler-bulk-transfer-prepare: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprepare"]' service: @@ -199,7 +199,7 @@ cl-handler-bulk-transfer-fulfil: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkfulfil"]' service: @@ -381,7 +381,7 @@ cl-handler-bulk-transfer-processing: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprocessing"]' service: @@ -562,7 +562,7 @@ cl-handler-bulk-transfer-get: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkget"]' service: diff --git a/central/Chart.yaml b/central/Chart.yaml index a8f46846e..c69e8afa7 100644 --- a/central/Chart.yaml +++ b/central/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central Helm chart for Kubernetes name: central -version: 12.0.1 -appVersion: "central-ledger: v13.2.5; central-settlement: v12.0.3; central-event-processor: v11.0.1" +version: 13.0.0 +appVersion: "central-ledger: v13.12.1; central-settlement: v13.2.0; central-event-processor: v11.0.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/central/requirements.yaml b/central/requirements.yaml index 033af1f10..78f321651 100644 --- a/central/requirements.yaml +++ b/central/requirements.yaml @@ -1,14 +1,14 @@ # requirements.yaml dependencies: - name: centralledger - version: 12.0.1 + version: 12.1.0 repository: "file://../centralledger" condition: centralledger.enabled - name: centralsettlement - version: 12.0.0 + version: 13.0.0 repository: "file://../centralsettlement" condition: centralsettlement.enabled - name: centraleventprocessor - version: 11.0.1 + version: 11.0.2 repository: "file://../centraleventprocessor" condition: centraleventprocessor.enabled diff --git a/central/values.yaml b/central/values.yaml index c15fc137f..95b467302 100644 --- a/central/values.yaml +++ b/central/values.yaml @@ -22,7 +22,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -60,7 +60,7 @@ centralledger: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -200,7 +200,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--prepare"]' service: @@ -238,7 +238,7 @@ centralledger: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -388,7 +388,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--position"]' service: @@ -426,7 +426,7 @@ centralledger: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -573,7 +573,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--get"]' service: @@ -611,7 +611,7 @@ centralledger: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -758,7 +758,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--fulfil"]' service: @@ -796,7 +796,7 @@ centralledger: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -943,7 +943,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--timeout"]' service: @@ -981,7 +981,7 @@ centralledger: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -1128,7 +1128,7 @@ centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--admin"]' service: @@ -1166,7 +1166,7 @@ centralledger: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -1921,7 +1921,7 @@ centralsettlement: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -1945,15 +1945,15 @@ centralsettlement: name: http-api externalPort: 3007 readinessProbe: - enabled: false + enabled: true httpGet: - path: /health + path: /v2/health initialDelaySeconds: 60 periodSeconds: 15 livenessProbe: - enabled: false + enabled: true httpGet: - path: /health + path: /v2/health initialDelaySeconds: 60 periodSeconds: 15 @@ -1974,7 +1974,7 @@ centralsettlement: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -2007,7 +2007,7 @@ centralsettlement: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-handler-position + serviceName: central-settlement-service config: ## Kafka Configuration @@ -2043,7 +2043,7 @@ centralsettlement: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -2078,7 +2078,7 @@ centralsettlement: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -2120,7 +2120,7 @@ centralsettlement: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -2190,7 +2190,7 @@ centralsettlement: # cpu: 100m # memory: 128Mi - centralsettlement-handler-settlementwindow: + centralsettlement-handler-deferredsettlement: enabled: true replicaCount: 1 @@ -2198,9 +2198,9 @@ centralsettlement: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--settlementwindow"]' + command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' service: type: ClusterIP ports: @@ -2222,15 +2222,15 @@ centralsettlement: name: http-api externalPort: 3007 readinessProbe: - enabled: false + enabled: true httpGet: - path: /health + path: /v2/health initialDelaySeconds: 60 periodSeconds: 15 livenessProbe: - enabled: false + enabled: true httpGet: - path: /health + path: /v2/health initialDelaySeconds: 60 periodSeconds: 15 @@ -2251,7 +2251,7 @@ centralsettlement: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -2284,7 +2284,7 @@ centralsettlement: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-handler-position + serviceName: central-settlement-handler-deferredsettlement config: ## Kafka Configuration @@ -2320,7 +2320,7 @@ centralsettlement: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -2355,7 +2355,7 @@ centralsettlement: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -2397,7 +2397,7 @@ centralsettlement: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -2442,12 +2442,296 @@ centralsettlement: name: http-api externalPort: 3007 ingress: + enabled: false + externalPath: + api: / + # Used to create an Ingress record. + hosts: + api: central-settlement-deferredsettlement.local + annotations: {} + ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ + # nginx.ingress.kubernetes.io/rewrite-target: '/' + # nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ + # kubernetes.io/ingress.class: nginx + ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego + # kubernetes.io/tls-acme: "true" + tls: [] + # Secrets must be manually created in the namespace. + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + + centralsettlement-handler-grosssettlement: + ## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing. + ## Note: Ensure that you have configured the appropriated settlementModels (refer to the associated tagged release on https://github.com/mojaloop/postman for an example). See below more information on how to configure rule processing for Interchange Fees. + enabled: false + replicaCount: 1 + containers: + api: + image: + repository: mojaloop/central-settlement + tag: v13.2.0 + pullPolicy: IfNotPresent + command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' + service: + type: ClusterIP + ports: + api: + name: http-api + externalPort: 80 + internalPort: 3007 + annotations: {} + # This allows one to point the service to an external backend. + # This is useful for local development where one wishes to hijack + # the communication from the service to the node layer and point + # to a specific endpoint (IP, Port, etc). + external: + enabled: false + # 10.0.2.2 is the magic IP for the host on virtualbox's network + ip: 10.0.2.2 + ports: + api: + name: http-api + externalPort: 3007 + readinessProbe: + enabled: true + httpGet: + path: /v2/health + initialDelaySeconds: 60 + periodSeconds: 15 + livenessProbe: + enabled: true + httpGet: + path: /v2/health + initialDelaySeconds: 60 + periodSeconds: 15 + + ## Pod scheduling preferences. + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + affinity: {} + + ## Node labels for pod assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector + nodeSelector: {} + + ## Set toleration for scheduler + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] + + ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED + sidecar: + enabled: false + # image: + # repository: mojaloop/event-sidecar + # tag: v11.0.1 + # pullPolicy: IfNotPresent + # command: '["npm", "run", "start"]' + # service: + # internalPort: 4001 + # readinessProbe: + # enabled: true + # httpGet: + # path: /health + # initialDelaySeconds: 120 + # periodSeconds: 15 + # livenessProbe: + # enabled: true + # httpGet: + # path: /health + # initialDelaySeconds: 90 + # periodSeconds: 15 + # config: + # event_log_grpc_host: localhost + # event_log_grpc_port: 50051 + # event_log_filter: 'audit:*, log:info, log:warn, log:error' + # event_log_metadata_only: true + # log_level: info + # log_filter: 'error, warn, info' + + ## metric configuration for prometheus instrumentation + metrics: + ## flag to enable/disable the metrics end-points + enabled: false + config: + timeout: 5000 + prefix: moja_ + defaultLabels: + serviceName: central-settlement-handler-grosssettlement + + config: + ## Kafka Configuration + # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used. + kafka_host: '$release_name-kafka' + kafka_port: 9092 + kafka: + consumer: + notification: + close: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + event: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + deferredsettlement: + close: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + producer: + notification: + event: + config: + options: + messageCharset: 'utf8' + rdkafkaConf: + event_cb: true + compression_codec: 'none' + retry_backoff_ms: 100 + message_send_max_retries: 2 + socket_keepalive_enable: true + batch_num_messages: 100 + dr_cb: false + socket_blocking_max_ms: 1 + queue_buffering_max_ms: 1 + broker_version_fallback: '0.10.1.0' + api_version_request: true + topicConf: + request_required_acks: 'all' + partitioner: 'murmur2_random' + deferredsettlement: + close: + config: + options: + messageCharset: 'utf8' + rdkafkaConf: + event_cb: true + dr_cb: true + socket_keepalive_enable: true + topicConf: + request_required_acks: "all" + partitioner: 'murmur2_random' + ## DB Configuration + # db_type can either be 'postgres' or 'mysql'. Ensure the correct DB is enabled and configured below: postgresql.enabled or mysql.enabled + db_type: 'mysql' + # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set. + db_driver: 'mysql' + db_host: '$release_name-centralledger-mysql' + db_port: 3306 + db_user: central_ledger + db_password: oyMxgZChuu + db_database: central_ledger + db_connection_pool_min: 10 + db_connection_pool_max: 30 + db_acquire_timeout_millis: 30000 + db_create_timeout_millis: 30000 + db_destroy_timeout_millis: 5000 + db_idle_timeout_millis: 30000 + db_reap_interval_millis: 1000 + db_create_retry_interval_millis: 200 + db_debug: false + # Api Handler Configuration + handlers: + disabled: false + api: + disabled: false + # Settlement Window aggregation Configuration + window_aggregation: + retry_count: 3 + retry_interval: 3000 + hub_participant: + id: 1 + name: Hub + log_level: info + log_transport: file + + error_handling: + include_cause_extension: false + truncate_extensions: true + + init: enabled: true + mysql: + name: wait-for-mysql + repository: mysql + tag: latest + pullPolicy: IfNotPresent + command: "until result=$(mysql -h $db_host -P $db_port -u $db_user --password=$db_password $db_database -ss -N -e 'select is_locked from migration_lock;') && eval 'echo is_locked=$result' && if [ -z $result ]; then false; fi && if [ $result -ne 0 ]; then false; fi; do echo waiting for MySQL; sleep 2; done;" + kafka: + name: wait-for-kafka + repository: solsson/kafka + tag: latest + pullPolicy: IfNotPresent + command: "until ./bin/kafka-broker-api-versions.sh --bootstrap-server $kafka_host:$kafka_port; do echo waiting for Kafka; sleep 2; done;" + env: {} + service: + type: ClusterIP + ports: + api: + name: http-api + externalPort: 80 + internalPort: 3007 + annotations: {} + + # This allows one to point the service to an external backend. + # This is useful for local development where one wishes to hijack + # the communication from the service to the node layer and point + # to a specific endpoint (IP, Port, etc). + external: + enabled: false + # 10.0.2.2 is the magic IP for the host on virtualbox's network + ip: 10.0.2.2 + ports: + api: + name: http-api + externalPort: 3007 + ingress: + enabled: false externalPath: api: / # Used to create an Ingress record. hosts: - api: central-settlement-settlementwindow.local + api: central-settlement-grosssettlement.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' @@ -2473,16 +2757,18 @@ centralsettlement: # cpu: 100m # memory: 128Mi - centralsettlement-handler-transfersettlement: - enabled: true + centralsettlement-handler-rules: + ## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing. + ## Note: Ensure that you have configured the appropriated settlementModels (refer to the associated tagged release on https://github.com/mojaloop/postman for an example). See below more information on how to configure rule processing for Interchange Fees. + enabled: false replicaCount: 1 containers: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--transfersettlement"]' + command: '["node", "src/handlers/index.js", "h", "--rules"]' service: type: ClusterIP ports: @@ -2504,15 +2790,15 @@ centralsettlement: name: http-api externalPort: 3007 readinessProbe: - enabled: false + enabled: true httpGet: - path: /health + path: /v2/health initialDelaySeconds: 60 periodSeconds: 15 livenessProbe: - enabled: false + enabled: true httpGet: - path: /health + path: /v2/health initialDelaySeconds: 60 periodSeconds: 15 @@ -2533,7 +2819,7 @@ centralsettlement: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -2566,7 +2852,7 @@ centralsettlement: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-handler-position + serviceName: central-settlement-handler-rules config: ## Kafka Configuration @@ -2602,7 +2888,7 @@ centralsettlement: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -2637,7 +2923,7 @@ centralsettlement: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -2679,7 +2965,7 @@ centralsettlement: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -2687,60 +2973,94 @@ centralsettlement: include_cause_extension: false truncate_extensions: true - rules: {} + rules: ## The rules object defines rules files represented as key-value pairs. These rules will be executed per commited transfer. ## Expected key-value format for the rules object: ## nameOfFile.js: fileContents ## See below example of interchange fee rule. - - # interchangeFeeCalculation.js: | - # /* eslint-disable no-undef */ + + ## Default Empty Script - This is required as the rule engine requires a rule-file to function properly. + ## Note: Uncomment this and comment-out the interchangeFeeCalculation.js below is you wish to enable CGS processing but do not want Interchange Fee processing. + # defaultEmptyScript.js: | # // ******************************************************** - # // Name: Interchange fee calculation + # // Name: Default Empty Rule # // Type: notification # // Action: commit # // Status: success # // Start: 2020-06-01T00:00:00.000Z # // End: 2100-12-31T23:59:59.999Z - # // Description: This script calculates the interchange fees between DFSPs where the account type is "Wallet" + # // Description: This is empty rules script # // ******************************************************** - # // ## Globals: # // payload: The contents of the message from the Kafka topic. # // transfer: The transfer object. - # // # Functions: # // ## Data retrieval functions: # // getTransfer(transferId): Retrieves a mojaloop transfer from the central-ledger API. - # // ## Helper functions: # // getExtensionValue(list, key): Gets a value from an extension list # // log(message): allows the script to log to standard out for debugging purposes - # // Math functions: # // multiply(number1, number2, decimalPlaces): Uses ml-number to handle multiplication of money values - # // Ledger functions: # // addLedgerEntry: Adds a debit and credit ledger entry to the specified account to the specified DFSPs - - # log(JSON.stringify(transfer)) - # const payerFspId = transfer.payer.partyIdInfo.fspId - # const payeeFspId = transfer.payee.partyIdInfo.fspId - - # if ((payeeFspId !== payerFspId) && - # (getExtensionValue(transfer.payee.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet' && - # getExtensionValue(transfer.payer.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet') && - # (transfer.transactionType.scenario === 'TRANSFER' && - # transfer.transactionType.initiator === 'PAYER' && - # transfer.transactionType.initiatorType === 'CONSUMER')) { - # log(`Adding an interchange fee for Wallet to Wallet from ${payerFspId} to ${payeeFspId}`) - # addLedgerEntry(payload.id, 'INTERCHANGE_FEE', // Ledger account type Id - # 'INTERCHANGE_FEE', // Ledger entry type Id - # multiply(transfer.amount.amount, 0.006, 2), - # transfer.amount.currency, - # payerFspId, - # payeeFspId) - # } + # log('Running - DEFAULT EMPTY RULES SCRIPT') + + ## Interchange Fee Calculation Script - Ensure that a settlementModel (refer to the associated tagged release on https://github.com/mojaloop/postman for an example) is created for the ledgerAccounType "INTERCHANGE_FEE". + ## Note: Uncomment this is you wish to enable CGS processing but also want Interchange Fee processing. + interchangeFeeCalculation.js: | + /* eslint-disable no-undef */ + // ******************************************************** + // Name: Interchange fee calculation + // Type: notification + // Action: commit + // Status: success + // Start: 2020-06-01T00:00:00.000Z + // End: 2100-12-31T23:59:59.999Z + // Description: This script calculates the interchange fees between DFSPs where the account type is "Wallet" + // ******************************************************** + + // ## Globals: + // payload: The contents of the message from the Kafka topic. + // transfer: The transfer object. + + // # Functions: + // ## Data retrieval functions: + // getTransfer(transferId): Retrieves a mojaloop transfer from the central-ledger API. + + // ## Helper functions: + // getExtensionValue(list, key): Gets a value from an extension list + // log(message): allows the script to log to standard out for debugging purposes + + // Math functions: + // multiply(number1, number2, decimalPlaces): Uses ml-number to handle multiplication of money values + + // Ledger functions: + // addLedgerEntry: Adds a debit and credit ledger entry to the specified account to the specified DFSPs + + log('Running - interchangeFeeCalculation') + + log(JSON.stringify(transfer)) + const payerFspId = transfer.payer.partyIdInfo.fspId + const payeeFspId = transfer.payee.partyIdInfo.fspId + + if ((payeeFspId !== payerFspId) && + (transfer.payee.partyIdInfo.extensionList && // WORKAROUND for issue #2149 + transfer.payer.partyIdInfo.extensionList && // WORKAROUND for issue #2149 + transfer.payee.partyIdInfo.extensionList.extension && // WORKAROUND for issue #2149 + transfer.payer.partyIdInfo.extensionList.extension) && // WORKAROUND for issue #2149 (getExtensionValue(transfer.payee.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet' && + getExtensionValue(transfer.payer.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet') && + (transfer.transactionType.scenario === 'TRANSFER' && + transfer.transactionType.initiator === 'PAYER' && + transfer.transactionType.initiatorType === 'CONSUMER')) { + log(`Adding an interchange fee for Wallet to Wallet from ${payerFspId} to ${payeeFspId}`) + addLedgerEntry(payload.id, 'INTERCHANGE_FEE', // Ledger account type Id + 'INTERCHANGE_FEE', // Ledger entry type Id + multiply(transfer.amount.amount, 0.006, 2), + transfer.amount.currency, + payerFspId, + payeeFspId) + } init: enabled: true @@ -2779,12 +3099,12 @@ centralsettlement: name: http-api externalPort: 3007 ingress: - enabled: true + enabled: false externalPath: api: / # Used to create an Ingress record. hosts: - api: central-settlement-transfersettlement.local + api: central-settlement-rules.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' @@ -2820,7 +3140,7 @@ centraleventprocessor: replicaCount: 1 image: repository: mojaloop/central-event-processor - tag: v11.0.1 + tag: v11.0.2 pullPolicy: IfNotPresent init: @@ -2929,7 +3249,7 @@ centraleventprocessor: central_ledger_admin_host: '$release_name-centralledger-service' central_ledger_admin_port: 80 hub_participant: - name: hub + name: Hub log_level: info log_transport: file diff --git a/centraleventprocessor/Chart.yaml b/centraleventprocessor/Chart.yaml index 55ecf4a01..87ed97ce4 100644 --- a/centraleventprocessor/Chart.yaml +++ b/centraleventprocessor/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central Event Processor for Mojaloop name: centraleventprocessor -version: 11.0.1 -appVersion: "11.0.1" +version: 11.0.2 +appVersion: "11.0.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centraleventprocessor/values.yaml b/centraleventprocessor/values.yaml index 13cf490fd..31e01334f 100644 --- a/centraleventprocessor/values.yaml +++ b/centraleventprocessor/values.yaml @@ -10,7 +10,7 @@ global: replicaCount: 1 image: repository: mojaloop/central-event-processor - tag: v11.0.1 + tag: v11.0.2 pullPolicy: IfNotPresent ## Pod scheduling preferences. @@ -131,7 +131,7 @@ config: central_ledger_admin_host: '$release_name-centralledger-service' central_ledger_admin_port: 80 hub_participant: - name: hub + name: Hub log_level: info log_transport: file diff --git a/centralledger/Chart.yaml b/centralledger/Chart.yaml index 403bccf90..785f74885 100644 --- a/centralledger/Chart.yaml +++ b/centralledger/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Helm chart for Kubernetes name: centralledger -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-admin-transfer/Chart.yaml b/centralledger/chart-handler-admin-transfer/Chart.yaml index 4fd5d3cf2..59f7278e0 100644 --- a/centralledger/chart-handler-admin-transfer/Chart.yaml +++ b/centralledger/chart-handler-admin-transfer/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes name: centralledger-handler-admin-transfer -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-admin-transfer/configs/default.json b/centralledger/chart-handler-admin-transfer/configs/default.json index d946abaa1..81fd29fb0 100644 --- a/centralledger/chart-handler-admin-transfer/configs/default.json +++ b/centralledger/chart-handler-admin-transfer/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -121,7 +121,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -144,7 +145,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -167,7 +169,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -190,7 +193,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -215,7 +219,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -238,7 +243,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -261,7 +267,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -284,7 +291,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -309,7 +317,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-handler-admin-transfer/values.yaml b/centralledger/chart-handler-admin-transfer/values.yaml index eaa915a29..1ddf7d09a 100644 --- a/centralledger/chart-handler-admin-transfer/values.yaml +++ b/centralledger/chart-handler-admin-transfer/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--admin"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/chart-handler-timeout/Chart.yaml b/centralledger/chart-handler-timeout/Chart.yaml index 9b0db414e..b6263cbde 100644 --- a/centralledger/chart-handler-timeout/Chart.yaml +++ b/centralledger/chart-handler-timeout/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Timeout Handler Helm chart for Kubernetes name: centralledger-handler-timeout -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-timeout/configs/default.json b/centralledger/chart-handler-timeout/configs/default.json index fa0ddece0..291d1f879 100644 --- a/centralledger/chart-handler-timeout/configs/default.json +++ b/centralledger/chart-handler-timeout/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -121,7 +121,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -144,7 +145,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -167,7 +169,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -190,7 +193,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -215,7 +219,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -238,7 +243,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -261,7 +267,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -284,7 +291,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -309,7 +317,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-handler-timeout/values.yaml b/centralledger/chart-handler-timeout/values.yaml index 8b66eb97f..bc2cc22f8 100644 --- a/centralledger/chart-handler-timeout/values.yaml +++ b/centralledger/chart-handler-timeout/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--timeout"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/chart-handler-transfer-fulfil/Chart.yaml b/centralledger/chart-handler-transfer-fulfil/Chart.yaml index ac425aa83..85bbfd3cb 100644 --- a/centralledger/chart-handler-transfer-fulfil/Chart.yaml +++ b/centralledger/chart-handler-transfer-fulfil/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Transfer Fulfil Handler Helm chart for Kubernetes name: centralledger-handler-transfer-fulfil -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-fulfil/configs/default.json b/centralledger/chart-handler-transfer-fulfil/configs/default.json index d946abaa1..81fd29fb0 100644 --- a/centralledger/chart-handler-transfer-fulfil/configs/default.json +++ b/centralledger/chart-handler-transfer-fulfil/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -121,7 +121,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -144,7 +145,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -167,7 +169,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -190,7 +193,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -215,7 +219,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -238,7 +243,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -261,7 +267,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -284,7 +291,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -309,7 +317,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-handler-transfer-fulfil/values.yaml b/centralledger/chart-handler-transfer-fulfil/values.yaml index 675f34cab..d57a74894 100644 --- a/centralledger/chart-handler-transfer-fulfil/values.yaml +++ b/centralledger/chart-handler-transfer-fulfil/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--fulfil"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/chart-handler-transfer-get/Chart.yaml b/centralledger/chart-handler-transfer-get/Chart.yaml index b04231359..5c0090a79 100644 --- a/centralledger/chart-handler-transfer-get/Chart.yaml +++ b/centralledger/chart-handler-transfer-get/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Get Transfer Handler Helm chart for Kubernetes name: centralledger-handler-transfer-get -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-get/configs/default.json b/centralledger/chart-handler-transfer-get/configs/default.json index d946abaa1..81fd29fb0 100644 --- a/centralledger/chart-handler-transfer-get/configs/default.json +++ b/centralledger/chart-handler-transfer-get/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -121,7 +121,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -144,7 +145,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -167,7 +169,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -190,7 +193,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -215,7 +219,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -238,7 +243,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -261,7 +267,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -284,7 +291,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -309,7 +317,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-handler-transfer-get/values.yaml b/centralledger/chart-handler-transfer-get/values.yaml index 25a88834f..8cf2d80ff 100644 --- a/centralledger/chart-handler-transfer-get/values.yaml +++ b/centralledger/chart-handler-transfer-get/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--get"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/chart-handler-transfer-position/Chart.yaml b/centralledger/chart-handler-transfer-position/Chart.yaml index c6c52fbaa..37c13c558 100644 --- a/centralledger/chart-handler-transfer-position/Chart.yaml +++ b/centralledger/chart-handler-transfer-position/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Transfer Position Handler Helm chart for Kubernetes name: centralledger-handler-transfer-position -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-position/configs/default.json b/centralledger/chart-handler-transfer-position/configs/default.json index d946abaa1..81fd29fb0 100644 --- a/centralledger/chart-handler-transfer-position/configs/default.json +++ b/centralledger/chart-handler-transfer-position/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -121,7 +121,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -144,7 +145,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -167,7 +169,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -190,7 +193,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -215,7 +219,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -238,7 +243,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -261,7 +267,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -284,7 +291,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -309,7 +317,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-handler-transfer-position/values.yaml b/centralledger/chart-handler-transfer-position/values.yaml index 09000d256..fc5f0db27 100644 --- a/centralledger/chart-handler-transfer-position/values.yaml +++ b/centralledger/chart-handler-transfer-position/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--position"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/chart-handler-transfer-prepare/Chart.yaml b/centralledger/chart-handler-transfer-prepare/Chart.yaml index 6ab53f3de..141fe571d 100644 --- a/centralledger/chart-handler-transfer-prepare/Chart.yaml +++ b/centralledger/chart-handler-transfer-prepare/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes name: centralledger-handler-transfer-prepare -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-prepare/configs/default.json b/centralledger/chart-handler-transfer-prepare/configs/default.json index 920fe4800..91ea6efc4 100644 --- a/centralledger/chart-handler-transfer-prepare/configs/default.json +++ b/centralledger/chart-handler-transfer-prepare/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -122,7 +122,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -145,7 +146,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -168,7 +170,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -191,7 +194,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -216,7 +220,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -239,7 +244,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -262,7 +268,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -285,7 +292,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -310,7 +318,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-handler-transfer-prepare/values.yaml b/centralledger/chart-handler-transfer-prepare/values.yaml index 4dc9aaa65..9a32e79cc 100644 --- a/centralledger/chart-handler-transfer-prepare/values.yaml +++ b/centralledger/chart-handler-transfer-prepare/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--prepare"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/chart-service/Chart.yaml b/centralledger/chart-service/Chart.yaml index fabd60df5..c0dfe7276 100644 --- a/centralledger/chart-service/Chart.yaml +++ b/centralledger/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Ledger Service Helm chart for Kubernetes name: centralledger-service -version: 12.0.1 -appVersion: "13.2.5" +version: 12.1.0 +appVersion: "13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-service/configs/default.json b/centralledger/chart-service/configs/default.json index d64818427..0f32bc75c 100644 --- a/centralledger/chart-service/configs/default.json +++ b/centralledger/chart-service/configs/default.json @@ -77,8 +77,8 @@ "EMAIL_SMTP": "smtp.local", "PARTICIPANT_INITIAL_POSITION": 0, "HUB_PARTICIPANT": { - "ID": 1, - "NAME": "Hub", + "ID": {{ .Values.config.hub_participant.id }}, + "NAME": "{{ .Values.config.hub_participant.name }}", "ACCOUNTS": [ "HUB_RECONCILIATION", "HUB_MULTILATERAL_SETTLEMENT", @@ -121,7 +121,8 @@ "client.id": "cl-con-bulk-prepare", "group.id": "cl-group-bulk-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -144,7 +145,8 @@ "client.id": "cl-con-bulk-processing", "group.id": "cl-group-bulk-processing", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -167,7 +169,8 @@ "client.id": "cl-con-bulk-fulfil", "group.id": "cl-group-bulk-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -190,7 +193,8 @@ "client.id": "cl-con-bulk-get", "group.id": "cl-group-bulk-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -215,7 +219,8 @@ "client.id": "cl-con-transfer-prepare", "group.id": "cl-group-transfer-prepare", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -238,7 +243,8 @@ "client.id": "cl-con-transfer-position", "group.id": "cl-group-transfer-position", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -261,7 +267,8 @@ "client.id": "cl-con-transfer-fulfil", "group.id": "cl-group-transfer-fulfil", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -284,7 +291,8 @@ "client.id": "cl-con-transfer-get", "group.id": "cl-group-transfer-get", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -309,7 +317,8 @@ "client.id": "cl-con-transfer-admin", "group.id": "cl-group-transfer-admin", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": true + "socket.keepalive.enable": true, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/centralledger/chart-service/values.yaml b/centralledger/chart-service/values.yaml index 06aa82532..5787b18f2 100644 --- a/centralledger/chart-service/values.yaml +++ b/centralledger/chart-service/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -49,7 +49,7 @@ sidecar: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -116,6 +116,11 @@ config: db_create_retry_interval_millis: 200 db_debug: false + ## Hub Configuration + hub_participant: + id: 1 + name: Hub + ## MongoDB Configuration for Object Store objstore_disabled: true objstore_uri: 'mongodb://$release_name-centralledger-obj:27017/mlos' diff --git a/centralledger/requirements.yaml b/centralledger/requirements.yaml index c05dc024c..985e15e61 100644 --- a/centralledger/requirements.yaml +++ b/centralledger/requirements.yaml @@ -1,31 +1,31 @@ # requirements.yaml dependencies: - name: centralledger-service - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-service" condition: centralledger-service.enabled - name: centralledger-handler-transfer-prepare - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-transfer-prepare" condition: centralledger-handler-transfer-prepare.enabled - name: centralledger-handler-transfer-position - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-transfer-position" condition: centralledger-handler-transfer-position.enabled - name: centralledger-handler-transfer-get - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-transfer-get" condition: centralledger-handler-transfer-get.enabled - name: centralledger-handler-transfer-fulfil - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-transfer-fulfil" condition: centralledger-handler-transfer-fulfil.enabled - name: centralledger-handler-timeout - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-timeout" condition: centralledger-handler-timeout.enabled - name: centralledger-handler-admin-transfer - version: 12.0.1 + version: 12.1.0 repository: "file://./chart-handler-admin-transfer" condition: centralledger-handler-transfer-get.enabled #- name: forensicloggingsidecar diff --git a/centralledger/values.yaml b/centralledger/values.yaml index bd9028534..94c0934e6 100644 --- a/centralledger/values.yaml +++ b/centralledger/values.yaml @@ -17,7 +17,7 @@ centralledger-service: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -55,7 +55,7 @@ centralledger-service: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -196,7 +196,7 @@ centralledger-handler-transfer-prepare: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--prepare"]' service: @@ -234,7 +234,7 @@ centralledger-handler-transfer-prepare: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -385,7 +385,7 @@ centralledger-handler-transfer-position: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--position"]' service: @@ -423,7 +423,7 @@ centralledger-handler-transfer-position: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -571,7 +571,7 @@ centralledger-handler-transfer-get: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--get"]' service: @@ -609,7 +609,7 @@ centralledger-handler-transfer-get: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -757,7 +757,7 @@ centralledger-handler-transfer-fulfil: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--fulfil"]' service: @@ -795,7 +795,7 @@ centralledger-handler-transfer-fulfil: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -943,7 +943,7 @@ centralledger-handler-timeout: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--timeout"]' service: @@ -981,7 +981,7 @@ centralledger-handler-timeout: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -1129,7 +1129,7 @@ centralledger-handler-admin-transfer: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--admin"]' service: @@ -1167,7 +1167,7 @@ centralledger-handler-admin-transfer: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true diff --git a/centralsettlement/Chart.yaml b/centralsettlement/Chart.yaml index 6f929392f..21199f4d1 100644 --- a/centralsettlement/Chart.yaml +++ b/centralsettlement/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Settlement Helm chart for Kubernetes name: centralsettlement -version: 12.0.0 -appVersion: "12.0.3" +version: 13.0.0 +appVersion: "13.2.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralsettlement/chart-service/Chart.yaml b/centralsettlement/chart-service/Chart.yaml index 33b7be100..a8df6a21e 100644 --- a/centralsettlement/chart-service/Chart.yaml +++ b/centralsettlement/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Central-Settlement helm chart for API services and handlers name: centralsettlement-service -version: 12.0.0 -appVersion: "12.0.3" +version: 13.0.0 +appVersion: "13.2.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralsettlement/chart-service/configs/default.json b/centralsettlement/chart-service/configs/default.json index 65acc56b8..b19da9877 100644 --- a/centralsettlement/chart-service/configs/default.json +++ b/centralsettlement/chart-service/configs/default.json @@ -39,7 +39,12 @@ "DISABLED": {{ .Values.config.handlers.api.disabled }} }, "SETTINGS": { - "SCRIPTS_FOLDER": "{{ .Values.config.handlers.settings.scripts_folder }}" + "RULES": { + "SCRIPTS_FOLDER": "{{ .Values.config.handlers.settings.scripts_folder }}", + "SCRIPT_TIMEOUT": 100, + "CONSUMER_COMMIT": true, + "FROM_SWITCH": true + } } }, "API_DOC_ENDPOINTS_ENABLED": true, @@ -51,24 +56,25 @@ } }, "CONSUMER": { - "SETTLEMENTWINDOW": { + "DEFERREDSETTLEMENT": { "CLOSE": { "config": { "options": { - "mode": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.mode }}, - "batchSize": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.batchSize }}, - "pollFrequency": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.pollFrequency }}, - "recursiveTimeout": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.recursiveTimeout }}, - "messageCharset": "{{ .Values.config.kafka.consumer.settlementwindow.close.config.options.messageCharset }}", - "messageAsJSON": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.messageAsJSON }}, - "sync": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.sync }}, - "consumeTimeout": {{ .Values.config.kafka.consumer.settlementwindow.close.config.options.consumeTimeout }} + "mode": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.mode }}, + "batchSize": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.batchSize }}, + "pollFrequency": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.pollFrequency }}, + "recursiveTimeout": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.recursiveTimeout }}, + "messageCharset": "{{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.messageCharset }}", + "messageAsJSON": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.messageAsJSON }}, + "sync": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.sync }}, + "consumeTimeout": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.options.consumeTimeout }} }, "rdkafkaConf": { - "client.id": "cs-con-setlementwindow-close", - "group.id": "cs-group-setlementwindow-close", + "client.id": "cs-con-deferredsettlement-close", + "group.id": "cs-group-deferredsettlement-close", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": {{ .Values.config.kafka.consumer.settlementwindow.close.config.rdkafkaConf.socket_keepalive_enable }} + "socket.keepalive.enable": {{ .Values.config.kafka.consumer.deferredsettlement.close.config.rdkafkaConf.socket_keepalive_enable }}, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -90,10 +96,11 @@ "consumeTimeout": {{ .Values.config.kafka.consumer.notification.event.config.options.consumeTimeout }} }, "rdkafkaConf": { - "client.id": "cs-con-transferfulfil-process", - "group.id": "cs-group-transferfulfil-process", + "client.id": "cs-con-{{ template "centralsettlement-service.name" . }}-notification-event", + "group.id": "cs-group-{{ template "centralsettlement-service.name" . }}-notification-event", "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "socket.keepalive.enable": {{ .Values.config.kafka.consumer.notification.event.config.rdkafkaConf.socket_keepalive_enable }} + "socket.keepalive.enable": {{ .Values.config.kafka.consumer.notification.event.config.rdkafkaConf.socket_keepalive_enable }}, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" @@ -111,7 +118,7 @@ }, "rdkafkaConf": { "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "client.id": "cs-prod-notification-event", + "client.id": "cs-prod-{{ template "centralsettlement-service.name" . }}-notification-event", "event_cb": {{ .Values.config.kafka.producer.notification.event.config.rdkafkaConf.event_cb }}, "compression.codec": "{{ .Values.config.kafka.producer.notification.event.config.rdkafkaConf.compression_codec }}", "retry.backoff.ms": {{ .Values.config.kafka.producer.notification.event.config.rdkafkaConf.retry_backoff_ms }}, @@ -132,23 +139,23 @@ } } }, - "SETTLEMENTWINDOW": { + "DEFERREDSETTLEMENT": { "CLOSE": { "config": { "options": { - "messageCharset": "{{ .Values.config.kafka.producer.settlementwindow.close.config.options.messageCharset }}" + "messageCharset": "{{ .Values.config.kafka.producer.deferredsettlement.close.config.options.messageCharset }}" }, "rdkafkaConf": { "metadata.broker.list": "{{ (default .Values.config.kafka_host $kafkaHost) }}:{{ .Values.config.kafka_port }}", - "client.id": "cs-prod-setlementwindow-close", - "event_cb": {{ .Values.config.kafka.producer.settlementwindow.close.config.rdkafkaConf.event_cb }}, - "dr_cb": {{ .Values.config.kafka.producer.settlementwindow.close.config.rdkafkaConf.dr_cb }}, - "socket.keepalive.enable": {{ .Values.config.kafka.producer.settlementwindow.close.config.rdkafkaConf.socket_keepalive_enable }}, + "client.id": "cs-prod-deferredsettlement-close", + "event_cb": {{ .Values.config.kafka.producer.deferredsettlement.close.config.rdkafkaConf.event_cb }}, + "dr_cb": {{ .Values.config.kafka.producer.deferredsettlement.close.config.rdkafkaConf.dr_cb }}, + "socket.keepalive.enable": {{ .Values.config.kafka.producer.deferredsettlement.close.config.rdkafkaConf.socket_keepalive_enable }}, "queue.buffering.max.messages": 10000000 }, "topicConf": { - "request.required.acks": "{{ .Values.config.kafka.producer.settlementwindow.close.config.topicConf.request_required_acks }}", - "partitioner": "{{ .Values.config.kafka.producer.settlementwindow.close.config.topicConf.partitioner }}" + "request.required.acks": "{{ .Values.config.kafka.producer.deferredsettlement.close.config.topicConf.request_required_acks }}", + "partitioner": "{{ .Values.config.kafka.producer.deferredsettlement.close.config.topicConf.partitioner }}" } } } diff --git a/centralsettlement/chart-service/templates/deployment.yaml b/centralsettlement/chart-service/templates/deployment.yaml index ab63ec23c..1470bcb7e 100644 --- a/centralsettlement/chart-service/templates/deployment.yaml +++ b/centralsettlement/chart-service/templates/deployment.yaml @@ -150,7 +150,7 @@ spec: # periodSeconds: {{ .Values.sidecar.livenessProbe.periodSeconds }} # {{- end }} # volumeMounts: - # - name: {{ template "centralsettlement-handler-settlementwindow.fullname" . }}-sidecar-volum + # - name: {{ template "centralsettlement-handler-deferredsettlement.fullname" . }}-sidecar-volum # mountPath: /opt/event-sidecar/config # env: # - name: LOG_LEVEL @@ -174,9 +174,9 @@ spec: # path: knexfile.js ## UNCOMMENT AFTER EVENTSDK IS IMPLEMENTED # {{- if .Values.sidecar.enabled }} - # - name: {{ template "centralsettlement-handler-settlementwindow.fullname" . }}-sidecar-volum + # - name: {{ template "centralsettlement-handler-deferredsettlement.fullname" . }}-sidecar-volum # configMap: - # name: {{ template "centralsettlement-handler-settlementwindow.fullname" . }}-sidecar + # name: {{ template "centralsettlement-handler-deferredsettlement.fullname" . }}-sidecar # items: # - key: default.json # path: default.json diff --git a/centralsettlement/chart-service/values.yaml b/centralsettlement/chart-service/values.yaml index dface6774..91a85cc5b 100644 --- a/centralsettlement/chart-service/values.yaml +++ b/centralsettlement/chart-service/values.yaml @@ -11,9 +11,9 @@ containers: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--transfersettlement"]' + command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: type: ClusterIP ports: @@ -64,7 +64,7 @@ sidecar: enabled: false # image: # repository: mojaloop/event-sidecar -# tag: v11.0.0 +# tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -133,7 +133,7 @@ config: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -168,7 +168,7 @@ config: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -205,14 +205,14 @@ config: api: disabled: false settings: - scripts_folder: 'scripts/transferSettlementTemp' + scripts_folder: 'scripts/grosssettlementTemp' # Settlement Window aggregation Configuration window_aggregation: retry_count: 3 retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -317,7 +317,7 @@ ingress: api: / # Used to create an Ingress record. hosts: - api: central-settlement-transfersettlement.local + api: central-settlement-grosssettlement.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' diff --git a/centralsettlement/requirements.yaml b/centralsettlement/requirements.yaml index 9eb16c833..ee9a44486 100644 --- a/centralsettlement/requirements.yaml +++ b/centralsettlement/requirements.yaml @@ -4,14 +4,14 @@ dependencies: # version: 12.0.0 # repository: "file://./chart-service" # condition: centralsettlement-service.enabled -# - name: centralsettlement-handler-settlementwindow +# - name: centralsettlement-handler-deferredsettlement # version: 12.0.0 -# repository: "file://./chart-handler-settlementwindow" -# condition: centralsettlement-handler-settlementwindow.enabled -# - name: centralsettlement-handler-transfersettlement +# repository: "file://./chart-handler-deferredsettlement" +# condition: centralsettlement-handler-deferredsettlement.enabled +# - name: centralsettlement-handler-grosssettlement # version: 12.0.0 -# repository: "file://./chart-handler-transfersettlement" -# condition: centralsettlement-handler-transfersettlement.enabled +# repository: "file://./chart-handler-grosssettlement" +# condition: centralsettlement-handler-grosssettlement.enabled #- name: forensicloggingsidecar # version: 2.4.0 # repository: "file://../forensicloggingsidecar" @@ -21,20 +21,25 @@ dependencies: # repository: https://charts.helm.sh/stable # condition: postgresql.enabled - name: centralsettlement-service - version: 12.0.0 + version: 13.0.0 repository: "file://./chart-service" alias: centralsettlement-service condition: centralsettlement-service.enabled - name: centralsettlement-service - version: 12.0.0 + version: 13.0.0 repository: "file://./chart-service" - alias: centralsettlement-handler-settlementwindow - condition: centralsettlement-handler-settlementwindow.enabled + alias: centralsettlement-handler-deferredsettlement + condition: centralsettlement-handler-deferredsettlement.enabled - name: centralsettlement-service - version: 12.0.0 + version: 13.0.0 repository: "file://./chart-service" - alias: centralsettlement-handler-transfersettlement - condition: centralsettlement-handler-transfersettlement.enabled + alias: centralsettlement-handler-grosssettlement + condition: centralsettlement-handler-grosssettlement.enabled +- name: centralsettlement-service + version: 13.0.0 + repository: "file://./chart-service" + alias: centralsettlement-handler-rules + condition: centralsettlement-handler-rules.enabled - name: percona-xtradb-cluster version: 1.0.8 repository: https://charts.helm.sh/stable diff --git a/centralsettlement/values.yaml b/centralsettlement/values.yaml index 9c6f69358..bdc6d4eee 100644 --- a/centralsettlement/values.yaml +++ b/centralsettlement/values.yaml @@ -11,7 +11,7 @@ centralsettlement-service: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -64,7 +64,7 @@ centralsettlement-service: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -133,7 +133,7 @@ centralsettlement-service: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -168,7 +168,7 @@ centralsettlement-service: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -210,7 +210,7 @@ centralsettlement-service: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -280,7 +280,7 @@ centralsettlement-service: # cpu: 100m # memory: 128Mi -centralsettlement-handler-settlementwindow: +centralsettlement-handler-deferredsettlement: enabled: true replicaCount: 1 @@ -288,9 +288,9 @@ centralsettlement-handler-settlementwindow: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--settlementwindow"]' + command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' service: type: ClusterIP ports: @@ -341,7 +341,7 @@ centralsettlement-handler-settlementwindow: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -374,7 +374,7 @@ centralsettlement-handler-settlementwindow: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-settlement-handler-settlementwindow + serviceName: central-settlement-handler-deferredsettlement config: ## Kafka Configuration @@ -410,7 +410,7 @@ centralsettlement-handler-settlementwindow: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -445,7 +445,7 @@ centralsettlement-handler-settlementwindow: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -487,7 +487,7 @@ centralsettlement-handler-settlementwindow: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -537,7 +537,7 @@ centralsettlement-handler-settlementwindow: api: / # Used to create an Ingress record. hosts: - api: central-settlement-settlementwindow.local + api: central-settlement-deferredsettlement.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' @@ -563,7 +563,7 @@ centralsettlement-handler-settlementwindow: # cpu: 100m # memory: 128Mi -centralsettlement-handler-transfersettlement: +centralsettlement-handler-grosssettlement: ## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing. ## Note: Ensure that you have configured the appropriated settlementModels (refer to the associated tagged release on https://github.com/mojaloop/postman for an example). See below more information on how to configure rule processing for Interchange Fees. enabled: false @@ -572,9 +572,9 @@ centralsettlement-handler-transfersettlement: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--transfersettlement"]' + command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: type: ClusterIP ports: @@ -625,7 +625,7 @@ centralsettlement-handler-transfersettlement: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -658,7 +658,7 @@ centralsettlement-handler-transfersettlement: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-settlement-handler-transfersettlement + serviceName: central-settlement-handler-grosssettlement config: ## Kafka Configuration @@ -694,7 +694,7 @@ centralsettlement-handler-transfersettlement: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -729,7 +729,7 @@ centralsettlement-handler-transfersettlement: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -771,7 +771,291 @@ centralsettlement-handler-transfersettlement: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub + log_level: info + log_transport: file + + error_handling: + include_cause_extension: false + truncate_extensions: true + + init: + enabled: true + mysql: + name: wait-for-mysql + repository: mysql + tag: latest + pullPolicy: IfNotPresent + command: "until result=$(mysql -h $db_host -P $db_port -u $db_user --password=$db_password $db_database -ss -N -e 'select is_locked from migration_lock;') && eval 'echo is_locked=$result' && if [ -z $result ]; then false; fi && if [ $result -ne 0 ]; then false; fi; do echo waiting for MySQL; sleep 2; done;" + kafka: + name: wait-for-kafka + repository: solsson/kafka + tag: latest + pullPolicy: IfNotPresent + command: "until ./bin/kafka-broker-api-versions.sh --bootstrap-server $kafka_host:$kafka_port; do echo waiting for Kafka; sleep 2; done;" + env: {} + service: + type: ClusterIP + ports: + api: + name: http-api + externalPort: 80 + internalPort: 3007 + annotations: {} + + # This allows one to point the service to an external backend. + # This is useful for local development where one wishes to hijack + # the communication from the service to the node layer and point + # to a specific endpoint (IP, Port, etc). + external: + enabled: false + # 10.0.2.2 is the magic IP for the host on virtualbox's network + ip: 10.0.2.2 + ports: + api: + name: http-api + externalPort: 3007 + ingress: + enabled: false + externalPath: + api: / + # Used to create an Ingress record. + hosts: + api: central-settlement-grosssettlement.local + annotations: {} + ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ + # nginx.ingress.kubernetes.io/rewrite-target: '/' + # nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ + # kubernetes.io/ingress.class: nginx + ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego + # kubernetes.io/tls-acme: "true" + tls: [] + # Secrets must be manually created in the namespace. + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + +centralsettlement-handler-rules: + ## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing. + ## Note: Ensure that you have configured the appropriated settlementModels (refer to the associated tagged release on https://github.com/mojaloop/postman for an example). See below more information on how to configure rule processing for Interchange Fees. + enabled: false + replicaCount: 1 + containers: + api: + image: + repository: mojaloop/central-settlement + tag: v13.2.0 + pullPolicy: IfNotPresent + command: '["node", "src/handlers/index.js", "h", "--rules"]' + service: + type: ClusterIP + ports: + api: + name: http-api + externalPort: 80 + internalPort: 3007 + annotations: {} + # This allows one to point the service to an external backend. + # This is useful for local development where one wishes to hijack + # the communication from the service to the node layer and point + # to a specific endpoint (IP, Port, etc). + external: + enabled: false + # 10.0.2.2 is the magic IP for the host on virtualbox's network + ip: 10.0.2.2 + ports: + api: + name: http-api + externalPort: 3007 + readinessProbe: + enabled: true + httpGet: + path: /v2/health + initialDelaySeconds: 60 + periodSeconds: 15 + livenessProbe: + enabled: true + httpGet: + path: /v2/health + initialDelaySeconds: 60 + periodSeconds: 15 + + ## Pod scheduling preferences. + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + affinity: {} + + ## Node labels for pod assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector + nodeSelector: {} + + ## Set toleration for scheduler + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] + + ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED + sidecar: + enabled: false + # image: + # repository: mojaloop/event-sidecar + # tag: v11.0.1 + # pullPolicy: IfNotPresent + # command: '["npm", "run", "start"]' + # service: + # internalPort: 4001 + # readinessProbe: + # enabled: true + # httpGet: + # path: /health + # initialDelaySeconds: 120 + # periodSeconds: 15 + # livenessProbe: + # enabled: true + # httpGet: + # path: /health + # initialDelaySeconds: 90 + # periodSeconds: 15 + # config: + # event_log_grpc_host: localhost + # event_log_grpc_port: 50051 + # event_log_filter: 'audit:*, log:info, log:warn, log:error' + # event_log_metadata_only: true + # log_level: info + # log_filter: 'error, warn, info' + + ## metric configuration for prometheus instrumentation + metrics: + ## flag to enable/disable the metrics end-points + enabled: false + config: + timeout: 5000 + prefix: moja_ + defaultLabels: + serviceName: central-settlement-handler-rules + + config: + ## Kafka Configuration + # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used. + kafka_host: '$release_name-kafka' + kafka_port: 9092 + kafka: + consumer: + notification: + close: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + event: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + deferredsettlement: + close: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + producer: + notification: + event: + config: + options: + messageCharset: 'utf8' + rdkafkaConf: + event_cb: true + compression_codec: 'none' + retry_backoff_ms: 100 + message_send_max_retries: 2 + socket_keepalive_enable: true + batch_num_messages: 100 + dr_cb: false + socket_blocking_max_ms: 1 + queue_buffering_max_ms: 1 + broker_version_fallback: '0.10.1.0' + api_version_request: true + topicConf: + request_required_acks: 'all' + partitioner: 'murmur2_random' + deferredsettlement: + close: + config: + options: + messageCharset: 'utf8' + rdkafkaConf: + event_cb: true + dr_cb: true + socket_keepalive_enable: true + topicConf: + request_required_acks: "all" + partitioner: 'murmur2_random' + ## DB Configuration + # db_type can either be 'postgres' or 'mysql'. Ensure the correct DB is enabled and configured below: postgresql.enabled or mysql.enabled + db_type: 'mysql' + # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set. + db_driver: 'mysql' + db_host: '$release_name-centralledger-mysql' + db_port: 3306 + db_user: central_ledger + db_password: oyMxgZChuu + db_database: central_ledger + db_connection_pool_min: 10 + db_connection_pool_max: 30 + db_acquire_timeout_millis: 30000 + db_create_timeout_millis: 30000 + db_destroy_timeout_millis: 5000 + db_idle_timeout_millis: 30000 + db_reap_interval_millis: 1000 + db_create_retry_interval_millis: 200 + db_debug: false + # Api Handler Configuration + handlers: + disabled: false + api: + disabled: false + # Settlement Window aggregation Configuration + window_aggregation: + retry_count: 3 + retry_interval: 3000 + hub_participant: + id: 1 + name: Hub log_level: info log_transport: file @@ -851,8 +1135,11 @@ centralsettlement-handler-transfersettlement: const payeeFspId = transfer.payee.partyIdInfo.fspId if ((payeeFspId !== payerFspId) && - (getExtensionValue(transfer.payee.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet' && - getExtensionValue(transfer.payer.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet') && + (transfer.payee.partyIdInfo.extensionList && // WORKAROUND for issue #2149 + transfer.payer.partyIdInfo.extensionList && // WORKAROUND for issue #2149 + transfer.payee.partyIdInfo.extensionList.extension && // WORKAROUND for issue #2149 + transfer.payer.partyIdInfo.extensionList.extension) && // WORKAROUND for issue #2149 (getExtensionValue(transfer.payee.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet' && + getExtensionValue(transfer.payer.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet') && (transfer.transactionType.scenario === 'TRANSFER' && transfer.transactionType.initiator === 'PAYER' && transfer.transactionType.initiatorType === 'CONSUMER')) { @@ -907,7 +1194,7 @@ centralsettlement-handler-transfersettlement: api: / # Used to create an Ingress record. hosts: - api: central-settlement-transfersettlement.local + api: central-settlement-rules.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' diff --git a/emailnotifier/Chart.yaml b/emailnotifier/Chart.yaml index 3160bf861..4c3d8ab09 100644 --- a/emailnotifier/Chart.yaml +++ b/emailnotifier/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Email Notifier For Mojaloop name: emailnotifier -version: 11.0.1 -appVersion: "11.0.0" +version: 11.0.2 +appVersion: "11.0.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/emailnotifier/configs/default.json b/emailnotifier/configs/default.json index d9949ddc9..86e92fa9e 100644 --- a/emailnotifier/configs/default.json +++ b/emailnotifier/configs/default.json @@ -55,7 +55,8 @@ "enable.auto.commit": false, "auto.commit.interval.ms": 200, "socket.keepalive.enable": true, - "socket.max.fails": 1 + "socket.max.fails": 1, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/emailnotifier/values.yaml b/emailnotifier/values.yaml index b803e9b37..bff5fb50d 100644 --- a/emailnotifier/values.yaml +++ b/emailnotifier/values.yaml @@ -9,7 +9,7 @@ global: {} replicaCount: 1 image: repository: mojaloop/email-notifier - tag: v11.0.0 + tag: v11.0.2 pullPolicy: IfNotPresent ## Pod scheduling preferences. @@ -123,7 +123,7 @@ config: ciphers: 'SSLv3' PORT: 3081 hub_participant: - name: hub + name: Hub log_level: info log_transport: file diff --git a/eventstreamprocessor/configs/default.json b/eventstreamprocessor/configs/default.json index a308eca82..c83a32bae 100644 --- a/eventstreamprocessor/configs/default.json +++ b/eventstreamprocessor/configs/default.json @@ -78,7 +78,8 @@ "enable.auto.commit": false, "auto.commit.interval.ms": 200, "socket.keepalive.enable": true, - "socket.max.fails": 1 + "socket.max.fails": 1, + "allow.auto.create.topics": true }, "topicConf": { "auto.offset.reset": "earliest" diff --git a/finance-portal/Chart.yaml b/finance-portal/Chart.yaml index 831d40160..861d2b5c7 100644 --- a/finance-portal/Chart.yaml +++ b/finance-portal/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 description: "Finance portal service" name: finance-portal -version: 11.0.1 -appVersion: "finance-portal-ui: v10.4.3; finance-portal-backend-service: v12.0.0" +version: 11.0.2 +appVersion: "finance-portal-ui: v10.4.3; finance-portal-backend-service: v15.0.2" diff --git a/finance-portal/values.yaml b/finance-portal/values.yaml index f8635c034..b7afcb978 100644 --- a/finance-portal/values.yaml +++ b/finance-portal/values.yaml @@ -155,14 +155,14 @@ backend: port: 3000 image: repository: mojaloop/finance-portal-backend-service - tag: v12.0.0 + tag: v15.0.2 pullPolicy: IfNotPresent port: 3000 init: enabled: true image: repository: mojaloop/finance-portal-backend-service - tag: v12.0.0 + tag: v15.0.2 pullPolicy: IfNotPresent env: 'dev' ingress: diff --git a/ml-api-adapter/Chart.yaml b/ml-api-adapter/Chart.yaml index b65589336..d6a88fc13 100644 --- a/ml-api-adapter/Chart.yaml +++ b/ml-api-adapter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: ml-api-adapter Helm chart for Kubernetes name: ml-api-adapter -version: 11.0.1 -appVersion: "11.1.4" +version: 11.0.2 +appVersion: "11.1.6" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-api-adapter/chart-handler-notification/Chart.yaml b/ml-api-adapter/chart-handler-notification/Chart.yaml index 13703620d..e2971edeb 100644 --- a/ml-api-adapter/chart-handler-notification/Chart.yaml +++ b/ml-api-adapter/chart-handler-notification/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: ml-api-adapter Handler for Notifications component Helm chart for Kubernetes name: ml-api-adapter-handler-notification -version: 11.0.1 -appVersion: "11.1.4" +version: 11.0.2 +appVersion: "11.1.6" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index a42a83297..cb985bd04 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/ml-api-adapter - tag: v11.1.4 + tag: v11.1.6 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -30,7 +30,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: diff --git a/ml-api-adapter/chart-service/Chart.yaml b/ml-api-adapter/chart-service/Chart.yaml index aac8a9142..382325577 100644 --- a/ml-api-adapter/chart-service/Chart.yaml +++ b/ml-api-adapter/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: ml-api-adapter API component Helm chart for Kubernetes name: ml-api-adapter-service -version: 11.0.1 -appVersion: "11.1.4" +version: 11.0.2 +appVersion: "11.1.6" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index 42a09cbb1..407b8d220 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/ml-api-adapter - tag: v11.1.4 + tag: v11.1.6 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -30,7 +30,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: diff --git a/ml-api-adapter/requirements.yaml b/ml-api-adapter/requirements.yaml index 006a8b6c1..b135ff315 100644 --- a/ml-api-adapter/requirements.yaml +++ b/ml-api-adapter/requirements.yaml @@ -1,11 +1,11 @@ # requirements.yaml dependencies: - name: ml-api-adapter-service - version: 11.0.1 + version: 11.0.2 repository: "file://./chart-service" condition: ml-api-adapter-service.enabled - name: ml-api-adapter-handler-notification - version: 11.0.1 + version: 11.0.2 repository: "file://./chart-handler-notification" condition: ml-api-adapter-handler-notification.enabled ## This is used for testing ml-api-adapter deployments diff --git a/ml-api-adapter/values.yaml b/ml-api-adapter/values.yaml index e77f1383c..17263bf4d 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -13,7 +13,7 @@ ml-api-adapter-service: replicaCount: 1 image: repository: mojaloop/ml-api-adapter - tag: v11.1.4 + tag: v11.1.6 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -39,7 +39,7 @@ ml-api-adapter-service: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -171,7 +171,7 @@ ml-api-adapter-handler-notification: replicaCount: 1 image: repository: mojaloop/ml-api-adapter - tag: v11.1.4 + tag: v11.1.6 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -197,7 +197,7 @@ ml-api-adapter-handler-notification: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true diff --git a/ml-testing-toolkit-cli/Chart.yaml b/ml-testing-toolkit-cli/Chart.yaml index 8b125acb6..f1db59471 100644 --- a/ml-testing-toolkit-cli/Chart.yaml +++ b/ml-testing-toolkit-cli/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: ml-testing-toolkit-cli Helm chart for Kubernetes name: ml-testing-toolkit-cli -version: 12.0.1 -appVersion: "11.12.0" +version: 12.1.0 +appVersion: "12.4.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit-cli/values.yaml b/ml-testing-toolkit-cli/values.yaml index 1d3fac82b..81786b64e 100644 --- a/ml-testing-toolkit-cli/values.yaml +++ b/ml-testing-toolkit-cli/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/ml-testing-toolkit - tag: v11.12.0 + tag: v12.4.2 ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. ## ref: https://kubernetes.io/docs/concepts/containers/images/#specifying-imagepullsecrets-on-a-pod diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index db1e72022..36e431029 100644 --- a/ml-testing-toolkit/Chart.yaml +++ b/ml-testing-toolkit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: ml-testing-toolkit Helm chart for Kubernetes name: ml-testing-toolkit version: 12.1.0 -appVersion: "ml-testing-toolkit: v12.0.2 ml-testing-toolkit-ui: v12.0.2" +appVersion: "ml-testing-toolkit: v12.4.2 ml-testing-toolkit-ui: v12.2.3" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index a7b00c243..abce16ab2 100644 --- a/ml-testing-toolkit/chart-backend/Chart.yaml +++ b/ml-testing-toolkit/chart-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: ml-testing-toolkit-backend Helm chart for Kubernetes name: ml-testing-toolkit-backend version: 12.1.0 -appVersion: "12.0.2" +appVersion: "12.4.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index 6ba21a6ae..b9551371c 100644 --- a/ml-testing-toolkit/chart-backend/values.yaml +++ b/ml-testing-toolkit/chart-backend/values.yaml @@ -32,7 +32,7 @@ dependencies: replicaCount: 1 image: repository: mojaloop/ml-testing-toolkit - tag: v12.0.2 + tag: v12.4.2 commandPersistence: '["sh", "-c", "cd /opt/mojaloop-testing-toolkit; if [ -d /opt/ttk-data ]; then if [ ! -d /opt/ttk-data/spec_files ]; then if [ -f /opt/default_config/user_config.json ]; then cp /opt/default_config/user_config.json spec_files; fi; if [ -f /opt/default_config/system_config.json ]; then cp /opt/default_config/system_config.json spec_files; fi; cp -pR spec_files /opt/ttk-data/spec_files; fi; mv spec_files spec_files_default; ln -s /opt/ttk-data/spec_files spec_files; else if [ -f /opt/default_config/user_config.json ]; then cp /opt/default_config/user_config.json spec_files; fi; if [ -f /opt/default_config/system_config.json ]; then cp /opt/default_config/system_config.json spec_files; fi; fi; npm run start;"]' command: '["sh", "-c", "cd /opt/mojaloop-testing-toolkit; if [ -f /opt/default_config/user_config.json ]; then cp /opt/default_config/user_config.json spec_files; fi; if [ -f /opt/default_config/system_config.json ]; then cp /opt/default_config/system_config.json spec_files; fi; npm run start;"]' @@ -124,7 +124,9 @@ config: "OUTBOUND_MUTUAL_TLS_ENABLED": false, "CLIENT_MUTUAL_TLS_ENABLED": false, "ADVANCED_FEATURES_ENABLED": true, - "CALLBACK_TIMEOUT": 10000, + "CALLBACK_TIMEOUT": 20000, + "DEFAULT_REQUEST_TIMEOUT": 5000, + "SCRIPT_TIMEOUT": 5000, "LOG_SERVER_UI_URL": "http://log-server-url.demo", "UI_CONFIGURATION": { "MOBILE_SIMULATOR": { @@ -141,6 +143,7 @@ config: "GITHUB_CONFIG": { "TEST_CASES_REPO_OWNER": "mojaloop", "TEST_CASES_REPO_NAME": "testing-toolkit-test-cases", + "TEST_CASES_REPO_DEFAULT_RELEASE_TAG": "latest", "TEST_CASES_REPO_BASE_PATH": "collections/hub", "TEST_CASES_REPO_HUB_GP_PATH": "collections/hub/golden_path", "TEST_CASES_REPO_HUB_PROVISIONING_PATH": "collections/hub/provisioning" @@ -195,6 +198,12 @@ config: "HUB_USERNAME": "hub", "HUB_PASSWORD": "hub" }, + "HTTP_CLIENT": { + "KEEP_ALIVE": true, + "MAX_SOCKETS": 50, + "UNUSED_AGENTS_EXPIRY_MS": 1800000, + "UNUSED_AGENTS_CHECK_TIMER_MS": 300000 + }, "API_DEFINITIONS": [ { "type": "fspiop", @@ -298,4 +307,4 @@ persistence: accessMode: ReadWriteOnce size: 1Gi - \ No newline at end of file + diff --git a/ml-testing-toolkit/chart-frontend/Chart.yaml b/ml-testing-toolkit/chart-frontend/Chart.yaml index 670551c06..c51aaadb3 100644 --- a/ml-testing-toolkit/chart-frontend/Chart.yaml +++ b/ml-testing-toolkit/chart-frontend/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: ml-testing-toolkit-frontend Helm chart for Kubernetes name: ml-testing-toolkit-frontend -version: 11.1.0 -appVersion: "12.0.2" +version: 12.1.0 +appVersion: "12.2.3" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-frontend/values.yaml b/ml-testing-toolkit/chart-frontend/values.yaml index 785ec29e4..cec1752bb 100644 --- a/ml-testing-toolkit/chart-frontend/values.yaml +++ b/ml-testing-toolkit/chart-frontend/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/ml-testing-toolkit-ui - tag: v12.0.2 + tag: v12.2.3 command: '["sh", "/usr/share/nginx/start.sh"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/ml-testing-toolkit/requirements.yaml b/ml-testing-toolkit/requirements.yaml index d421d46bf..39b35b6bc 100644 --- a/ml-testing-toolkit/requirements.yaml +++ b/ml-testing-toolkit/requirements.yaml @@ -1,7 +1,7 @@ # requirements.yaml dependencies: - name: ml-testing-toolkit-frontend - version: 11.1.0 + version: 12.1.0 repository: "file://./chart-frontend" condition: ml-testing-toolkit-frontend.enabled - name: ml-testing-toolkit-backend diff --git a/mojaloop-bulk/Chart.yaml b/mojaloop-bulk/Chart.yaml index d669b88a7..43872d01c 100644 --- a/mojaloop-bulk/Chart.yaml +++ b/mojaloop-bulk/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Mojaloop Bulk Helm chart for Kubernetes name: mojaloop-bulk -version: 12.0.1 -appVersion: "bulk-api-adapter: v11.1.0; central-ledger: v13.2.5" +version: 12.1.0 +appVersion: "bulk-api-adapter: v11.1.4; central-ledger: v13.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/mojaloop-bulk/requirements.yaml b/mojaloop-bulk/requirements.yaml index 940540d8e..2f5022404 100644 --- a/mojaloop-bulk/requirements.yaml +++ b/mojaloop-bulk/requirements.yaml @@ -1,11 +1,11 @@ # requirements.yaml dependencies: - name: bulk-api-adapter - version: 11.0.1 + version: 11.0.2 repository: "file://../bulk-api-adapter" condition: bulk-api-adapter.enabled - name: bulk-centralledger - version: 12.0.1 + version: 12.1.0 repository: "file://../bulk-centralledger" condition: bulk-centralledger.enabled - name: mongodb diff --git a/mojaloop-bulk/values.yaml b/mojaloop-bulk/values.yaml index 22550fd4e..1ab90d931 100644 --- a/mojaloop-bulk/values.yaml +++ b/mojaloop-bulk/values.yaml @@ -13,7 +13,7 @@ bulk-api-adapter: replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -132,7 +132,7 @@ bulk-api-adapter: replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -255,7 +255,7 @@ bulk-centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprepare"]' service: @@ -428,7 +428,7 @@ bulk-centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkfulfil"]' service: @@ -598,7 +598,7 @@ bulk-centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprocessing"]' service: @@ -768,7 +768,7 @@ bulk-centralledger: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkget"]' service: diff --git a/mojaloop-simulator/Chart.yaml b/mojaloop-simulator/Chart.yaml index 0fa26280d..1a571942d 100644 --- a/mojaloop-simulator/Chart.yaml +++ b/mojaloop-simulator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 description: "Helm Chart for the Mojaloop (SDK-based) Simulator" name: mojaloop-simulator -version: 11.4.0 -appVersion: "sdk-scheme-adapter: v11.16.0; mojaloop-simulator: v11.4.1" +version: 12.0.0 +appVersion: "sdk-scheme-adapter: v11.17.1; mojaloop-simulator: v11.4.3" diff --git a/mojaloop-simulator/templates/config-jws-public-keys.yaml b/mojaloop-simulator/templates/config-jws-public-keys.yaml index fdac8fdbf..479aeb32e 100644 --- a/mojaloop-simulator/templates/config-jws-public-keys.yaml +++ b/mojaloop-simulator/templates/config-jws-public-keys.yaml @@ -4,12 +4,12 @@ kind: ConfigMap metadata: name: {{ include "mojaloop-simulator.prefix" . }}jws-public-keys labels: - app.kubernetes.io/name: {{ include "mojaloop-simulator.prefix" . }}jws-public-keys + app.kubernetes.io/name: sim-jws-public-keys {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} data: {{- range $name, $customConfig := .Values.simulators }} {{- $config := merge $customConfig $.Values.defaults }} - {{- if and ($config.config.schemeAdapter.env.VALIDATE_INBOUND_JWS) (not $config.config.schemeAdapter.secrets.jws.pubKeyConfigMapName) }} + {{- if and (eq ($config.config.schemeAdapter.env.VALIDATE_INBOUND_JWS|toString|lower) "true") (not $config.config.schemeAdapter.secrets.jws.pubKeyConfigMapName) }} {{- if (not $config.config.schemeAdapter.secrets.jws.publicKey) }} {{- fail (printf "INBOUND_JWS enabled and jws public key not specified for '%s'. You need to specify %s.schemeAdapter.secrets.jws.publicKey or %s.schemeAdapter.secrets.jws.pubKeyConfigMapName." $name $name $name) }} {{- end }} diff --git a/mojaloop-simulator/templates/config-rules.yaml b/mojaloop-simulator/templates/config-rules.yaml index 66085d557..5a472ad26 100644 --- a/mojaloop-simulator/templates/config-rules.yaml +++ b/mojaloop-simulator/templates/config-rules.yaml @@ -6,7 +6,7 @@ kind: ConfigMap metadata: name: {{ $fullName }}-rules labels: - app.kubernetes.io/name: {{ $fullName }}-rules + app.kubernetes.io/name: sim-{{ $name }}-rules {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} data: rules.json: {{ $config.config.backend.rules | quote }} diff --git a/mojaloop-simulator/templates/deployment.yaml b/mojaloop-simulator/templates/deployment.yaml index 09055371f..2f866ef40 100644 --- a/mojaloop-simulator/templates/deployment.yaml +++ b/mojaloop-simulator/templates/deployment.yaml @@ -9,18 +9,18 @@ kind: Deployment metadata: name: {{ $fullName }}-scheme-adapter labels: - app.kubernetes.io/name: {{ $fullName }}-scheme-adapter + app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: replicas: {{ $config.replicaCount }} selector: matchLabels: - app.kubernetes.io/name: {{ $fullName }}-scheme-adapter - {{- include "mojaloop-simulator.common-labels" $ | nindent 6 }} + app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter + app.kubernetes.io/instance: {{ $releaseName }} template: metadata: labels: - app.kubernetes.io/name: {{ $fullName }}-scheme-adapter + app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter {{- include "mojaloop-simulator.common-labels" $ | nindent 8 }} spec: volumes: @@ -134,18 +134,18 @@ kind: Deployment metadata: name: {{ $fullName }}-backend labels: - app.kubernetes.io/name: {{ $fullName }}-backend + app.kubernetes.io/name: sim-{{ $name }}-backend {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: replicas: {{ $config.replicaCount }} selector: matchLabels: - app.kubernetes.io/name: {{ $fullName }}-backend - {{- include "mojaloop-simulator.common-labels" $ | nindent 6 }} + app.kubernetes.io/name: sim-{{ $name }}-backend + app.kubernetes.io/instance: {{ $releaseName }} template: metadata: labels: - app.kubernetes.io/name: {{ $fullName }}-backend + app.kubernetes.io/name: sim-{{ $name }}-backend {{- include "mojaloop-simulator.common-labels" $ | nindent 8 }} spec: initContainers: @@ -219,18 +219,18 @@ kind: Deployment metadata: name: {{ $fullName }}-cache labels: - app.kubernetes.io/name: {{ $fullName }}-cache + app.kubernetes.io/name: sim-{{ $name }}-cache {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: replicas: {{ $config.replicaCount }} selector: matchLabels: - app.kubernetes.io/name: {{ $fullName }}-cache - {{- include "mojaloop-simulator.common-labels" $ | nindent 6 }} + app.kubernetes.io/name: sim-{{ $name }}-cache + app.kubernetes.io/instance: {{ $releaseName }} template: metadata: labels: - app.kubernetes.io/name: {{ $fullName }}-cache + app.kubernetes.io/name: sim-{{ $name }}-cache {{- include "mojaloop-simulator.common-labels" $ | nindent 8 }} spec: initContainers: diff --git a/mojaloop-simulator/templates/horizontalpodautoscaler.yaml b/mojaloop-simulator/templates/horizontalpodautoscaler.yaml index 16e58bbef..90607bea3 100644 --- a/mojaloop-simulator/templates/horizontalpodautoscaler.yaml +++ b/mojaloop-simulator/templates/horizontalpodautoscaler.yaml @@ -7,7 +7,7 @@ kind: HorizontalPodAutoscaler metadata: name: {{ $fullName }}-scheme-adapter labels: - app.kubernetes.io/name: {{ $fullName }}-scheme-adapter + app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: scaleTargetRef: diff --git a/mojaloop-simulator/templates/secret.yaml b/mojaloop-simulator/templates/secret.yaml index 3c2e531fa..da2c82f8d 100644 --- a/mojaloop-simulator/templates/secret.yaml +++ b/mojaloop-simulator/templates/secret.yaml @@ -8,7 +8,7 @@ kind: Secret metadata: name: {{ $fullName }}-jws-priv-key labels: - app.kubernetes.io/name: {{ $fullName }}-jws-priv-key + app.kubernetes.io/name: sim-{{ $name }}-jws-priv-key {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} data: # Note that due to a bug with helm 2.9.1 the `required` function in combination with a missing @@ -25,7 +25,7 @@ kind: Secret metadata: name: {{ $fullName }}-tls-creds labels: - app.kubernetes.io/name: {{ $fullName }}-tls-creds + app.kubernetes.io/name: sim-{{ $name }}-tls-creds {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} data: {{- $defaultCert := genSignedCert (printf "%s-scheme-adapter" $fullName) nil nil 3650 $ca }} diff --git a/mojaloop-simulator/templates/service.yaml b/mojaloop-simulator/templates/service.yaml index 60856a057..4177c0edd 100644 --- a/mojaloop-simulator/templates/service.yaml +++ b/mojaloop-simulator/templates/service.yaml @@ -6,7 +6,7 @@ kind: Service metadata: name: {{ $fullName }}-backend labels: - app.kubernetes.io/name: {{ $fullName }}-backend + app.kubernetes.io/name: sim-{{ $name }}-backend {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: type: ClusterIP @@ -24,7 +24,7 @@ spec: name: testapi targetPort: testapi selector: - app.kubernetes.io/name: {{ $fullName }}-backend + app.kubernetes.io/name: sim-{{ $name }}-backend app.kubernetes.io/instance: {{ $.Release.Name }} --- apiVersion: v1 @@ -32,7 +32,7 @@ kind: Service metadata: name: {{ $fullName }}-scheme-adapter labels: - app.kubernetes.io/name: {{ $fullName }}-scheme-adapter + app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: type: ClusterIP @@ -52,7 +52,7 @@ spec: targetPort: testapi {{- end }} selector: - app.kubernetes.io/name: {{ $fullName }}-scheme-adapter + app.kubernetes.io/name: sim-{{ $name }}-scheme-adapter app.kubernetes.io/instance: {{ $.Release.Name }} --- {{- if $config.config.cache.enabled }} @@ -61,7 +61,7 @@ kind: Service metadata: name: {{ $fullName }}-cache labels: - app.kubernetes.io/name: {{ $fullName }}-cache + app.kubernetes.io/name: sim-{{ $name }}-cache {{- include "mojaloop-simulator.common-labels" $ | nindent 4 }} spec: type: ClusterIP @@ -71,7 +71,7 @@ spec: name: redis targetPort: redis selector: - app.kubernetes.io/name: {{ $fullName }}-cache + app.kubernetes.io/name: sim-{{ $name }}-cache app.kubernetes.io/instance: {{ $.Release.Name }} {{- end }} --- diff --git a/mojaloop-simulator/values.yaml b/mojaloop-simulator/values.yaml index 982c87f0d..d8c752e0a 100644 --- a/mojaloop-simulator/values.yaml +++ b/mojaloop-simulator/values.yaml @@ -121,14 +121,13 @@ ingress: # For more information see "Breaking changes" here: # https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0220 - annotations: - ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ - # nginx.ingress.kubernetes.io/rewrite-target: '/' - # nginx.ingress.kubernetes.io/rewrite-target: '/$2' - ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ - # kubernetes.io/ingress.class: nginx - ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego - # kubernetes.io/tls-acme: "true"" + ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ + # nginx.ingress.kubernetes.io/rewrite-target: '/' + # nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ + # kubernetes.io/ingress.class: nginx + ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego + # kubernetes.io/tls-acme: "true"" ## nginx ingress controller >= v0.22.0 # annotations: @@ -255,7 +254,7 @@ defaults: &defaults publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v11.16.0 + tag: v11.17.1 pullPolicy: IfNotPresent <<: *defaultProbes @@ -421,7 +420,7 @@ defaults: &defaults backend: image: repository: mojaloop/mojaloop-simulator - tag: v11.4.1 + tag: v11.4.3 pullPolicy: IfNotPresent <<: *defaultProbes diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index 125629e28..9c0bbc663 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Mojaloop Helm chart for Kubernetes name: mojaloop -version: 12.1.0 -appVersion: "ml-api-adapter: v11.1.4; central-ledger: v13.2.5; account-lookup-service: v11.3.2; quoting-service: v11.2.2; central-settlement: v12.0.3; central-event-processor: v11.0.1; bulk-api-adapter: v11.1.0; email-notifier: v11.0.0; als-oracle-pathfinder: v11.0.0; transaction-requests-service: v11.1.4; finance-portal-ui: v10.4.3; finance-portal-backend-service: v12.0.0; settlement-management: v11.0.0; operator-settlement: v11.0.0; simulator: v11.1.0; mojaloop-simulator: v11.4.1; sdk-scheme-adapter: v11.16.0; ml-testing-toolkit: v12.0.2; ml-testing-toolkit-ui: v12.0.2;" +version: 13.0.0 +appVersion: "ml-api-adapter: v11.1.6; central-ledger: v13.12.1; account-lookup-service: v11.5.3; quoting-service: v12.0.6; central-settlement: v13.2.0; central-event-processor: v11.0.2; bulk-api-adapter: v11.1.4; email-notifier: v11.0.2; als-oracle-pathfinder: v11.0.0; transaction-requests-service: v11.1.5; finance-portal-ui: v10.4.3; finance-portal-backend-service: v15.0.2; settlement-management: v11.0.0; operator-settlement: v11.0.0; simulator: v11.1.2; mojaloop-simulator: v11.4.3; sdk-scheme-adapter: v11.17.1; ml-testing-toolkit: v12.4.2; ml-testing-toolkit-ui: v12.2.3;" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/mojaloop/requirements.yaml b/mojaloop/requirements.yaml index 453704ddf..c10a11835 100644 --- a/mojaloop/requirements.yaml +++ b/mojaloop/requirements.yaml @@ -1,11 +1,11 @@ # requirements.yaml dependencies: - name: central - version: 12.0.1 + version: 13.0.0 repository: "file://../central" condition: central.enabled - name: ml-api-adapter - version: 11.0.1 + version: 11.0.2 repository: "file://../ml-api-adapter" condition: ml-api-adapter.enabled - name: account-lookup-service @@ -13,27 +13,27 @@ dependencies: repository: "file://../account-lookup-service" condition: account-lookup-service.enabled - name: quoting-service - version: 11.1.0 + version: 12.0.0 repository: "file://../quoting-service" condition: quoting-service.enabled - name: simulator - version: 11.0.1 + version: 11.0.2 repository: "file://../simulator" condition: simulator.enabled - name: mojaloop-simulator - version: 11.4.0 + version: 12.0.0 repository: "file://../mojaloop-simulator" condition: mojaloop-simulator.enabled - name: mojaloop-bulk - version: 12.0.1 + version: 12.1.0 repository: "file://../mojaloop-bulk" condition: mojaloop-bulk.enabled - name: transaction-requests-service - version: 11.0.1 + version: 11.0.2 repository: "file://../transaction-requests-service" condition: transaction-requests-service.enabled - name: finance-portal - version: 11.0.1 + version: 11.0.2 repository: "file://../finance-portal" condtion: finance-portal.enabled - name: finance-portal-settlement-management @@ -41,7 +41,7 @@ dependencies: repository: "file://../finance-portal-settlement-management" condition: finance-portal-settlement-management.enabled - name: emailnotifier - version: 11.0.1 + version: 11.0.2 repository: "file://../emailnotifier" condition: emailnotifier.enabled - name: ml-testing-toolkit @@ -50,26 +50,26 @@ dependencies: condition: ml-testing-toolkit.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-setup - version: 12.0.1 + version: 12.1.0 repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-setup.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-validation - version: 12.0.1 + version: 12.1.0 repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-validation.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-posthook-setup - version: 12.0.1 + version: 12.1.0 repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-posthook-setup.postInstallHook.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-posthook-tests - version: 12.0.1 + version: 12.1.0 repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-posthook-tests.postInstallHook.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-cronjob-tests - version: 12.0.1 + version: 12.1.0 repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-cronjob-tests.scheduling.enabled diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 459b17aaf..e276e771e 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -25,7 +25,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -63,7 +63,7 @@ central: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -212,7 +212,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--prepare"]' service: @@ -250,7 +250,7 @@ central: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -410,7 +410,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--admin"]' service: @@ -448,7 +448,7 @@ central: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -605,7 +605,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--position"]' service: @@ -643,7 +643,7 @@ central: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -800,7 +800,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--get"]' service: @@ -838,7 +838,7 @@ central: enabled: false image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -995,7 +995,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--fulfil"]' service: @@ -1033,7 +1033,7 @@ central: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -1190,7 +1190,7 @@ central: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--timeout"]' service: @@ -1228,7 +1228,7 @@ central: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -1624,7 +1624,7 @@ central: "offsets.topic.replication.factor": 1 "default.replication.factor": 1 # "auto.leader.rebalance.enable": true - # "auto.create.topics.enable": true + "auto.create.topics.enable": true # "controlled.shutdown.enable": true # "controlled.shutdown.max.retries": 100 @@ -1824,7 +1824,7 @@ central: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -1877,7 +1877,7 @@ central: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -1946,7 +1946,7 @@ central: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -1981,7 +1981,7 @@ central: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -2023,7 +2023,7 @@ central: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -2093,7 +2093,7 @@ central: # cpu: 100m # memory: 128Mi - centralsettlement-handler-settlementwindow: + centralsettlement-handler-deferredsettlement: enabled: true replicaCount: 1 @@ -2101,9 +2101,9 @@ central: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--settlementwindow"]' + command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' service: type: ClusterIP ports: @@ -2154,7 +2154,7 @@ central: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -2187,7 +2187,7 @@ central: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-settlement-handler-settlementwindow + serviceName: central-settlement-handler-deferredsettlement config: ## Kafka Configuration @@ -2223,7 +2223,7 @@ central: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -2258,7 +2258,7 @@ central: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -2300,7 +2300,7 @@ central: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub log_level: info log_transport: file @@ -2350,7 +2350,7 @@ central: api: / # Used to create an Ingress record. hosts: - api: central-settlement-settlementwindow.local + api: central-settlement-deferredsettlement.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' @@ -2376,19 +2376,18 @@ central: # cpu: 100m # memory: 128Mi - centralsettlement-handler-transfersettlement: - ## FOR_CGS + centralsettlement-handler-grosssettlement: ## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing. ## Note: Ensure that you have configured the appropriated settlementModels (refer to the associated tagged release on https://github.com/mojaloop/postman for an example). See below more information on how to configure rule processing for Interchange Fees. - enabled: false + enabled: true replicaCount: 1 containers: api: image: repository: mojaloop/central-settlement - tag: v12.0.3 + tag: v13.2.0 pullPolicy: IfNotPresent - command: '["node", "src/handlers/index.js", "h", "--transfersettlement"]' + command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: type: ClusterIP ports: @@ -2439,7 +2438,7 @@ central: enabled: false # image: # repository: mojaloop/event-sidecar - # tag: v11.0.0 + # tag: v11.0.1 # pullPolicy: IfNotPresent # command: '["npm", "run", "start"]' # service: @@ -2472,7 +2471,7 @@ central: timeout: 5000 prefix: moja_ defaultLabels: - serviceName: central-settlement-handler-transfersettlement + serviceName: central-settlement-handler-grosssettlement config: ## Kafka Configuration @@ -2508,7 +2507,7 @@ central: consumeTimeout: 1000 rdkafkaConf: socket_keepalive_enable: true - settlementwindow: + deferredsettlement: close: config: options: @@ -2543,7 +2542,7 @@ central: topicConf: request_required_acks: 'all' partitioner: 'murmur2_random' - settlementwindow: + deferredsettlement: close: config: options: @@ -2585,7 +2584,291 @@ central: retry_interval: 3000 hub_participant: id: 1 - name: hub + name: Hub + log_level: info + log_transport: file + + error_handling: + include_cause_extension: false + truncate_extensions: true + + init: + enabled: true + mysql: + name: wait-for-mysql + repository: mysql + tag: latest + pullPolicy: IfNotPresent + command: "until result=$(mysql -h $db_host -P $db_port -u $db_user --password=$db_password $db_database -ss -N -e 'select is_locked from migration_lock;') && eval 'echo is_locked=$result' && if [ -z $result ]; then false; fi && if [ $result -ne 0 ]; then false; fi; do echo waiting for MySQL; sleep 2; done;" + kafka: + name: wait-for-kafka + repository: solsson/kafka + tag: latest + pullPolicy: IfNotPresent + command: "until ./bin/kafka-broker-api-versions.sh --bootstrap-server $kafka_host:$kafka_port; do echo waiting for Kafka; sleep 2; done;" + env: {} + service: + type: ClusterIP + ports: + api: + name: http-api + externalPort: 80 + internalPort: 3007 + annotations: {} + + # This allows one to point the service to an external backend. + # This is useful for local development where one wishes to hijack + # the communication from the service to the node layer and point + # to a specific endpoint (IP, Port, etc). + external: + enabled: false + # 10.0.2.2 is the magic IP for the host on virtualbox's network + ip: 10.0.2.2 + ports: + api: + name: http-api + externalPort: 3007 + ingress: + enabled: false + externalPath: + api: / + # Used to create an Ingress record. + hosts: + api: central-settlement-rules.local + annotations: {} + ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ + # nginx.ingress.kubernetes.io/rewrite-target: '/' + # nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ + # kubernetes.io/ingress.class: nginx + ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego + # kubernetes.io/tls-acme: "true" + tls: [] + # Secrets must be manually created in the namespace. + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: + # cpu: 100m + # memory: 128Mi + + centralsettlement-handler-rules: + ## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing. + ## Note: Ensure that you have configured the appropriated settlementModels (refer to the associated tagged release on https://github.com/mojaloop/postman for an example). See below more information on how to configure rule processing for Interchange Fees. + enabled: true + replicaCount: 1 + containers: + api: + image: + repository: mojaloop/central-settlement + tag: v13.2.0 + pullPolicy: IfNotPresent + command: '["node", "src/handlers/index.js", "h", "--rules"]' + service: + type: ClusterIP + ports: + api: + name: http-api + externalPort: 80 + internalPort: 3007 + annotations: {} + # This allows one to point the service to an external backend. + # This is useful for local development where one wishes to hijack + # the communication from the service to the node layer and point + # to a specific endpoint (IP, Port, etc). + external: + enabled: false + # 10.0.2.2 is the magic IP for the host on virtualbox's network + ip: 10.0.2.2 + ports: + api: + name: http-api + externalPort: 3007 + readinessProbe: + enabled: true + httpGet: + path: /v2/health + initialDelaySeconds: 60 + periodSeconds: 15 + livenessProbe: + enabled: true + httpGet: + path: /v2/health + initialDelaySeconds: 60 + periodSeconds: 15 + + ## Pod scheduling preferences. + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + affinity: {} + + ## Node labels for pod assignment + ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector + nodeSelector: {} + + ## Set toleration for scheduler + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + tolerations: [] + + ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED + sidecar: + enabled: false + # image: + # repository: mojaloop/event-sidecar + # tag: v11.0.1 + # pullPolicy: IfNotPresent + # command: '["npm", "run", "start"]' + # service: + # internalPort: 4001 + # readinessProbe: + # enabled: true + # httpGet: + # path: /health + # initialDelaySeconds: 120 + # periodSeconds: 15 + # livenessProbe: + # enabled: true + # httpGet: + # path: /health + # initialDelaySeconds: 90 + # periodSeconds: 15 + # config: + # event_log_grpc_host: localhost + # event_log_grpc_port: 50051 + # event_log_filter: 'audit:*, log:info, log:warn, log:error' + # event_log_metadata_only: true + # log_level: info + # log_filter: 'error, warn, info' + + ## metric configuration for prometheus instrumentation + metrics: + ## flag to enable/disable the metrics end-points + enabled: false + config: + timeout: 5000 + prefix: moja_ + defaultLabels: + serviceName: central-settlement-handler-rules + + config: + ## Kafka Configuration + # this can be set if the dependency chart for kafka is disabled. If 'kafka_host' is commented out, then the name of the dependency chart will be used. + kafka_host: '$release_name-kafka' + kafka_port: 9092 + kafka: + consumer: + notification: + close: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + event: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + deferredsettlement: + close: + config: + options: + mode: 2 + batchSize: 1 + pollFrequency: 10 + recursiveTimeout: 100 + messageCharset: 'utf8' + messageAsJSON: true + sync: true + consumeTimeout: 1000 + rdkafkaConf: + socket_keepalive_enable: true + producer: + notification: + event: + config: + options: + messageCharset: 'utf8' + rdkafkaConf: + event_cb: true + compression_codec: 'none' + retry_backoff_ms: 100 + message_send_max_retries: 2 + socket_keepalive_enable: true + batch_num_messages: 100 + dr_cb: false + socket_blocking_max_ms: 1 + queue_buffering_max_ms: 1 + broker_version_fallback: '0.10.1.0' + api_version_request: true + topicConf: + request_required_acks: 'all' + partitioner: 'murmur2_random' + deferredsettlement: + close: + config: + options: + messageCharset: 'utf8' + rdkafkaConf: + event_cb: true + dr_cb: true + socket_keepalive_enable: true + topicConf: + request_required_acks: "all" + partitioner: 'murmur2_random' + ## DB Configuration + # db_type can either be 'postgres' or 'mysql'. Ensure the correct DB is enabled and configured below: postgresql.enabled or mysql.enabled + db_type: 'mysql' + # db_driver can either be 'pg' or 'mysql'. Ensure the correct corresponding db_type above has been set. + db_driver: 'mysql' + db_host: '$release_name-centralledger-mysql' + db_port: 3306 + db_user: central_ledger + db_password: oyMxgZChuu + db_database: central_ledger + db_connection_pool_min: 10 + db_connection_pool_max: 30 + db_acquire_timeout_millis: 30000 + db_create_timeout_millis: 30000 + db_destroy_timeout_millis: 5000 + db_idle_timeout_millis: 30000 + db_reap_interval_millis: 1000 + db_create_retry_interval_millis: 200 + db_debug: false + # Api Handler Configuration + handlers: + disabled: false + api: + disabled: false + # Settlement Window aggregation Configuration + window_aggregation: + retry_count: 3 + retry_interval: 3000 + hub_participant: + id: 1 + name: Hub log_level: info log_transport: file @@ -2663,13 +2946,14 @@ central: log(JSON.stringify(transfer)) const payerFspId = transfer.payer.partyIdInfo.fspId const payeeFspId = transfer.payee.partyIdInfo.fspId + if ((payeeFspId !== payerFspId) && - (transfer.payee.partyIdInfo.extensionList && - transfer.payer.partyIdInfo.extensionList && - transfer.payee.partyIdInfo.extensionList.extension && - transfer.payer.partyIdInfo.extensionList.extension) && + (transfer.payee.partyIdInfo.extensionList && // WORKAROUND for issue #2149 + transfer.payer.partyIdInfo.extensionList && // WORKAROUND for issue #2149 + transfer.payee.partyIdInfo.extensionList.extension && // WORKAROUND for issue #2149 + transfer.payer.partyIdInfo.extensionList.extension) && // WORKAROUND for issue #2149 (getExtensionValue(transfer.payee.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet' && - getExtensionValue(transfer.payer.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet') && + getExtensionValue(transfer.payer.partyIdInfo.extensionList.extension, 'accountType') === 'Wallet') && (transfer.transactionType.scenario === 'TRANSFER' && transfer.transactionType.initiator === 'PAYER' && transfer.transactionType.initiatorType === 'CONSUMER')) { @@ -2724,7 +3008,7 @@ central: api: / # Used to create an Ingress record. hosts: - api: central-settlement-transfersettlement.local + api: central-settlement-grosssettlement.local annotations: {} ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ # nginx.ingress.kubernetes.io/rewrite-target: '/' @@ -2754,7 +3038,7 @@ central: replicaCount: 1 image: repository: mojaloop/central-event-processor - tag: v11.0.1 + tag: v11.0.2 pullPolicy: IfNotPresent init: enabled: true @@ -2862,7 +3146,7 @@ central: central_ledger_admin_host: '$release_name-centralledger-service' central_ledger_admin_port: 80 hub_participant: - name: hub + name: Hub log_level: info log_transport: file @@ -3149,7 +3433,7 @@ ml-api-adapter: replicaCount: 1 image: repository: mojaloop/ml-api-adapter - tag: v11.1.4 + tag: v11.1.6 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -3175,7 +3459,7 @@ ml-api-adapter: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -3286,7 +3570,7 @@ ml-api-adapter: replicaCount: 1 image: repository: mojaloop/ml-api-adapter - tag: v11.1.4 + tag: v11.1.6 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -3312,7 +3596,7 @@ ml-api-adapter: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -3463,7 +3747,7 @@ emailnotifier: image: repository: mojaloop/email-notifier - tag: v9.5.0 + tag: v11.0.2 pullPolicy: IfNotPresent init: @@ -3495,7 +3779,7 @@ emailnotifier: ciphers: 'SSLv3' PORT: 3081 hub_participant: - name: hub + name: Hub log_level: 'info' log_transport: 'file' @@ -3583,7 +3867,7 @@ account-lookup-service: api: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--api"]' service: @@ -3594,7 +3878,7 @@ account-lookup-service: admin: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--admin"]' service: @@ -3610,7 +3894,7 @@ account-lookup-service: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -3795,7 +4079,7 @@ account-lookup-service: api: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--api"]' service: @@ -3806,7 +4090,7 @@ account-lookup-service: admin: image: repository: mojaloop/account-lookup-service - tag: v11.3.2 + tag: v11.5.3 pullPolicy: IfNotPresent command: '["node", "src/index.js", "server", "--admin"]' service: @@ -3822,7 +4106,7 @@ account-lookup-service: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -4340,7 +4624,7 @@ quoting-service: replicaCount: 1 image: repository: mojaloop/quoting-service - tag: v11.2.2 + tag: v12.0.6 pullPolicy: IfNotPresent readinessProbe: @@ -4447,7 +4731,7 @@ quoting-service: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -4530,7 +4814,7 @@ transaction-requests-service: replicaCount: 1 image: repository: mojaloop/transaction-requests-service - tag: v11.1.4 + tag: v11.1.5 pullPolicy: IfNotPresent command: '["node", "src/index.js", "api"]' @@ -4552,7 +4836,7 @@ transaction-requests-service: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -4664,7 +4948,7 @@ simulator: image: repository: mojaloop/simulator - tag: v11.1.0 + tag: v11.1.2 pullPolicy: IfNotPresent imagePullSecrets: [] @@ -5165,24 +5449,29 @@ mojaloop-simulator: failureThreshold: 3 ingress: - annotations: - ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ - # nginx.ingress.kubernetes.io/rewrite-target: '/' - # nginx.ingress.kubernetes.io/rewrite-target: '/$2' - ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ - # kubernetes.io/ingress.class: nginx - ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego - # kubernetes.io/tls-acme: "true"" + # If you're using nginx ingress controller >= v0.22.0 set this to (/|$)(.*). Ensure that you set the `"nginx.ingress.kubernetes.io/rewrite-target": "/$2"` + # If you're using nginx ingress controller < v0.22.0 set this to an empty string or "/". Ensure that you set the `"nginx.ingress.kubernetes.io/rewrite-target": "/"` + # This affects the way your rewrite target will work. + # For more information see "Breaking changes" here: + # https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0220 + + ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ + # nginx.ingress.kubernetes.io/rewrite-target: '/' + # nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ + # kubernetes.io/ingress.class: nginx + ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego + # kubernetes.io/tls-acme: "true"" ## nginx ingress controller >= v0.22.0 - # annotations: - # nginx.ingress.kubernetes.io/rewrite-target: '/$2' - # ingressPathRewriteRegex: (/|$)(.*) + annotations: + nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ingressPathRewriteRegex: (/|$)(.*) ## nginx ingress controller < v0.22.0 # annotations: # nginx.ingress.kubernetes.io/rewrite-target: '/' - ingressPathRewriteRegex: "/" + # ingressPathRewriteRegex: "/" # If you enable JWS validation and intend to communicate via a switch you will almost certainly # want to put your switch JWS public key in this array. The name of the property in this object @@ -5259,7 +5548,7 @@ mojaloop-simulator: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v11.11.2 + tag: v11.17.1 pullPolicy: IfNotPresent <<: *defaultProbes @@ -5426,7 +5715,7 @@ mojaloop-simulator: backend: image: repository: mojaloop/mojaloop-simulator - tag: v11.4.1 + tag: v11.4.3 pullPolicy: IfNotPresent <<: *defaultProbes @@ -5686,14 +5975,14 @@ finance-portal: port: 3000 image: repository: mojaloop/finance-portal-backend-service - tag: v12.0.0 + tag: v15.0.2 pullPolicy: IfNotPresent port: 3000 init: enabled: false image: repository: mojaloop/finance-portal-backend-service - tag: v12.0.0 + tag: v15.0.2 pullPolicy: IfNotPresent env: 'dev' ingress: @@ -5820,7 +6109,7 @@ mojaloop-bulk: replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/api/index.js"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -5934,7 +6223,7 @@ mojaloop-bulk: replicaCount: 1 image: repository: mojaloop/bulk-api-adapter - tag: v11.1.0 + tag: v11.1.4 command: '["node", "src/handlers/index.js", "handler", "--notification"]' ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -6052,7 +6341,7 @@ mojaloop-bulk: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprepare"]' service: @@ -6224,7 +6513,7 @@ mojaloop-bulk: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkfulfil"]' service: @@ -6393,7 +6682,7 @@ mojaloop-bulk: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkprocessing"]' service: @@ -6562,7 +6851,7 @@ mojaloop-bulk: api: image: repository: mojaloop/central-ledger - tag: v13.2.5 + tag: v13.12.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "handler", "--bulkget"]' service: @@ -7007,11 +7296,11 @@ ml-testing-toolkit: host: testing-toolkit.local config: user_config.json: { - "DEFAULT_ENVIRONMENT_FILE_NAME": "hub-k8s-environment.json" + "DEFAULT_ENVIRONMENT_FILE_NAME": "hub-k8s-default-environment.json" } extraEnvironments: ## FOR_DEFERRED_SETTLEMENT - hub-k8s-environment.json: &ttkInputValues { + hub-k8s-default-environment.json: &ttkInputValues { "inputValues": { "BASE_CENTRAL_LEDGER_ADMIN": "", "CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-ml-testing-toolkit-backend:5000", @@ -7071,7 +7360,7 @@ ml-testing-toolkit: "contentTypeParticipants": "application/vnd.interoperability.participants+json;version=1.0", "contentTypeQuotes": "application/vnd.interoperability.quotes+json;version=1.0", "currency": "USD", - "currency2": "USD", + "currency2": "TZS", "fromDOB": "1984-01-01", "fromFirstName": "Firstname-Test", "fromFspId": "testingtoolkitdfsp", @@ -7143,157 +7432,158 @@ ml-testing-toolkit: } } ## FOR_CGS - # hub-k8s-environment.json: &ttkInputValues { - # "inputValues": { - # "BASE_CENTRAL_LEDGER_ADMIN": "", - # "CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-ml-testing-toolkit-backend:5000", - # "ENABLE_JWS_SIGNING": true, - # "ENABLE_JWS_VALIDATION": false, - # "ENABLE_PROTECTED_HEADERS_VALIDATION": true, - # "ENABLE_WS_ASSERTIONS": true, - # "NORESPONSE_SIMPAYEE_NAME": "noresponsepayeefsp", - # "ON_US_TRANSFERS_ENABLED": false, - # "HOST_ACCOUNT_LOOKUP_ADMIN": "http://$release_name-account-lookup-service-admin", - # "HOST_ACCOUNT_LOOKUP_SERVICE": "http://$release_name-account-lookup-service", - # "HOST_ACCOUNT_LOOKUP_SERVICE_ADMIN": "http://$release_name-account-lookup-service-admin", - # "HOST_BULK_ADAPTER": "http://$release_name-bulk-api-adapter-service", - # "HOST_CENTRAL_LEDGER": "http://$release_name-centralledger-service", - # "HOST_CENTRAL_SETTLEMENT": "http://$release_name-centralsettlement-service/v2", - # "HOST_LEGACY_SIMULATOR": "http://$release_name-simulator", - # "HOST_ML_API_ADAPTER": "http://$release_name-ml-api-adapter-service", - # "HOST_QUOTING_SERVICE": "http://$release_name-quoting-service", - # "HOST_SIMULATOR": "http://$release_name-simulator", - # "HOST_TRANSACTION_REQUESTS_SERVICE": "http://$release_name-transaction-requests-service", - # "HUB_OPERATOR_BEARER_TOKEN": "NOT_APPLICABLE", - # "PAYEEFSP_BACKEND_TESTAPI_URL": "http://$release_name-sim-payeefsp-backend:3003", - # "PAYEEFSP_CALLBACK_URL": "http://$release_name-sim-payeefsp-scheme-adapter:4000", - # "PAYEEFSP_SDK_TESTAPI_URL": "http://$release_name-sim-payeefsp-scheme-adapter:4002", - # "PAYEEFSP_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-payeefsp-scheme-adapter:4002", - # "PAYERFSP_BACKEND_TESTAPI_URL": "http://$release_name-sim-payerfsp-backend:3003", - # "PAYERFSP_CALLBACK_URL": "http://$release_name-sim-payerfsp-scheme-adapter:4000", - # "PAYERFSP_SDK_TESTAPI_URL": "http://$release_name-sim-payerfsp-scheme-adapter:4002", - # "PAYERFSP_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-payerfsp-scheme-adapter:4002", - # "SIM1_JWS_KEY": "-----BEGIN PRIVATE KEY-----\n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\nDgoQeSng2kt5Z6mkoDIQTs7nEflb4w==\n-----END PRIVATE KEY-----\n", - # "SIM1_MSISDN": "17039811903", - # "SIM1_NAME": "testfsp1", - # "SIM2_JWS_KEY": "-----BEGIN PRIVATE KEY-----\n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\nTv4G862WYeqD1fdyZaKQ3b9fAQEq1g==\n-----END PRIVATE KEY-----\n", - # "SIM2_MSISDN": "17039811904", - # "SIM2_NAME": "testfsp2", - # "SIMPAYEE_CURRENCY": "USD", - # "SIMPAYEE_JWS_PRIVATE_KEY": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMu126miewCUCT\n7f49B0SyCPFGzmqGSs9rTPbk1se+BBhqfhsfkZj6cRRfrlg3rme6we0Ib2AF5TQL\nnoSBlDAimQcNOHXrqpAY/B0l/mgyUwmfv0NJ3UjZuCFuw3HRrU/oSUfXoDITC+Bi\n120w4FY2B/vPn+1iC/tsaCayneoaV/Sedq7H9+smEnQfGl3p5QJp/B2Ws3Bz1HqI\nIoxLEaO9VMeDHQPvNJn/7g9erqA5vIhmgLS46worOVjdRLH2SECH73qp8Wg0rJ8Y\neW2kQ8kuY4uHcG3MO6drYrC011U0ZyM90KV7dv2Y0h2FHlpn9s/pmb630m5ELpnB\nT/pYTLcXAgMBAAECggEADqk6Qz3SgBeMMYEWYZ4ZdsW6Ktpm+Xqg/kDy4JywOB9z\nSikBXeeKH3Z6ltwq2BicDV020Wb8Zt+s3vTOmLhDzC544/hPmtKfjWfR2eHX6gaq\nm+8ml+20pQFmb4Kn2MlC/Xzwm/SOXBvPyUmTua95rQExsK12DT0+F4YhLfhYsTh2\nHfkEzdFW4rrd+9ddKG1ZANS4ZaiMyzhtvUWeEBypBtVf+kBk+51t9pLCdjuynb8I\nWylSDhikT3/YQ/3g/Sz3SMp1u4x0GQe9FWYrnPzzp5LnM5fm49v8JWVHUvd0TOi0\ndQV+LYlgSD38YPpi4iKQSh0Zf0EBfbA83GsX2ArJ7QKBgQDmvcA6PqPo0OV/7RKY\nJuziA3TpucL8iVM1i7/Lv6+VkX88uDvEjwLoNAiYcgIm/CMK7WAwA+Dzn4r38EHB\nBKF4KRhP0qQS0KLXsd0tdsmAB0In7+cbKL4ttqNUP98xZAkTLJq9PXqTKN0qtyw4\nSfIsVMjDGoeSdWHObZYbGKICfQKBgQDjJLwolDrVX29V4zVmxQYH5iN+5kwKXHXj\nsuHBrW02Oj/GQFh3Xj6JQi3mzTWYhHwhA4pdaQtNYqTaz9Ic/O1VNPic2ovtg+cd\n7sh86qdQ4QZYhN3RT4oX///u6+UK90llh9hEBo3GuZ4X47tuByNtD4SFAlULrkSm\nfW4XaC3gIwKBgGil6HfCDx65F00UnVlKVicPQEf8ivVz5rwjPIJQ1nZ0PYuxVtIH\ntl7PspJJKra5pb7/957vM2fqlOFsIrZCvmS75p3VP7qUyzYeIdzLwgmBwTxRrrP/\nn3kmGx9LtJM29nKuySNIrb3uS5hi6PhCeUYn0cHC13fSKuCvjOOPIXMVAoGBAJg+\nCPdR0tUs8Byq+yH0sIQe1m+5wAG50zJYtUPxD6AnDpO8kQ8A1f19o/JsXJ3rPp+K\nFfVh8LdfhIs8e+H+DLztkizftqXtoLzJTQuc46QsDurJszsVisNnTI1BAvWEpWct\n0+BUXDZ0NuhgNUIb+rygh/v2gjYgCddlfqKlqwntAoGBAM5Kpp5R0G0ioAuqGqfZ\nsHEdLqJMSepgc6c7RC+3G/svtS2IqCfyNfVMM3qV5MY3J7KnAVjGOw2oJbXcPLXa\nuutsVVmPx2d/x2LZdc8dYYcdOQZvrUhmALhAPXM4SRujakxh+Uxi1VOiW+fZL8aW\nuu1pxuWD0gTJxFkp6u4YIAhw\n-----END PRIVATE KEY-----\n", - # "SIMPAYEE_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLtduponsAlAk+3+PQdE\nsgjxRs5qhkrPa0z25NbHvgQYan4bH5GY+nEUX65YN65nusHtCG9gBeU0C56EgZQw\nIpkHDTh166qQGPwdJf5oMlMJn79DSd1I2bghbsNx0a1P6ElH16AyEwvgYtdtMOBW\nNgf7z5/tYgv7bGgmsp3qGlf0nnaux/frJhJ0Hxpd6eUCafwdlrNwc9R6iCKMSxGj\nvVTHgx0D7zSZ/+4PXq6gObyIZoC0uOsKKzlY3USx9khAh+96qfFoNKyfGHltpEPJ\nLmOLh3BtzDuna2KwtNdVNGcjPdCle3b9mNIdhR5aZ/bP6Zm+t9JuRC6ZwU/6WEy3\nFwIDAQAB\n-----END PUBLIC KEY-----\n", - # "SIMPAYEE_MSISDN": "17039811902", - # "SIMPAYEE_NAME": "payeefsp", - # "SIMPAYER_CURRENCY": "USD", - # "SIMPAYER_JWS_PRIVATE_KEY": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCg9eU66hg4ZAE6\njM4U8ylXQwUz9cdmzS3JyW+1bbgv77peMKSU/wFsi4QRwmbrYze9baFnGCKnS75E\nvCchib5vJxp3MDWzi/TGxmzgWdJRzkyCiI5C6dCgVL71MjsFgN3TN63wEf5sEU2I\neoJ8yXJM0pUG9f9NO7p/IGliDmt6C7EA7D9kQWigufmX0ZTVNKI07fKwC/AEKLp7\nkx99pvsCq8m184EEL15Q/NhA7R/5zKoHvmJa6Jd7tM0i0xn8IKOkNVFu3YIafAEC\nQWQwRbanFEeRc3tH3bEoYM8c74r+W+YxCG7nUf16XCk132XVffbHVl+wFgo18YB/\nsAJmcbePAgMBAAECggEAGQGKnsf+gkg7DqMQYx3Rxt5BISzmURjAK9CxG6ETk9Lt\nA7QP5ZvmVzwnhPDMN3Z/Et1EzXTo8U+pnBkVBTdWkAMlr+2b8ixklzr9cC9UJuRj\na4YWf9u+TyJLVmF63OSD0cwdKCZLffOENZc+zW8oZDn08BNomdGVLCnXZWXzGY8X\nKaJTJr29jEgkKOqFXdAHrsmj7TBtqSLZKx2IHdCmi05+5JCxVLPgnDiCicZ9zEii\nyWw57Q1migFIcw6ZQP4RyjgH1o70B+zo3OL7IQEirE17GUgK16XD8xi8hWCYTj5n\nxOz9yfVfPuYom/9Xbm5kYJZKE2HOZ3Lg8pUnWncuNQKBgQDbaOoACQPhVxQK1qYR\nRbW0I5Rn0EDxzsFPEpu3eXHoIYGXi8u/ew9AzFmGu+tKYJV5V4BCXo5x2ddE+B8B\ndXhyHLGfeV8tWKYKBpatolVxxKDL/9fnxoGIAO9cc91ieOm5JxmKscCVP1UnOXHZ\nuomSfAbGQwYDtMd2bJKkE1z0qwKBgQC7zacuv1PMaDFksHuNNRG+aZ74pJ77msht\nvJoKyaQcktD0xmIXhFfJvK4cclzG7s5jxCsu2ejimgmfVzgXlLEMrJFvSdFkD2SS\ngGqoxq5c9g8ssvt7xwr7aJ+VYYWTWRzJrOUny+99UbwHedu0EHL1BYILwy67Lium\nsgUeeCEgrQKBgGv+7f7qcRB/jgvvr3oc990dDjUzGmRrQlcrb54Vlu2NYH45fyZW\n6iEY9JAO+zd25tv9J9KDPFXpxb3a61gKfCie2wcF9MUbN08EAzKgDrKa+BKxcZJR\n8PwCic7V8QhBP7m09yt/Zq2PqNhPvCxRVtnVVnhMES/N0cgGlP9R0JVVAoGAHU2/\nkmnEN5bibiWjgasQM7fjWETHkdbbA1R0bM59zv+Rnz/9OlIqKI5KVKH7nAbTKXoI\niuzxi7ohWj2PwQ4wehvLLaRFCenk9X8YJXGq71Jtl7ntx6iNLCFtFS/8WbuD5GwX\n7ZfCrLk+L6RyBayzY0wSuKch+Y8AvKf2aISyFpkCgYEAjSfEjz9Cn+27HdiMoBwa\n+fyyoosci/6OBxj/WTKvV6KUYLBfFoAYpb9rqrbvnfyyc0UiAYQeMJAOWQ1kkzY4\nzXs63iPQi2UeGPJZ7RsT+31DSaG9YiQdrInsUrlm8hi1C7Pg/NNt6Y1G0WhWYrvF\niNK0yCENMhSoOTtbT9tmGi0=\n-----END PRIVATE KEY-----\n", - # "SIMPAYER_MSISDN": "17039811901", - # "SIMPAYER_NAME": "payerfsp", - # "SIMPLE_ROUTING_MODE_ENABLED": false, - # "TESTFSP1_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2R3IuEDpqDtsS96emI0v\ndCJpeb/lnCxR2Nw5x6Z3GjC9PRFCJ2gsS2Zq70NaUQ5yWrrrZ9DZ8PjgCXqftUKG\n42uFsibLFpN09IjQuZCDuAkCdEjMgm+xies47ajRzl6evOc0ClkQBZVGybl9RAr6\nNRTFOYkYjJ0xS0MNkfRkDiOEu5BA/XKb5oLbyVMjGyvLgyS1g41x4fA+Ccb5PENa\nh9dqkFJ3j218Rs+bGytrVqrrCCjV1FiI+Y9YjKuTRRo7U/jcGHLfEc7YRcP2U9os\nxQxFvhHxR7W0e74fAU8B8YIJzwjaQvrEh9SJRc2IZsh6EdBAXXmbk4sHKyhoX0by\nUQIDAQAB\n-----END PUBLIC KEY-----\n", - # "TESTFSP2_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7k0Mqy0jSXFpHD9/a+Y\nl5djXq6HdyC+BsSA/sRKczEBKQyW8mEJVILAKkOibWzK7e+SJjQPbFjgqiUZvRI5\n+ggHkSJXEV28Bi2sF58A15sQjwaSkE2vBwLAL5GftSmao0QSozSfQ+RFw2N+loRG\nYedXZpRMsYFr1uA1qavcBjoj7JqPpID7UaTgXwwHWbV+j2uhQfotqRvOQ5KTmx5H\nJa+VjPu+xAC7mmcL+dxmeBpbJJD5Li8B8ggJXGJUk+En6XSIgZkQ6vKvC9HyasE6\nWZLXU+JJoCp2wkCPNTRxzPE2PGnlI0a4ZP2/y/2yacc4HQGBhEMc+SVT/VSZaMS+\nAQIDAQAB\n-----END PUBLIC KEY-----", - # "TESTFSP1_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp1-backend:3003", - # "TESTFSP1_CALLBACK_URL": "http://$release_name-sim-testfsp1-scheme-adapter:4000", - # "TESTFSP1_SDK_TESTAPI_URL": "http://$release_name-sim-testfsp1-scheme-adapter:4002", - # "TESTFSP1_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-testfsp1-scheme-adapter:4002", - # "TESTFSP2_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp2-backend:3003", - # "TESTFSP2_CALLBACK_URL": "http://$release_name-sim-testfsp2-scheme-adapter:4000", - # "TESTFSP2_SDK_TESTAPI_URL": "http://$release_name-sim-testfsp2-scheme-adapter:4002", - # "TESTFSP2_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-testfsp2-scheme-adapter:4002", - # "TEST_NOTIFICATIONS": true, - # "TTKFSP_JWS_KEY": "-----BEGIN PRIVATE KEY-----\n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\nDktFAP1w3ruycnE/t+/H8rDVJGPTHc8=\n-----END PRIVATE KEY-----\n", - # "WS_ASSERTION_TIMEOUT": 5000, - # "accept": "application/vnd.interoperability.parties+json;version=1.0", - # "acceptParticipants": "application/vnd.interoperability.participants+json;version=1.0", - # "acceptQuotes": "application/vnd.interoperability.quotes+json;version=1.0", - # "acceptTransfers": "application/vnd.interoperability.transfers+json;version=1.0", - # "accountId": "6", - # "amount": "100", - # "batchToIdValue1": "27713803066", - # "batchToIdValue2": "27713803067", - # "condition": "n2cwS3w4ekGlvNYoXg2uBAqssu3FCoXjADE2mziU5jU", - # "contentTransfers": "application/vnd.interoperability.transfers+json;version=1.0", - # "contentType": "application/vnd.interoperability.parties+json;version=1.0", - # "contentTypeParticipants": "application/vnd.interoperability.participants+json;version=1.0", - # "contentTypeQuotes": "application/vnd.interoperability.quotes+json;version=1.0", - # "currency": "USD", - # "currency2": "USD", - # "fromDOB": "1984-01-01", - # "fromFirstName": "Firstname-Test", - # "fromFspId": "testingtoolkitdfsp", - # "fromIdType": "MSISDN", - # "fromIdValue": "44123456789", - # "fromLastName": "Lastname-Test", - # "fspiopSignature": "{\"signature\":\"iU4GBXSfY8twZMj1zXX1CTe3LDO8Zvgui53icrriBxCUF_wltQmnjgWLWI4ZUEueVeOeTbDPBZazpBWYvBYpl5WJSUoXi14nVlangcsmu2vYkQUPmHtjOW-yb2ng6_aPfwd7oHLWrWzcsjTF-S4dW7GZRPHEbY_qCOhEwmmMOnE1FWF1OLvP0dM0r4y7FlnrZNhmuVIFhk_pMbEC44rtQmMFv4pm4EVGqmIm3eyXz0GkX8q_O1kGBoyIeV_P6RRcZ0nL6YUVMhPFSLJo6CIhL2zPm54Qdl2nVzDFWn_shVyV0Cl5vpcMJxJ--O_Zcbmpv6lxqDdygTC782Ob3CNMvg\\\",\\\"protectedHeader\\\":\\\"eyJhbGciOiJSUzI1NiIsIkZTUElPUC1VUkkiOiIvdHJhbnNmZXJzIiwiRlNQSU9QLUhUVFAtTWV0aG9kIjoiUE9TVCIsIkZTUElPUC1Tb3VyY2UiOiJPTUwiLCJGU1BJT1AtRGVzdGluYXRpb24iOiJNVE5Nb2JpbGVNb25leSIsIkRhdGUiOiIifQ\"}", - # "fundsInPrepareAmount": "", - # "fundsInPrepareTransferId": "", - # "homeTransactionId": "123ABC", - # "hubEmail": "some.email@gmail.com", - # "hub_operator": "NOT_APPLICABLE", - # "ilpPacket": "AYIDBQAAAAAAACcQJGcucGF5ZWVmc3AubXNpc2RuLnt7cmVjZWl2ZXJtc2lzZG59fYIC1GV5SjBjbUZ1YzJGamRHbHZia2xrSWpvaVptVXhNREU0Wm1NdE1EaGxZeTAwWWpJM0xUbGpZalF0TnpjMk9URTFNR00zT1dKaklpd2ljWFZ2ZEdWSlpDSTZJbVpsTVRBeE9HWmpMVEE0WldNdE5HSXlOeTA1WTJJMExUYzNOamt4TlRCak56bGlZeUlzSW5CaGVXVmxJanA3SW5CaGNuUjVTV1JKYm1adklqcDdJbkJoY25SNVNXUlVlWEJsSWpvaVRWTkpVMFJPSWl3aWNHRnlkSGxKWkdWdWRHbG1hV1Z5SWpvaWUzdHlaV05sYVhabGNrMVRTVk5FVG4xOUlpd2labk53U1dRaU9pSndZWGxsWldaemNDSjlmU3dpY0dGNVpYSWlPbnNpY0dGeWRIbEpaRWx1Wm04aU9uc2ljR0Z5ZEhsSlpGUjVjR1VpT2lKTlUwbFRSRTRpTENKd1lYSjBlVWxrWlc1MGFXWnBaWElpT2lJeU56Y3hNemd3TXprd05TSXNJbVp6Y0Vsa0lqb2ljR0Y1WlhKbWMzQWlmU3dpY0dWeWMyOXVZV3hKYm1adklqcDdJbU52YlhCc1pYaE9ZVzFsSWpwN0ltWnBjbk4wVG1GdFpTSTZJazFoZEhNaUxDSnNZWE4wVG1GdFpTSTZJa2hoWjIxaGJpSjlMQ0prWVhSbFQyWkNhWEowYUNJNklqRTVPRE10TVRBdE1qVWlmWDBzSW1GdGIzVnVkQ0k2ZXlKaGJXOTFiblFpT2lJeE1EQWlMQ0pqZFhKeVpXNWplU0k2SWxWVFJDSjlMQ0owY21GdWMyRmpkR2x2YmxSNWNHVWlPbnNpYzJObGJtRnlhVzhpT2lKVVVrRk9VMFpGVWlJc0ltbHVhWFJwWVhSdmNpSTZJbEJCV1VWU0lpd2lhVzVwZEdsaGRHOXlWSGx3WlNJNklrTlBUbE5WVFVWU0luMTkA", - # "invalidFulfillment": "_3cco-YN5OGpRKVWV3n6x6uNpBTH9tYUdOYmHA-----", - # "invalidToIdType": "ACCOUNT_ID", - # "invalidToIdValue": "27713803099", - # "mobileSimPayeeFsp": "greenbankfsp", - # "mobileSimPayerFsp": "pinkbankfsp", - # "note": "test", - # "payeeIdType": "MSISDN", - # "payeeIdentifier": "17039811902", - # "payeefsp": "payeefsp", - # "payeefspEmail": "some.email@gmail.com", - # "payerIdType": "MSISDN", - # "payerIdentifier": "17039811901", - # "payerfsp": "testingtoolkitdfsp", - # "payerfspEmail": "some.email@gmail.com", - # "payerfspSettlementAccountBalanceAfterFundsIn": "", - # "payerfspSettlementAccountBalanceBeforeFundsIn": "", - # "payerfspSettlementAccountId": "", - # "receiverMSISDN": "27713803912", - # "testfsp1Email": "some.email@gmail.com", - # "testfsp1IdType": "MSISDN", - # "testfsp1Identifier": "17891239875", - # "testfsp1MSISDN": "17891239875", - # "testfsp2Email": "some.email@gmail.com", - # "testfsp2IdType": "MSISDN", - # "testfsp2Identifier": "17891239874", - # "testfsp2MSISDN": "17891239874", - # "toFspId": "payeefsp", - # "toIdType": "MSISDN", - # "toIdValue": "27713803912", - # "toIdValueDelete": "27713803913", - # "validCondition": "GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM", - # "validCondition2": "kPLCKM62VY2jbekuw3apCTBg5zk_mVs9DD8-XpljQms", - # "validFulfillment": "UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA", - # "validIlpPacket2": "AYIC9AAAAAAAABdwHWcucGF5ZWVmc3AubXNpc2RuLjIyNTU2OTk5MTI1ggLKZXlKMGNtRnVjMkZqZEdsdmJrbGtJam9pWmpRMFltUmtOV010WXpreE1DMDBZVGt3TFRoa05qa3RaR0ppWVRaaVl6aGxZVFpqSWl3aWNYVnZkR1ZKWkNJNklqVTBaRFZtTURsaUxXRTBOMlF0TkRCa05pMWhZVEEzTFdFNVkyWXpZbUl5TkRsaFpDSXNJbkJoZVdWbElqcDdJbkJoY25SNVNXUkpibVp2SWpwN0luQmhjblI1U1dSVWVYQmxJam9pVFZOSlUwUk9JaXdpY0dGeWRIbEpaR1Z1ZEdsbWFXVnlJam9pTWpJMU5UWTVPVGt4TWpVaUxDSm1jM0JKWkNJNkluQmhlV1ZsWm5Od0luMTlMQ0p3WVhsbGNpSTZleUp3WVhKMGVVbGtTVzVtYnlJNmV5SndZWEowZVVsa1ZIbHdaU0k2SWsxVFNWTkVUaUlzSW5CaGNuUjVTV1JsYm5ScFptbGxjaUk2SWpJeU5UQTNNREE0TVRneElpd2labk53U1dRaU9pSndZWGxsY21aemNDSjlMQ0p3WlhKemIyNWhiRWx1Wm04aU9uc2lZMjl0Y0d4bGVFNWhiV1VpT25zaVptbHljM1JPWVcxbElqb2lUV0YwY3lJc0lteGhjM1JPWVcxbElqb2lTR0ZuYldGdUluMHNJbVJoZEdWUFprSnBjblJvSWpvaU1UazRNeTB4TUMweU5TSjlmU3dpWVcxdmRXNTBJanA3SW1GdGIzVnVkQ0k2SWpZd0lpd2lZM1Z5Y21WdVkza2lPaUpWVTBRaWZTd2lkSEpoYm5OaFkzUnBiMjVVZVhCbElqcDdJbk5qWlc1aGNtbHZJam9pVkZKQlRsTkdSVklpTENKcGJtbDBhV0YwYjNJaU9pSlFRVmxGVWlJc0ltbHVhWFJwWVhSdmNsUjVjR1VpT2lKRFQwNVRWVTFGVWlKOWZRAA", - # "SIM3_NAME": "testfsp3", - # "SIM4_NAME": "testfsp4", - # "testfsp3MSISDN": "17891239873", - # "SIM1_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp1-backend:3003", - # "SIM2_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp2-backend:3003", - # "SIM3_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp3-backend:3003", - # "SIM4_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp4-backend:3003", - # "settlementtestfsp2bankMSISDN": "27713813915", - # "settlementtestfsp1bankMSISDN": "27713813914", - # "testfsp4MSISDN": "17891239872", - # "settlementtestfsp4bankMSISDN": "27713813917", - # "payerMSISDN": "17891239876", - # "settlementtestNonExistingMSISDN": "22244803917", - # "settlementtestfsp3bankMSISDN": "27713813916", - # "DELAY_CGS": 5000, - # "huboperatoremail": "some.email@gmail.com", - # "PAYERFSP_EMAIL": "some.email@gmail.com", - # "MSISDN_ORACLE_ENDPOINT": "http://dev2-simulator/oracle", - # "NET_DEBIT_CAP": "50000", - # "HOST_REGISTER_ORACLE": "http://dev2-simulator", - # "TESTFSP3_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp3-backend:3003", - # "TESTFSP4_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp4-backend:3003", - # "payeefspMSISDN": "17039811907", - # "payerfspMSISDN": "17891239876", - # "settlementpayeefspNoExtensionMSISDN": "27714923918", - # "TESTFSP3_CALLBACK_URL": "http://$release_name-sim-testfsp3-scheme-adapter:4000", - # "TESTFSP4_CALLBACK_URL": "http://$release_name-sim-testfsp4-scheme-adapter:4000", - # "NORESPONSE_NAME": "noresponsepayeefsp" - # } - # } + # hub-k8s-cgs-environment.json: &ttkInputValues { + hub-k8s-cgs-environment.json: { + "inputValues": { + "BASE_CENTRAL_LEDGER_ADMIN": "", + "CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-ml-testing-toolkit-backend:5000", + "ENABLE_JWS_SIGNING": true, + "ENABLE_JWS_VALIDATION": false, + "ENABLE_PROTECTED_HEADERS_VALIDATION": true, + "ENABLE_WS_ASSERTIONS": true, + "NORESPONSE_SIMPAYEE_NAME": "noresponsepayeefsp", + "ON_US_TRANSFERS_ENABLED": false, + "HOST_ACCOUNT_LOOKUP_ADMIN": "http://$release_name-account-lookup-service-admin", + "HOST_ACCOUNT_LOOKUP_SERVICE": "http://$release_name-account-lookup-service", + "HOST_ACCOUNT_LOOKUP_SERVICE_ADMIN": "http://$release_name-account-lookup-service-admin", + "HOST_BULK_ADAPTER": "http://$release_name-bulk-api-adapter-service", + "HOST_CENTRAL_LEDGER": "http://$release_name-centralledger-service", + "HOST_CENTRAL_SETTLEMENT": "http://$release_name-centralsettlement-service/v2", + "HOST_LEGACY_SIMULATOR": "http://$release_name-simulator", + "HOST_ML_API_ADAPTER": "http://$release_name-ml-api-adapter-service", + "HOST_QUOTING_SERVICE": "http://$release_name-quoting-service", + "HOST_SIMULATOR": "http://$release_name-simulator", + "HOST_TRANSACTION_REQUESTS_SERVICE": "http://$release_name-transaction-requests-service", + "HUB_OPERATOR_BEARER_TOKEN": "NOT_APPLICABLE", + "PAYEEFSP_BACKEND_TESTAPI_URL": "http://$release_name-sim-payeefsp-backend:3003", + "PAYEEFSP_CALLBACK_URL": "http://$release_name-sim-payeefsp-scheme-adapter:4000", + "PAYEEFSP_SDK_TESTAPI_URL": "http://$release_name-sim-payeefsp-scheme-adapter:4002", + "PAYEEFSP_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-payeefsp-scheme-adapter:4002", + "PAYERFSP_BACKEND_TESTAPI_URL": "http://$release_name-sim-payerfsp-backend:3003", + "PAYERFSP_CALLBACK_URL": "http://$release_name-sim-payerfsp-scheme-adapter:4000", + "PAYERFSP_SDK_TESTAPI_URL": "http://$release_name-sim-payerfsp-scheme-adapter:4002", + "PAYERFSP_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-payerfsp-scheme-adapter:4002", + "SIM1_JWS_KEY": "-----BEGIN PRIVATE KEY-----\n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\nDgoQeSng2kt5Z6mkoDIQTs7nEflb4w==\n-----END PRIVATE KEY-----\n", + "SIM1_MSISDN": "17039811903", + "SIM1_NAME": "testfsp1", + "SIM2_JWS_KEY": "-----BEGIN PRIVATE KEY-----\n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\nTv4G862WYeqD1fdyZaKQ3b9fAQEq1g==\n-----END PRIVATE KEY-----\n", + "SIM2_MSISDN": "17039811904", + "SIM2_NAME": "testfsp2", + "SIMPAYEE_CURRENCY": "USD", + "SIMPAYEE_JWS_PRIVATE_KEY": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDMu126miewCUCT\n7f49B0SyCPFGzmqGSs9rTPbk1se+BBhqfhsfkZj6cRRfrlg3rme6we0Ib2AF5TQL\nnoSBlDAimQcNOHXrqpAY/B0l/mgyUwmfv0NJ3UjZuCFuw3HRrU/oSUfXoDITC+Bi\n120w4FY2B/vPn+1iC/tsaCayneoaV/Sedq7H9+smEnQfGl3p5QJp/B2Ws3Bz1HqI\nIoxLEaO9VMeDHQPvNJn/7g9erqA5vIhmgLS46worOVjdRLH2SECH73qp8Wg0rJ8Y\neW2kQ8kuY4uHcG3MO6drYrC011U0ZyM90KV7dv2Y0h2FHlpn9s/pmb630m5ELpnB\nT/pYTLcXAgMBAAECggEADqk6Qz3SgBeMMYEWYZ4ZdsW6Ktpm+Xqg/kDy4JywOB9z\nSikBXeeKH3Z6ltwq2BicDV020Wb8Zt+s3vTOmLhDzC544/hPmtKfjWfR2eHX6gaq\nm+8ml+20pQFmb4Kn2MlC/Xzwm/SOXBvPyUmTua95rQExsK12DT0+F4YhLfhYsTh2\nHfkEzdFW4rrd+9ddKG1ZANS4ZaiMyzhtvUWeEBypBtVf+kBk+51t9pLCdjuynb8I\nWylSDhikT3/YQ/3g/Sz3SMp1u4x0GQe9FWYrnPzzp5LnM5fm49v8JWVHUvd0TOi0\ndQV+LYlgSD38YPpi4iKQSh0Zf0EBfbA83GsX2ArJ7QKBgQDmvcA6PqPo0OV/7RKY\nJuziA3TpucL8iVM1i7/Lv6+VkX88uDvEjwLoNAiYcgIm/CMK7WAwA+Dzn4r38EHB\nBKF4KRhP0qQS0KLXsd0tdsmAB0In7+cbKL4ttqNUP98xZAkTLJq9PXqTKN0qtyw4\nSfIsVMjDGoeSdWHObZYbGKICfQKBgQDjJLwolDrVX29V4zVmxQYH5iN+5kwKXHXj\nsuHBrW02Oj/GQFh3Xj6JQi3mzTWYhHwhA4pdaQtNYqTaz9Ic/O1VNPic2ovtg+cd\n7sh86qdQ4QZYhN3RT4oX///u6+UK90llh9hEBo3GuZ4X47tuByNtD4SFAlULrkSm\nfW4XaC3gIwKBgGil6HfCDx65F00UnVlKVicPQEf8ivVz5rwjPIJQ1nZ0PYuxVtIH\ntl7PspJJKra5pb7/957vM2fqlOFsIrZCvmS75p3VP7qUyzYeIdzLwgmBwTxRrrP/\nn3kmGx9LtJM29nKuySNIrb3uS5hi6PhCeUYn0cHC13fSKuCvjOOPIXMVAoGBAJg+\nCPdR0tUs8Byq+yH0sIQe1m+5wAG50zJYtUPxD6AnDpO8kQ8A1f19o/JsXJ3rPp+K\nFfVh8LdfhIs8e+H+DLztkizftqXtoLzJTQuc46QsDurJszsVisNnTI1BAvWEpWct\n0+BUXDZ0NuhgNUIb+rygh/v2gjYgCddlfqKlqwntAoGBAM5Kpp5R0G0ioAuqGqfZ\nsHEdLqJMSepgc6c7RC+3G/svtS2IqCfyNfVMM3qV5MY3J7KnAVjGOw2oJbXcPLXa\nuutsVVmPx2d/x2LZdc8dYYcdOQZvrUhmALhAPXM4SRujakxh+Uxi1VOiW+fZL8aW\nuu1pxuWD0gTJxFkp6u4YIAhw\n-----END PRIVATE KEY-----\n", + "SIMPAYEE_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLtduponsAlAk+3+PQdE\nsgjxRs5qhkrPa0z25NbHvgQYan4bH5GY+nEUX65YN65nusHtCG9gBeU0C56EgZQw\nIpkHDTh166qQGPwdJf5oMlMJn79DSd1I2bghbsNx0a1P6ElH16AyEwvgYtdtMOBW\nNgf7z5/tYgv7bGgmsp3qGlf0nnaux/frJhJ0Hxpd6eUCafwdlrNwc9R6iCKMSxGj\nvVTHgx0D7zSZ/+4PXq6gObyIZoC0uOsKKzlY3USx9khAh+96qfFoNKyfGHltpEPJ\nLmOLh3BtzDuna2KwtNdVNGcjPdCle3b9mNIdhR5aZ/bP6Zm+t9JuRC6ZwU/6WEy3\nFwIDAQAB\n-----END PUBLIC KEY-----\n", + "SIMPAYEE_MSISDN": "17039811902", + "SIMPAYEE_NAME": "payeefsp", + "SIMPAYER_CURRENCY": "USD", + "SIMPAYER_JWS_PRIVATE_KEY": "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCg9eU66hg4ZAE6\njM4U8ylXQwUz9cdmzS3JyW+1bbgv77peMKSU/wFsi4QRwmbrYze9baFnGCKnS75E\nvCchib5vJxp3MDWzi/TGxmzgWdJRzkyCiI5C6dCgVL71MjsFgN3TN63wEf5sEU2I\neoJ8yXJM0pUG9f9NO7p/IGliDmt6C7EA7D9kQWigufmX0ZTVNKI07fKwC/AEKLp7\nkx99pvsCq8m184EEL15Q/NhA7R/5zKoHvmJa6Jd7tM0i0xn8IKOkNVFu3YIafAEC\nQWQwRbanFEeRc3tH3bEoYM8c74r+W+YxCG7nUf16XCk132XVffbHVl+wFgo18YB/\nsAJmcbePAgMBAAECggEAGQGKnsf+gkg7DqMQYx3Rxt5BISzmURjAK9CxG6ETk9Lt\nA7QP5ZvmVzwnhPDMN3Z/Et1EzXTo8U+pnBkVBTdWkAMlr+2b8ixklzr9cC9UJuRj\na4YWf9u+TyJLVmF63OSD0cwdKCZLffOENZc+zW8oZDn08BNomdGVLCnXZWXzGY8X\nKaJTJr29jEgkKOqFXdAHrsmj7TBtqSLZKx2IHdCmi05+5JCxVLPgnDiCicZ9zEii\nyWw57Q1migFIcw6ZQP4RyjgH1o70B+zo3OL7IQEirE17GUgK16XD8xi8hWCYTj5n\nxOz9yfVfPuYom/9Xbm5kYJZKE2HOZ3Lg8pUnWncuNQKBgQDbaOoACQPhVxQK1qYR\nRbW0I5Rn0EDxzsFPEpu3eXHoIYGXi8u/ew9AzFmGu+tKYJV5V4BCXo5x2ddE+B8B\ndXhyHLGfeV8tWKYKBpatolVxxKDL/9fnxoGIAO9cc91ieOm5JxmKscCVP1UnOXHZ\nuomSfAbGQwYDtMd2bJKkE1z0qwKBgQC7zacuv1PMaDFksHuNNRG+aZ74pJ77msht\nvJoKyaQcktD0xmIXhFfJvK4cclzG7s5jxCsu2ejimgmfVzgXlLEMrJFvSdFkD2SS\ngGqoxq5c9g8ssvt7xwr7aJ+VYYWTWRzJrOUny+99UbwHedu0EHL1BYILwy67Lium\nsgUeeCEgrQKBgGv+7f7qcRB/jgvvr3oc990dDjUzGmRrQlcrb54Vlu2NYH45fyZW\n6iEY9JAO+zd25tv9J9KDPFXpxb3a61gKfCie2wcF9MUbN08EAzKgDrKa+BKxcZJR\n8PwCic7V8QhBP7m09yt/Zq2PqNhPvCxRVtnVVnhMES/N0cgGlP9R0JVVAoGAHU2/\nkmnEN5bibiWjgasQM7fjWETHkdbbA1R0bM59zv+Rnz/9OlIqKI5KVKH7nAbTKXoI\niuzxi7ohWj2PwQ4wehvLLaRFCenk9X8YJXGq71Jtl7ntx6iNLCFtFS/8WbuD5GwX\n7ZfCrLk+L6RyBayzY0wSuKch+Y8AvKf2aISyFpkCgYEAjSfEjz9Cn+27HdiMoBwa\n+fyyoosci/6OBxj/WTKvV6KUYLBfFoAYpb9rqrbvnfyyc0UiAYQeMJAOWQ1kkzY4\nzXs63iPQi2UeGPJZ7RsT+31DSaG9YiQdrInsUrlm8hi1C7Pg/NNt6Y1G0WhWYrvF\niNK0yCENMhSoOTtbT9tmGi0=\n-----END PRIVATE KEY-----\n", + "SIMPAYER_MSISDN": "17039811901", + "SIMPAYER_NAME": "payerfsp", + "SIMPLE_ROUTING_MODE_ENABLED": false, + "TESTFSP1_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2R3IuEDpqDtsS96emI0v\ndCJpeb/lnCxR2Nw5x6Z3GjC9PRFCJ2gsS2Zq70NaUQ5yWrrrZ9DZ8PjgCXqftUKG\n42uFsibLFpN09IjQuZCDuAkCdEjMgm+xies47ajRzl6evOc0ClkQBZVGybl9RAr6\nNRTFOYkYjJ0xS0MNkfRkDiOEu5BA/XKb5oLbyVMjGyvLgyS1g41x4fA+Ccb5PENa\nh9dqkFJ3j218Rs+bGytrVqrrCCjV1FiI+Y9YjKuTRRo7U/jcGHLfEc7YRcP2U9os\nxQxFvhHxR7W0e74fAU8B8YIJzwjaQvrEh9SJRc2IZsh6EdBAXXmbk4sHKyhoX0by\nUQIDAQAB\n-----END PUBLIC KEY-----\n", + "TESTFSP2_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv7k0Mqy0jSXFpHD9/a+Y\nl5djXq6HdyC+BsSA/sRKczEBKQyW8mEJVILAKkOibWzK7e+SJjQPbFjgqiUZvRI5\n+ggHkSJXEV28Bi2sF58A15sQjwaSkE2vBwLAL5GftSmao0QSozSfQ+RFw2N+loRG\nYedXZpRMsYFr1uA1qavcBjoj7JqPpID7UaTgXwwHWbV+j2uhQfotqRvOQ5KTmx5H\nJa+VjPu+xAC7mmcL+dxmeBpbJJD5Li8B8ggJXGJUk+En6XSIgZkQ6vKvC9HyasE6\nWZLXU+JJoCp2wkCPNTRxzPE2PGnlI0a4ZP2/y/2yacc4HQGBhEMc+SVT/VSZaMS+\nAQIDAQAB\n-----END PUBLIC KEY-----", + "TESTFSP1_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp1-backend:3003", + "TESTFSP1_CALLBACK_URL": "http://$release_name-sim-testfsp1-scheme-adapter:4000", + "TESTFSP1_SDK_TESTAPI_URL": "http://$release_name-sim-testfsp1-scheme-adapter:4002", + "TESTFSP1_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-testfsp1-scheme-adapter:4002", + "TESTFSP2_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp2-backend:3003", + "TESTFSP2_CALLBACK_URL": "http://$release_name-sim-testfsp2-scheme-adapter:4000", + "TESTFSP2_SDK_TESTAPI_URL": "http://$release_name-sim-testfsp2-scheme-adapter:4002", + "TESTFSP2_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-testfsp2-scheme-adapter:4002", + "TEST_NOTIFICATIONS": true, + "TTKFSP_JWS_KEY": "-----BEGIN PRIVATE KEY-----\n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\nDktFAP1w3ruycnE/t+/H8rDVJGPTHc8=\n-----END PRIVATE KEY-----\n", + "WS_ASSERTION_TIMEOUT": 5000, + "accept": "application/vnd.interoperability.parties+json;version=1.0", + "acceptParticipants": "application/vnd.interoperability.participants+json;version=1.0", + "acceptQuotes": "application/vnd.interoperability.quotes+json;version=1.0", + "acceptTransfers": "application/vnd.interoperability.transfers+json;version=1.0", + "accountId": "6", + "amount": "100", + "batchToIdValue1": "27713803066", + "batchToIdValue2": "27713803067", + "condition": "n2cwS3w4ekGlvNYoXg2uBAqssu3FCoXjADE2mziU5jU", + "contentTransfers": "application/vnd.interoperability.transfers+json;version=1.0", + "contentType": "application/vnd.interoperability.parties+json;version=1.0", + "contentTypeParticipants": "application/vnd.interoperability.participants+json;version=1.0", + "contentTypeQuotes": "application/vnd.interoperability.quotes+json;version=1.0", + "currency": "USD", + "currency2": "TZS", + "fromDOB": "1984-01-01", + "fromFirstName": "Firstname-Test", + "fromFspId": "testingtoolkitdfsp", + "fromIdType": "MSISDN", + "fromIdValue": "44123456789", + "fromLastName": "Lastname-Test", + "fspiopSignature": "{\"signature\":\"iU4GBXSfY8twZMj1zXX1CTe3LDO8Zvgui53icrriBxCUF_wltQmnjgWLWI4ZUEueVeOeTbDPBZazpBWYvBYpl5WJSUoXi14nVlangcsmu2vYkQUPmHtjOW-yb2ng6_aPfwd7oHLWrWzcsjTF-S4dW7GZRPHEbY_qCOhEwmmMOnE1FWF1OLvP0dM0r4y7FlnrZNhmuVIFhk_pMbEC44rtQmMFv4pm4EVGqmIm3eyXz0GkX8q_O1kGBoyIeV_P6RRcZ0nL6YUVMhPFSLJo6CIhL2zPm54Qdl2nVzDFWn_shVyV0Cl5vpcMJxJ--O_Zcbmpv6lxqDdygTC782Ob3CNMvg\\\",\\\"protectedHeader\\\":\\\"eyJhbGciOiJSUzI1NiIsIkZTUElPUC1VUkkiOiIvdHJhbnNmZXJzIiwiRlNQSU9QLUhUVFAtTWV0aG9kIjoiUE9TVCIsIkZTUElPUC1Tb3VyY2UiOiJPTUwiLCJGU1BJT1AtRGVzdGluYXRpb24iOiJNVE5Nb2JpbGVNb25leSIsIkRhdGUiOiIifQ\"}", + "fundsInPrepareAmount": "", + "fundsInPrepareTransferId": "", + "homeTransactionId": "123ABC", + "hubEmail": "some.email@gmail.com", + "hub_operator": "NOT_APPLICABLE", + "ilpPacket": "AYIDBQAAAAAAACcQJGcucGF5ZWVmc3AubXNpc2RuLnt7cmVjZWl2ZXJtc2lzZG59fYIC1GV5SjBjbUZ1YzJGamRHbHZia2xrSWpvaVptVXhNREU0Wm1NdE1EaGxZeTAwWWpJM0xUbGpZalF0TnpjMk9URTFNR00zT1dKaklpd2ljWFZ2ZEdWSlpDSTZJbVpsTVRBeE9HWmpMVEE0WldNdE5HSXlOeTA1WTJJMExUYzNOamt4TlRCak56bGlZeUlzSW5CaGVXVmxJanA3SW5CaGNuUjVTV1JKYm1adklqcDdJbkJoY25SNVNXUlVlWEJsSWpvaVRWTkpVMFJPSWl3aWNHRnlkSGxKWkdWdWRHbG1hV1Z5SWpvaWUzdHlaV05sYVhabGNrMVRTVk5FVG4xOUlpd2labk53U1dRaU9pSndZWGxsWldaemNDSjlmU3dpY0dGNVpYSWlPbnNpY0dGeWRIbEpaRWx1Wm04aU9uc2ljR0Z5ZEhsSlpGUjVjR1VpT2lKTlUwbFRSRTRpTENKd1lYSjBlVWxrWlc1MGFXWnBaWElpT2lJeU56Y3hNemd3TXprd05TSXNJbVp6Y0Vsa0lqb2ljR0Y1WlhKbWMzQWlmU3dpY0dWeWMyOXVZV3hKYm1adklqcDdJbU52YlhCc1pYaE9ZVzFsSWpwN0ltWnBjbk4wVG1GdFpTSTZJazFoZEhNaUxDSnNZWE4wVG1GdFpTSTZJa2hoWjIxaGJpSjlMQ0prWVhSbFQyWkNhWEowYUNJNklqRTVPRE10TVRBdE1qVWlmWDBzSW1GdGIzVnVkQ0k2ZXlKaGJXOTFiblFpT2lJeE1EQWlMQ0pqZFhKeVpXNWplU0k2SWxWVFJDSjlMQ0owY21GdWMyRmpkR2x2YmxSNWNHVWlPbnNpYzJObGJtRnlhVzhpT2lKVVVrRk9VMFpGVWlJc0ltbHVhWFJwWVhSdmNpSTZJbEJCV1VWU0lpd2lhVzVwZEdsaGRHOXlWSGx3WlNJNklrTlBUbE5WVFVWU0luMTkA", + "invalidFulfillment": "_3cco-YN5OGpRKVWV3n6x6uNpBTH9tYUdOYmHA-----", + "invalidToIdType": "ACCOUNT_ID", + "invalidToIdValue": "27713803099", + "mobileSimPayeeFsp": "greenbankfsp", + "mobileSimPayerFsp": "pinkbankfsp", + "note": "test", + "payeeIdType": "MSISDN", + "payeeIdentifier": "17039811902", + "payeefsp": "payeefsp", + "payeefspEmail": "some.email@gmail.com", + "payerIdType": "MSISDN", + "payerIdentifier": "17039811901", + "payerfsp": "testingtoolkitdfsp", + "payerfspEmail": "some.email@gmail.com", + "payerfspSettlementAccountBalanceAfterFundsIn": "", + "payerfspSettlementAccountBalanceBeforeFundsIn": "", + "payerfspSettlementAccountId": "", + "receiverMSISDN": "27713803912", + "testfsp1Email": "some.email@gmail.com", + "testfsp1IdType": "MSISDN", + "testfsp1Identifier": "17891239875", + "testfsp1MSISDN": "17891239875", + "testfsp2Email": "some.email@gmail.com", + "testfsp2IdType": "MSISDN", + "testfsp2Identifier": "17891239874", + "testfsp2MSISDN": "17891239874", + "toFspId": "payeefsp", + "toIdType": "MSISDN", + "toIdValue": "27713803912", + "toIdValueDelete": "27713803913", + "validCondition": "GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM", + "validCondition2": "kPLCKM62VY2jbekuw3apCTBg5zk_mVs9DD8-XpljQms", + "validFulfillment": "UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA", + "validIlpPacket2": "AYIC9AAAAAAAABdwHWcucGF5ZWVmc3AubXNpc2RuLjIyNTU2OTk5MTI1ggLKZXlKMGNtRnVjMkZqZEdsdmJrbGtJam9pWmpRMFltUmtOV010WXpreE1DMDBZVGt3TFRoa05qa3RaR0ppWVRaaVl6aGxZVFpqSWl3aWNYVnZkR1ZKWkNJNklqVTBaRFZtTURsaUxXRTBOMlF0TkRCa05pMWhZVEEzTFdFNVkyWXpZbUl5TkRsaFpDSXNJbkJoZVdWbElqcDdJbkJoY25SNVNXUkpibVp2SWpwN0luQmhjblI1U1dSVWVYQmxJam9pVFZOSlUwUk9JaXdpY0dGeWRIbEpaR1Z1ZEdsbWFXVnlJam9pTWpJMU5UWTVPVGt4TWpVaUxDSm1jM0JKWkNJNkluQmhlV1ZsWm5Od0luMTlMQ0p3WVhsbGNpSTZleUp3WVhKMGVVbGtTVzVtYnlJNmV5SndZWEowZVVsa1ZIbHdaU0k2SWsxVFNWTkVUaUlzSW5CaGNuUjVTV1JsYm5ScFptbGxjaUk2SWpJeU5UQTNNREE0TVRneElpd2labk53U1dRaU9pSndZWGxsY21aemNDSjlMQ0p3WlhKemIyNWhiRWx1Wm04aU9uc2lZMjl0Y0d4bGVFNWhiV1VpT25zaVptbHljM1JPWVcxbElqb2lUV0YwY3lJc0lteGhjM1JPWVcxbElqb2lTR0ZuYldGdUluMHNJbVJoZEdWUFprSnBjblJvSWpvaU1UazRNeTB4TUMweU5TSjlmU3dpWVcxdmRXNTBJanA3SW1GdGIzVnVkQ0k2SWpZd0lpd2lZM1Z5Y21WdVkza2lPaUpWVTBRaWZTd2lkSEpoYm5OaFkzUnBiMjVVZVhCbElqcDdJbk5qWlc1aGNtbHZJam9pVkZKQlRsTkdSVklpTENKcGJtbDBhV0YwYjNJaU9pSlFRVmxGVWlJc0ltbHVhWFJwWVhSdmNsUjVjR1VpT2lKRFQwNVRWVTFGVWlKOWZRAA", + "SIM3_NAME": "testfsp3", + "SIM4_NAME": "testfsp4", + "testfsp3MSISDN": "17891239873", + "SIM1_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp1-backend:3003", + "SIM2_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp2-backend:3003", + "SIM3_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp3-backend:3003", + "SIM4_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp4-backend:3003", + "settlementtestfsp2bankMSISDN": "27713813915", + "settlementtestfsp1bankMSISDN": "27713813914", + "testfsp4MSISDN": "17891239872", + "settlementtestfsp4bankMSISDN": "27713813917", + "payerMSISDN": "17891239876", + "settlementtestNonExistingMSISDN": "22244803917", + "settlementtestfsp3bankMSISDN": "27713813916", + "DELAY_CGS": 5000, + "huboperatoremail": "some.email@gmail.com", + "PAYERFSP_EMAIL": "some.email@gmail.com", + "MSISDN_ORACLE_ENDPOINT": "http://$release_name-simulator/oracle", + "NET_DEBIT_CAP": "50000", + "HOST_REGISTER_ORACLE": "http://$release_name-simulator", + "TESTFSP3_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp3-backend:3003", + "TESTFSP4_BACKEND_TESTAPI_URL": "http://$release_name-sim-testfsp4-backend:3003", + "payeefspMSISDN": "17039811907", + "payerfspMSISDN": "17891239876", + "settlementpayeefspNoExtensionMSISDN": "27714923918", + "TESTFSP3_CALLBACK_URL": "http://$release_name-sim-testfsp3-scheme-adapter:4000", + "TESTFSP4_CALLBACK_URL": "http://$release_name-sim-testfsp4-scheme-adapter:4000", + "NORESPONSE_NAME": "noresponsepayeefsp" + } + } ml-testing-toolkit-frontend: ingress: @@ -7310,11 +7600,11 @@ ml-ttk-posthook-setup: weight: -5 config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases - testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v12.1.0.zip + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v13.0.0.zip ## FOR_DEFERRED_SETTLEMENT - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-12.1.0/collections/hub/provisioning + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-13.0.0/collections/hub/provisioning ## FOR_CGS - # testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-12.1.0/collections/hub/provisioning_cgs + # testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-13.0.0/collections/hub/provisioning_cgs ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 testCaseEnvironmentFile: *ttkInputValues @@ -7327,9 +7617,9 @@ ml-ttk-posthook-tests: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl ## FOR_DEFERRED_SETTLEMENT - testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-12.1.0/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-13.0.0/collections/hub/golden_path ## FOR_CGS - # testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-12.1.0/collections/hub/golden_path_cgs + # testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-13.0.0/collections/hub/golden_path_cgs # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 diff --git a/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json b/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json index 0bbb0b1ff..91d38670c 100644 --- a/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json +++ b/monitoring/dashboards/mojaloop/dashboard-ml-adapter.json @@ -14,7 +14,7 @@ "type": "grafana", "id": "grafana", "name": "Grafana", - "version": "6.4.2" + "version": "7.1.1" }, { "type": "panel", @@ -75,6 +75,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -83,6 +90,7 @@ "x": 0, "y": 1 }, + "hiddenSeries": false, "id": 64, "legend": { "alignAsTable": true, @@ -99,11 +107,8 @@ "linewidth": 1, "links": [], "nullPointMode": "null as zero", - "options": { - "dataLinks": [] - }, "percentage": false, - "pluginVersion": "6.4.2", + "pluginVersion": "7.1.1", "pointradius": 2, "points": false, "renderer": "flot", @@ -209,6 +214,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": null, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -217,6 +229,7 @@ "x": 0, "y": 7 }, + "hiddenSeries": false, "hideTimeOverride": false, "id": 20, "interval": "", @@ -239,10 +252,8 @@ "linewidth": 1, "links": [], "nullPointMode": "null as zero", - "options": { - "dataLinks": [] - }, "percentage": true, + "pluginVersion": "7.1.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -353,6 +364,13 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -361,6 +379,7 @@ "x": 0, "y": 16 }, + "hiddenSeries": false, "id": 71, "legend": { "alignAsTable": true, @@ -381,10 +400,8 @@ "linewidth": 1, "links": [], "nullPointMode": "null as zero", - "options": { - "dataLinks": [] - }, "percentage": false, + "pluginVersion": "7.1.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -394,71 +411,81 @@ "steppedLine": false, "targets": [ { - "expr": "avg(rate(moja_transfer_prepare_sum{serviceName=\"ml-service\"}[30s]) / rate(moja_transfer_prepare_count{serviceName=\"ml-service\"}[30s]))", + "expr": "avg(rate(moja_transfer_prepare_sum{serviceName=\"ml-service\"}[30s]) >=0 / rate(moja_transfer_prepare_count{serviceName=\"ml-service\"}[30s]) >=0)", "format": "time_series", "hide": false, + "interval": "", "intervalFactor": 1, "legendFormat": "Transfer API Prepare - Average", "refId": "A" }, { - "expr": "avg(rate(moja_transfer_fulfil_sum{serviceName=\"ml-service\"}[30s]) / rate(moja_transfer_fulfil_count{serviceName=\"ml-service\"}[30s]))", + "expr": "avg(rate(moja_transfer_fulfil_sum{serviceName=\"ml-service\"}[30s]) >=0 / rate(moja_transfer_fulfil_count{serviceName=\"ml-service\"}[30s]) >=0)", "format": "time_series", "hide": false, + "interval": "", "intervalFactor": 1, "legendFormat": "Transfer API Fulfil - Average", "refId": "B" }, { - "expr": "avg(rate(moja_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[30s]) / rate(moja_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[30s])) by (action, status, success)", + "expr": "avg(rate(moja_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[30s]) >=0 / rate(moja_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[30s]) >=0) by (action, status, success)", "hide": false, + "interval": "", "legendFormat": "Notification Deliveries - {{action}} - {{status}} - success:{{success}}", "refId": "F" }, { - "expr": "avg(rate(moja_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[30s]) / rate(moja_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[30s])) by (kubernetes_pod_name, action, status, success)", + "expr": "avg(rate(moja_notification_event_delivery_sum{serviceName=\"ml-handler-notification\"}[30s]) >=0 / rate(moja_notification_event_delivery_count{serviceName=\"ml-handler-notification\"}[30s]) >=0) by (kubernetes_pod_name, action, status, success)", "hide": true, "instant": false, + "interval": "", "legendFormat": "Notification Deliveries - {{kubernetes_pod_name}} - {{action}} - {{status}} - success:{{success}}", "refId": "E" }, { - "expr": "avg(rate(moja_tx_transfer_sum[30s]) / rate(moja_tx_transfer_count[30s])) by (success)", + "expr": "avg(rate(moja_tx_transfer_sum[30s]) >=0 / rate(moja_tx_transfer_count[30s]) >=0) by (success)", "hide": true, + "interval": "", "legendFormat": "moja_tx_transfer - success:{{success}}", "refId": "I" }, { - "expr": "avg(rate(moja_tx_transfer_prepare_sum[30s]) / rate(moja_tx_transfer_prepare_count[30s])) by (success)", + "expr": "avg(rate(moja_tx_transfer_prepare_sum[30s]) >=0 / rate(moja_tx_transfer_prepare_count[30s]) >=0) by (success)", "hide": true, + "interval": "", "legendFormat": "moja_tx_transfer_prepare - success:{{success}}", "refId": "J" }, { - "expr": "avg(rate(moja_tx_transfer_fulfil_sum[30s]) / rate(moja_tx_transfer_fulfil_count[30s])) by (success)", + "expr": "avg(rate(moja_tx_transfer_fulfil_sum[30s])>=0 / rate(moja_tx_transfer_fulfil_count[30s])>=0) by (success)", "hide": true, + "interval": "", "legendFormat": "moja_tx_transfer_fulfil - success:{{success}}", "refId": "K" }, { - "expr": "avg(rate(moja_tx_transfer_sum[30s]) / irate(moja_tx_transfer_count[30s]))", + "expr": "avg(rate(moja_tx_transfer_sum[30s]) >=0 / irate(moja_tx_transfer_count[30s]) >=0)", + "interval": "", "legendFormat": "moja_tx_transfer - avg", "refId": "L" }, { - "expr": "avg(rate(moja_tx_transfer_prepare_sum[30s]) / rate(moja_tx_transfer_prepare_count[30s]))", + "expr": "avg(rate(moja_tx_transfer_prepare_sum[30s]) >=0 / rate(moja_tx_transfer_prepare_count[30s]) >=0)", "interval": "", "legendFormat": "moja_tx_transfer_prepare - avg", "refId": "M" }, { - "expr": "avg(rate(moja_tx_transfer_fulfil_sum[30s]) / rate(moja_tx_transfer_fulfil_count[30s]))", + "expr": "avg(rate(moja_tx_transfer_fulfil_sum[30s])>=0 / rate(moja_tx_transfer_fulfil_count[30s]) >=0)", + "interval": "", "legendFormat": "moja_tx_transfer_fulfil - avg", "refId": "N" } ], "thresholds": [ { + "$$hashKey": "object:112", "colorMode": "critical", "fill": true, "fillColor": "rgba(50, 116, 217, 0.2)", @@ -488,6 +515,7 @@ }, "yaxes": [ { + "$$hashKey": "object:87", "decimals": null, "format": "s", "label": null, @@ -497,6 +525,7 @@ "show": true }, { + "$$hashKey": "object:88", "format": "short", "label": null, "logBase": 1, @@ -535,6 +564,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Financial Transfers / Sec", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "ops", "gauge": { "maxValue": 100, @@ -566,7 +601,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -586,7 +620,7 @@ "ymax": null, "ymin": null }, - "tableColumn": "", + "tableColumn": "Financial Transfers / sec", "targets": [ { "expr": "sum(irate(moja_tx_transfer_count[30s]))", @@ -621,6 +655,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Financial Prepares / sec", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "ops", "gauge": { "maxValue": 100, @@ -652,7 +692,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -672,7 +711,7 @@ "ymax": null, "ymin": null }, - "tableColumn": "", + "tableColumn": "Transfers / Sec", "targets": [ { "expr": "sum(irate(moja_tx_transfer_prepare_count[30s]))", @@ -707,6 +746,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Financial Fulils / sec", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "ops", "gauge": { "maxValue": 100, @@ -738,7 +783,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -758,7 +802,7 @@ "ymax": null, "ymin": null }, - "tableColumn": "", + "tableColumn": "Financial Fulfils / sec", "targets": [ { "expr": "sum(irate(moja_tx_transfer_fulfil_count[30s]))", @@ -793,6 +837,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Transfers API Prepares / sec", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "ops", "gauge": { "maxValue": 100, @@ -824,7 +874,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -842,7 +891,7 @@ "lineColor": "rgb(31, 120, 193)", "show": false }, - "tableColumn": "", + "tableColumn": "Transfers Prepare / sec", "targets": [ { "expr": "sum(irate(moja_transfer_prepare_count{serviceName=\"ml-service\"}[120s]))", @@ -878,6 +927,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Transfers API Fullfills / sec", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "ops", "gauge": { "maxValue": 100, @@ -909,7 +964,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -961,6 +1015,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Notification Events / Sec", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "ops", "gauge": { "maxValue": 100, @@ -992,7 +1052,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -1010,7 +1069,7 @@ "lineColor": "rgb(31, 120, 193)", "show": false }, - "tableColumn": "", + "tableColumn": "Notification Events / sec", "targets": [ { "expr": "sum(irate(moja_notification_event_count{serviceName=\"ml-handler-notification\"}[120s]))", @@ -1045,6 +1104,12 @@ ], "datasource": "${DS_PROMETHEUS}", "description": "Financial Transfers 95th Quantile", + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "none", "gauge": { "maxValue": 100, @@ -1076,7 +1141,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -1130,6 +1194,12 @@ ], "datasource": "${DS_PROMETHEUS}", "decimals": 2, + "fieldConfig": { + "defaults": { + "custom": {} + }, + "overrides": [] + }, "format": "percentunit", "gauge": { "maxValue": 100, @@ -1161,7 +1231,6 @@ "maxDataPoints": 100, "nullPointMode": "connected", "nullText": null, - "options": {}, "postfix": "", "postfixFontSize": "50%", "prefix": "", @@ -1224,6 +1293,13 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "description": "ML API Lag by Consumer Group", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { @@ -1232,6 +1308,7 @@ "x": 0, "y": 30 }, + "hiddenSeries": false, "id": 44, "legend": { "alignAsTable": true, @@ -1250,10 +1327,8 @@ "linewidth": 1, "links": [], "nullPointMode": "null as zero", - "options": { - "dataLinks": [] - }, "percentage": false, + "pluginVersion": "7.1.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -1709,7 +1784,7 @@ "type": "row" }, { - "collapsed": false, + "collapsed": true, "datasource": "${DS_PROMETHEUS}", "gridPos": { "h": 1, @@ -1718,225 +1793,237 @@ "y": 36 }, "id": 75, - "panels": [], - "title": "Errors", - "type": "row" - }, - { - "aliasColors": {}, - "bars": false, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 13, - "x": 0, - "y": 37 - }, - "id": 48, - "legend": { - "alignAsTable": true, - "avg": true, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": true, - "min": true, - "rightSide": false, - "show": true, - "total": true, - "values": true - }, - "lines": true, - "linewidth": 1, - "nullPointMode": "null", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum_over_time(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[$__interval]) by (app, success, error)", - "hide": true, - "legendFormat": "{{error}}", - "refId": "A" - }, - { - "expr": "sum(rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[30s])) by (app, success, error)", - "hide": false, - "legendFormat": "{{error}}", - "refId": "B" - }, - { - "expr": "sum(rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[30s])) by (app, success, error, kubernetes_pod_name)", - "hide": true, - "legendFormat": "{{kubernetes_pod_name}} - {{error}}", - "refId": "C" - }, - { - "expr": "rate(moja_notification_event_sum{serviceName=\"ml-handler-notification\", success!='true'}[30s]) / rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[30s])", - "hide": true, - "refId": "D" - }, - { - "expr": "rate(moja_notification_event_sum{serviceName=\"ml-handler-notification\", success!='false'}[30s]) / rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='false'}[30s])", - "hide": true, - "refId": "E" - }, - { - "expr": "sum(rate(moja_tx_transfer_bucket[30s])) by (le)", - "hide": true, - "refId": "F" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "ML-API- Notification Handler Error Rate", - "tooltip": { - "shared": true, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "time", - "name": null, - "show": true, - "values": [] - }, - "yaxes": [ - { - "format": "s", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true - }, - { - "format": "short", - "label": "", - "logBase": 1, - "max": null, - "min": null, - "show": true - } - ], - "yaxis": { - "align": false, - "alignLevel": null - } - }, - { - "aliasColors": {}, - "bars": true, - "cacheTimeout": null, - "dashLength": 10, - "dashes": false, - "datasource": "${DS_PROMETHEUS}", - "description": "Total Notification Handler Errors for range ", - "fill": 1, - "fillGradient": 0, - "gridPos": { - "h": 6, - "w": 11, - "x": 13, - "y": 37 - }, - "id": 68, - "legend": { - "alignAsTable": true, - "avg": false, - "current": true, - "hideEmpty": true, - "hideZero": true, - "max": false, - "min": false, - "rightSide": false, - "show": true, - "total": false, - "values": true - }, - "lines": false, - "linewidth": 1, - "links": [], - "nullPointMode": "null as zero", - "options": { - "dataLinks": [] - }, - "percentage": false, - "pluginVersion": "6.4.2", - "pointradius": 2, - "points": false, - "renderer": "flot", - "seriesOverrides": [], - "spaceLength": 10, - "stack": false, - "steppedLine": false, - "targets": [ - { - "expr": "sum(increase(moja_notification_event_bucket{le=\"+Inf\", serviceName=\"ml-handler-notification\", success!='true'}[${__range_s}s])) by (app, success, error)", - "format": "time_series", - "instant": false, - "legendFormat": "{{error}}", - "refId": "B" - } - ], - "thresholds": [], - "timeFrom": null, - "timeRegions": [], - "timeShift": null, - "title": "Total Notification Handler Errors for range ", - "tooltip": { - "shared": false, - "sort": 0, - "value_type": "individual" - }, - "type": "graph", - "xaxis": { - "buckets": null, - "mode": "series", - "name": null, - "show": true, - "values": [ - "current" - ] - }, - "yaxes": [ + "panels": [ { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": "0", - "show": true + "aliasColors": {}, + "bars": false, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 13, + "x": 0, + "y": 37 + }, + "hiddenSeries": false, + "id": 48, + "legend": { + "alignAsTable": true, + "avg": true, + "current": true, + "hideEmpty": true, + "hideZero": true, + "max": true, + "min": true, + "rightSide": false, + "show": true, + "total": true, + "values": true + }, + "lines": true, + "linewidth": 1, + "nullPointMode": "null", + "percentage": false, + "pluginVersion": "7.1.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum_over_time(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[$__interval]) by (app, success, error)", + "hide": true, + "legendFormat": "{{error}}", + "refId": "A" + }, + { + "expr": "sum(rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[30s])) by (app, success, error)", + "hide": false, + "legendFormat": "{{error}}", + "refId": "B" + }, + { + "expr": "sum(rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[30s])) by (app, success, error, kubernetes_pod_name)", + "hide": true, + "legendFormat": "{{kubernetes_pod_name}} - {{error}}", + "refId": "C" + }, + { + "expr": "rate(moja_notification_event_sum{serviceName=\"ml-handler-notification\", success!='true'}[30s]) / rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='true'}[30s])", + "hide": true, + "refId": "D" + }, + { + "expr": "rate(moja_notification_event_sum{serviceName=\"ml-handler-notification\", success!='false'}[30s]) / rate(moja_notification_event_count{serviceName=\"ml-handler-notification\", success!='false'}[30s])", + "hide": true, + "refId": "E" + }, + { + "expr": "sum(rate(moja_tx_transfer_bucket[30s])) by (le)", + "hide": true, + "refId": "F" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "ML-API- Notification Handler Error Rate", + "tooltip": { + "shared": true, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "time", + "name": null, + "show": true, + "values": [] + }, + "yaxes": [ + { + "format": "s", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": "", + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } }, { - "format": "short", - "label": null, - "logBase": 1, - "max": null, - "min": null, - "show": true + "aliasColors": {}, + "bars": true, + "cacheTimeout": null, + "dashLength": 10, + "dashes": false, + "datasource": "${DS_PROMETHEUS}", + "description": "Total Notification Handler Errors for range ", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, + "fill": 1, + "fillGradient": 0, + "gridPos": { + "h": 6, + "w": 11, + "x": 13, + "y": 37 + }, + "hiddenSeries": false, + "id": 68, + "legend": { + "alignAsTable": true, + "avg": false, + "current": true, + "hideEmpty": true, + "hideZero": true, + "max": false, + "min": false, + "rightSide": false, + "show": true, + "total": false, + "values": true + }, + "lines": false, + "linewidth": 1, + "links": [], + "nullPointMode": "null as zero", + "percentage": false, + "pluginVersion": "7.1.1", + "pointradius": 2, + "points": false, + "renderer": "flot", + "seriesOverrides": [], + "spaceLength": 10, + "stack": false, + "steppedLine": false, + "targets": [ + { + "expr": "sum(increase(moja_notification_event_bucket{le=\"+Inf\", serviceName=\"ml-handler-notification\", success!='true'}[${__range_s}s])) by (app, success, error)", + "format": "time_series", + "instant": false, + "legendFormat": "{{error}}", + "refId": "B" + } + ], + "thresholds": [], + "timeFrom": null, + "timeRegions": [], + "timeShift": null, + "title": "Total Notification Handler Errors for range ", + "tooltip": { + "shared": false, + "sort": 0, + "value_type": "individual" + }, + "type": "graph", + "xaxis": { + "buckets": null, + "mode": "series", + "name": null, + "show": true, + "values": [ + "current" + ] + }, + "yaxes": [ + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": "0", + "show": true + }, + { + "format": "short", + "label": null, + "logBase": 1, + "max": null, + "min": null, + "show": true + } + ], + "yaxis": { + "align": false, + "alignLevel": null + } } ], - "yaxis": { - "align": false, - "alignLevel": null - } + "title": "Errors", + "type": "row" }, { "collapsed": true, @@ -1945,7 +2032,7 @@ "h": 1, "w": 24, "x": 0, - "y": 43 + "y": 37 }, "id": 30, "panels": [ @@ -2224,7 +2311,7 @@ "h": 1, "w": 24, "x": 0, - "y": 44 + "y": 38 }, "id": 28, "panels": [ @@ -2453,7 +2540,7 @@ "h": 1, "w": 24, "x": 0, - "y": 45 + "y": 39 }, "id": 34, "panels": [], @@ -2467,14 +2554,22 @@ "dashes": false, "datasource": "${DS_PROMETHEUS}", "decimals": 0, + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 4, "w": 24, "x": 0, - "y": 46 + "y": 40 }, + "hiddenSeries": false, "id": 18, "legend": { "alignAsTable": true, @@ -2494,10 +2589,8 @@ "linewidth": 1, "links": [], "nullPointMode": "null", - "options": { - "dataLinks": [] - }, "percentage": false, + "pluginVersion": "7.1.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -2568,14 +2661,22 @@ "dashLength": 10, "dashes": false, "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "custom": {}, + "links": [] + }, + "overrides": [] + }, "fill": 1, "fillGradient": 0, "gridPos": { "h": 7, "w": 24, "x": 0, - "y": 50 + "y": 44 }, + "hiddenSeries": false, "id": 10, "legend": { "avg": false, @@ -2590,10 +2691,8 @@ "linewidth": 1, "links": [], "nullPointMode": "null", - "options": { - "dataLinks": [] - }, "percentage": false, + "pluginVersion": "7.1.1", "pointradius": 5, "points": false, "renderer": "flot", @@ -2652,20 +2751,19 @@ } } ], - "refresh": "", - "schemaVersion": 20, + "refresh": false, + "schemaVersion": 26, "style": "dark", "tags": [], "templating": { "list": [] }, "time": { - "from": "now-15m", - "to": "now" + "from": "2021-04-08T15:59:39.654Z", + "to": "2021-04-08T16:02:37.098Z" }, "timepicker": { "refresh_intervals": [ - "5s", "10s", "30s", "1m", @@ -2691,5 +2789,5 @@ "timezone": "", "title": "Mojaloop - ML-API", "uid": "5z9mkZ-msa", - "version": 121 + "version": 3 } \ No newline at end of file diff --git a/quoting-service/Chart.yaml b/quoting-service/Chart.yaml index f58d3be2e..471ed96bf 100644 --- a/quoting-service/Chart.yaml +++ b/quoting-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Quoting-Service Helm chart for Kubernetes name: quoting-service -version: 11.1.0 -appVersion: "11.2.2" +version: 12.0.0 +appVersion: "12.0.6" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index 5a746d0d8..84fd0d9e3 100644 --- a/quoting-service/values.yaml +++ b/quoting-service/values.yaml @@ -8,7 +8,7 @@ global: {} replicaCount: 1 image: repository: mojaloop/quoting-service - tag: v11.2.2 + tag: v12.0.6 pullPolicy: IfNotPresent readinessProbe: @@ -41,7 +41,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: diff --git a/simulator/Chart.yaml b/simulator/Chart.yaml index 9268a7f78..b9d34cb1b 100644 --- a/simulator/Chart.yaml +++ b/simulator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 description: Simulator Helm Chart for Simultors name: simulator -version: 11.0.1 -appVersion: "11.1.0" +version: 11.0.2 +appVersion: "11.1.2" diff --git a/simulator/values.yaml b/simulator/values.yaml index fd9a476fc..63618305d 100644 --- a/simulator/values.yaml +++ b/simulator/values.yaml @@ -6,7 +6,7 @@ replicaCount: 1 image: repository: mojaloop/simulator - tag: v11.1.0 + tag: v11.1.2 pullPolicy: IfNotPresent imagePullSecrets: [] diff --git a/transaction-requests-service/Chart.yaml b/transaction-requests-service/Chart.yaml index 2df78dc47..d59b9358a 100644 --- a/transaction-requests-service/Chart.yaml +++ b/transaction-requests-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Transaction-Requests-Service Helm chart for Kubernetes name: transaction-requests-service -version: 11.0.1 -appVersion: "11.1.4" +version: 11.0.2 +appVersion: "11.1.5" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/transaction-requests-service/values.yaml b/transaction-requests-service/values.yaml index 99c2c1141..678c762e7 100644 --- a/transaction-requests-service/values.yaml +++ b/transaction-requests-service/values.yaml @@ -8,7 +8,7 @@ global: {} replicaCount: 1 image: repository: mojaloop/transaction-requests-service - tag: v11.1.4 + tag: v11.1.5 pullPolicy: IfNotPresent command: '["node", "src/index.js", "api"]' @@ -42,7 +42,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v11.0.0 + tag: v11.0.1 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: