Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update central-settlement charts #479

Merged
merged 6 commits into from
Jul 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .changelog/release-v14.0.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ For breaking changes, please review the section `#4` "Breaking Changes" below.
## 1. New Features

1. Change the basis for the liquidity check ([mojaloop/design-authority-project/issues/90](https://github.com/mojaloop/design-authority-project/issues/90)). Pull requests are [mojaloop/central-ledger/pull/899](https://github.com/mojaloop/central-ledger/pull/899) & [mojaloop/central-ledger/pull/901](https://github.com/mojaloop/central-ledger/pull/901)
2. **mojaloop/#2092:** upgrade nodeJS version for core services ([ml-api-adapter/#501](https://github.com/mojaloop/ml-api-adapter/pull/501)) ([central-ledger/#902](https://github.com/mojaloop/central-ledger/issues/902)) ([account-lookup/#445](https://github.com/mojaloop/account-lookup-service/pull/445)) ([quoting-service/#302](https://github.com/mojaloop/quoting-service/pull/302)) ([sdk-scheme-adapter/pull/319](https://github.com/mojaloop/sdk-scheme-adapter/pull/319)) ([sdk-standard-components/#168](https://github.com/mojaloop/sdk-standard-components/pull/168)) ([auth-svc/#116](https://github.com/mojaloop/auth-service/issues/116)) ([als-consent/#13](https://github.com/mojaloop/als-consent-oracle/issues/13)) ([thirdparty-api-svc/#82](https://github.com/mojaloop/thirdparty-api-svc/issues/82)) ([thirdparty-sdk/#142](https://github.com/mojaloop/thirdparty-sdk/issues/142)) ([simulator/pull/243](https://github.com/mojaloop/simulator/pull/243)) ([mojaloop-simulator/pull/145](https://github.com/mojaloop/mojaloop-simulator/pull/145)) ([bulk-api-adapter/pull/82](https://github.com/mojaloop/bulk-api-adapter/pull/82)) ([event-sdk/pull/67](https://github.com/mojaloop/event-sdk/pull/67)) ([transaction-requests-service/pull/90](https://github.com/mojaloop/transaction-requests-service/pull/90)), closes [mojaloop/#2092](https://github.com/mojaloop/project/issues/2092)
2. **mojaloop/#2092:** upgrade nodeJS version for core services ([ml-api-adapter/#501](https://github.com/mojaloop/ml-api-adapter/pull/501)) ([central-ledger/#902](https://github.com/mojaloop/central-ledger/issues/902)) ([account-lookup/#445](https://github.com/mojaloop/account-lookup-service/pull/445)) ([quoting-service/#302](https://github.com/mojaloop/quoting-service/pull/302)) ([sdk-scheme-adapter/pull/319](https://github.com/mojaloop/sdk-scheme-adapter/pull/319)) ([sdk-standard-components/#168](https://github.com/mojaloop/sdk-standard-components/pull/168)) ([auth-svc/#116](https://github.com/mojaloop/auth-service/issues/116)) ([als-consent/#13](https://github.com/mojaloop/als-consent-oracle/issues/13)) ([thirdparty-api-svc/#82](https://github.com/mojaloop/thirdparty-api-svc/issues/82)) ([thirdparty-sdk/#142](https://github.com/mojaloop/thirdparty-sdk/issues/142)) ([simulator/pull/243](https://github.com/mojaloop/simulator/pull/243)) ([mojaloop-simulator/pull/145](https://github.com/mojaloop/mojaloop-simulator/pull/145)) ([bulk-api-adapter/pull/82](https://github.com/mojaloop/bulk-api-adapter/pull/82)) ([event-sdk/pull/67](https://github.com/mojaloop/event-sdk/pull/67)) ([transaction-requests-service/pull/90](https://github.com/mojaloop/transaction-requests-service/pull/90)) ([central-settlement/pull/381](https://github.com/mojaloop/central-settlement/pull/381)), closes [mojaloop/#2092](https://github.com/mojaloop/project/issues/2092)
3. **sdk-scheme-adapter:** add extensionList to quote request/response ([#269](https://github.com/mojaloop/sdk-scheme-adapter/issues/269)) ([9cbed66](https://github.com/mojaloop/sdk-scheme-adapter/commit/9cbed66f0db4190f2f34cd7ba3d531a8bbb95d79))
4. **sdk-scheme-adapter:** proper response schema for post /authorization sync response ([#270](https://github.com/mojaloop/sdk-scheme-adapter/issues/270)) ([6535c1d](https://github.com/mojaloop/sdk-scheme-adapter/commit/6535c1de145ff58db48bc5be61dae9b0133786d8))
5. **mojaloop/#2264:** add more robust header validation for inbound server ([#278](https://github.com/mojaloop/sdk-scheme-adapter/issues/278)) ([9ea24d7](https://github.com/mojaloop/sdk-scheme-adapter/commit/9ea24d748ccd58fdfb30c77e98b021aa6a607b4f)), closes [#2264](https://github.com/mojaloop/sdk-scheme-adapter/issues/2264)
Expand Down Expand Up @@ -53,7 +53,7 @@ sdk-scheme-adapter/issues/2478)
2. central-ledger: v13.16.1 -> **v15.1.2**
3. account-lookup-service: v13.0.0 -> **v14.0.0**
4. quoting-service: v14.0.0 -> **15.0.2**
5. central-settlement: **13.4.1**
5. central-settlement: 13.4.1 -> **v14.0.0**
6. central-event-processor: **v11.0.2**
7. bulk-api-adapter: v13.0.1 -> **v14.0.0**
8. email-notifier: **v11.0.2**
Expand Down Expand Up @@ -81,7 +81,7 @@ sdk-scheme-adapter/issues/2478)
2. central-ledger - https://github.com/mojaloop/central-ledger/releases/tag/v15.1.0
3. account-lookup-service - https://github.com/mojaloop/account-lookup-service/releases/tag/v14.0.0
4. quoting-service - https://github.com/mojaloop/quoting-service/releases/tag/v15.0.2
5. central-settlement- https://github.com/mojaloop/central-settlement/releases/tag/v13.4.1
5. central-settlement- https://github.com/mojaloop/central-settlement/releases/tag/v14.0.0
6. central-event-processor - https://github.com/mojaloop/central-event-processor/releases/tag/v11.0.2
7. bulk-api-adapter - https://github.com/mojaloop/bulk-api-adapter/releases/tag/v14.0.0
8. email-notifier - https://github.com/mojaloop/email-notifier/releases/tag/v12.0.2
Expand Down Expand Up @@ -109,7 +109,7 @@ _Note: Apart from `Thirdparty-api specification`, below changes are breaking for

1. **Central Ledger:** Transfer will be successful only if the payer has sufficient liquidity in their settlement account balance over and above their NET-DEBIT-CAP (NDC) limit. This is the additional check that has been added in this PR, and will be applied to the lower value. Error messages have changed as a result. For NDC limit check from `PAYER_FSP_INSUFFICIENT_LIQUIDITY` to `PAYER_LIMIT_ERROR`. The error message `PAYER_FSP_INSUFFICIENT_LIQUIDITY` occurs when the payer has an insufficient settlement account balance. [mojaloop/central-ledger/pull/899](https://github.com/mojaloop/central-ledger/pull/899)

2. **mojaloop/#2092:** Major version bump for node v16 LTS support, re-structuring of project directories to align to core Mojaloop repositories with docker image now using `/opt/app` instead of `/opt/central-ledger`, `opt/account-lookup-service`, `opt/ml-api-adapter`, `/opt/quoting-service`, `/opt/bulk-api-adapter`, `/opt/transaction-requests-service` which will impact config mounts.
2. **mojaloop/#2092:** Major version bump for node v16 LTS support, re-structuring of project directories to align to core Mojaloop repositories with docker image now using `/opt/app` instead of `/opt/central-ledger`, `opt/account-lookup-service`, `opt/ml-api-adapter`, `/opt/quoting-service`, `/opt/bulk-api-adapter`, `/opt/transaction-requests-service`, `/opt/central-settlement` which will impact config mounts.

3. **Mongodb dependency charts:** have been upgraded due to Bitnami's [retention policy](https://github.com/bitnami/charts/issues/10539). This impacts the following components: `central-event-processor`, `ml-testing-toolkit` (only when enabled), `bulk-api-adapter`.

Expand Down
2 changes: 1 addition & 1 deletion central/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1
description: Central Helm chart for Kubernetes
name: central
version: 14.0.0
appVersion: "central-ledger: v15.1.2; central-settlement: v13.4.1; central-event-processor: v11.0.2"
appVersion: "central-ledger: v15.1.2; central-settlement: v14.0.0; central-event-processor: v11.0.2"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
2 changes: 1 addition & 1 deletion central/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
repository: "file://../centralledger"
condition: centralledger.enabled
- name: centralsettlement
version: 13.0.2
version: 14.0.0
repository: "file://../centralsettlement"
condition: centralsettlement.enabled
- name: centraleventprocessor
Expand Down
26 changes: 13 additions & 13 deletions central/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,7 @@ centralledger:
timeout:
expiration: '*/15 * * * * *'
timezone: UTC

## 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'
Expand Down Expand Up @@ -1935,7 +1935,7 @@ centralsettlement:
api:
image:
repository: mojaloop/central-settlement
tag: v13.4.1
tag: v14.0.0
pullPolicy: IfNotPresent
command: '["node", "src/api/index.js"]'
service:
Expand Down Expand Up @@ -2225,7 +2225,7 @@ centralsettlement:
api:
image:
repository: mojaloop/central-settlement
tag: v13.4.1
tag: v14.0.0
pullPolicy: IfNotPresent
command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]'
service:
Expand Down Expand Up @@ -2514,15 +2514,15 @@ centralsettlement:
# memory: 128Mi

centralsettlement-handler-grosssettlement:
## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing.
## 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.4.1
tag: v14.0.0
pullPolicy: IfNotPresent
command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]'
service:
Expand Down Expand Up @@ -2811,15 +2811,15 @@ centralsettlement:
# memory: 128Mi

centralsettlement-handler-rules:
## Enable this handler if you wish to support Continuous Gross Settlement (CGS) and rule processing.
## 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.4.1
tag: v14.0.0
pullPolicy: IfNotPresent
command: '["node", "src/handlers/index.js", "h", "--rules"]'
service:
Expand Down Expand Up @@ -3040,12 +3040,12 @@ centralsettlement:
truncate_extensions: true

rules:
## The rules object defines rules files represented as key-value pairs. These rules will be executed per commited transfer.
## 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
## nameOfFile.js: fileContents
## See below example of interchange fee rule.

## Default Empty Script - This is required as the rule engine requires a rule-file to function properly.
## 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: |
# // ********************************************************
Expand Down Expand Up @@ -3111,9 +3111,9 @@ centralsettlement:
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.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' &&
Expand Down
4 changes: 2 additions & 2 deletions centralsettlement/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: Central-Settlement Helm chart for Kubernetes
name: centralsettlement
version: 13.0.2
appVersion: "13.4.1"
version: 14.0.0
appVersion: "v14.0.0"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
4 changes: 2 additions & 2 deletions centralsettlement/chart-service/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v1
description: Central-Settlement helm chart for API services and handlers
name: centralsettlement-service
version: 13.0.1
appVersion: "13.4.1"
version: 14.0.0
appVersion: "v14.0.0"
home: http://mojaloop.io
icon: http://mojaloop.io/images/logo.png
sources:
Expand Down
6 changes: 3 additions & 3 deletions centralsettlement/chart-service/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ spec:
initialDelaySeconds: {{ .Values.containers.api.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.containers.api.livenessProbe.periodSeconds }}
{{- end }}
env:
env:
- name: LOG_LEVEL
value: {{ .Values.config.log_level }}
- name: CSL_LOG_TRANSPORT
Expand All @@ -121,9 +121,9 @@ spec:
value: {{ .Values.config.event_traceid_per_vendor | quote }}
volumeMounts:
- name: {{ template "centralsettlement-service.fullname" . }}-cfg-vol
mountPath: /opt/central-settlement/config
mountPath: /opt/app/config
- name: {{ template "centralsettlement-service.fullname" . }}-rules-vol
mountPath: "/opt/central-settlement/{{ .Values.config.handlers.settings.scripts_folder }}"
mountPath: "/opt/app/{{ .Values.config.handlers.settings.scripts_folder }}"
{{- if .Values.sidecar.enabled }}
- name: {{ template "centralsettlement-service.name" . }}-sidecar
image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
Expand Down
8 changes: 4 additions & 4 deletions centralsettlement/chart-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ containers:
api:
image:
repository: mojaloop/central-settlement
tag: v13.4.1
tag: v14.0.0
pullPolicy: IfNotPresent
command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]'
service:
Expand Down Expand Up @@ -237,11 +237,11 @@ config:
truncate_extensions: true

rules: {}
## The rules object defines rules files represented as key-value pairs. These rules will be executed per commited transfer.
## 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
## nameOfFile.js: fileContents
## See below example of interchange fee rule.

# interchangeFeeCalculation.js: |
# /* eslint-disable no-undef */
# // ********************************************************
Expand Down
8 changes: 4 additions & 4 deletions centralsettlement/requirements.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ dependencies:
# repository: https://charts.helm.sh/stable
# condition: postgresql.enabled
- name: centralsettlement-service
version: 13.0.1
version: 14.0.0
repository: "file://./chart-service"
alias: centralsettlement-service
condition: centralsettlement-service.enabled
- name: centralsettlement-service
version: 13.0.1
version: 14.0.0
repository: "file://./chart-service"
alias: centralsettlement-handler-deferredsettlement
condition: centralsettlement-handler-deferredsettlement.enabled
- name: centralsettlement-service
version: 13.0.1
version: 14.0.0
repository: "file://./chart-service"
alias: centralsettlement-handler-grosssettlement
condition: centralsettlement-handler-grosssettlement.enabled
- name: centralsettlement-service
version: 13.0.1
version: 14.0.0
repository: "file://./chart-service"
alias: centralsettlement-handler-rules
condition: centralsettlement-handler-rules.enabled
Expand Down
Loading