diff --git a/.changelog/release-v13.0.1.md b/.changelog/release-v13.0.1.md new file mode 100644 index 000000000..25accab72 --- /dev/null +++ b/.changelog/release-v13.0.1.md @@ -0,0 +1,138 @@ +## Helm release notes +1. GitHub issue: https://github.com/mojaloop/project/issues/2343 +2. For breaking changes, please review the section `#7` "Breaking Changes" below. +3. Revisions: + +Date | Revision | Description +---------|----------|--------- + 2021-08-03 | 0 | Initial release - https://github.com/mojaloop/helm/pull/443 + +### 1. Maintenance updates + +1. feat(#2343): helm v13.0.1 release: + * Patch bump to Mojaloop Helm Charts + * Patch Bump to Central-Settlements + * Updated Central-Settlements from 13.2.0 to 13.4.1 + * Bump to Account-Lookup-Service + * Updated Account-Lookup-Service from 11.5.3 to 11.7.0 + * Bump to Testing-Toolkit Charts + * Updated Testing-Toolkit-Backend from 12.4.2 to 13.2.1 + * Updated Testing-Toolkit-UI from 12.4.2 to 13.2.1 + * Updated Testing-Toolkit-CLI from 12.4.2 to 13.2.1 + +2. Testing-Toolkit + * Provisioned new APIs (https://github.com/mojaloop/project/issues/2336) + * Central Admin API v1.0 + * Central Settlements API v2.0 + * SDK Outbound Scheme Adapter API v1.0 + * Refined callback rules + * Added Test-case definition generation functionality (https://github.com/mojaloop/project/issues/2237) + * Improvements in mobile simulator page with settlement related additions to support Deferred Multilateral Net Settlement (DMLNS) and Continuous Gross Settlement (CGS)demos + +### 2. New Features + +1. Modify switch behaviour on receipt of a GET /parties message to avoid problems with duplicates (https://github.com/mojaloop/design-authority-project/issues/79) + +### 3. Bug Fixes + +1. TTK Tests is using hard-coded USD currency [#2066](https://github.com/mojaloop/project/issues/2066) +2. Default CGS model settles also Deferred Net transfers [#2325](https://github.com/mojaloop/project/issues/2325) +3. ALS Admin Service DELETE API not working as expected [#2342](https://github.com/mojaloop/project/issues/2342) +4. Tests coverage not provided for scenarios when Deferred Multilateral Net Settlement (DMLNS) and Continuous Gross Settlement (CGS) models are used on the same Switch [#2314](https://github.com/mojaloop/project/issues/2314) +5. Central-Settlement-service is failing GP tests when enabling event-sdk sidecar [#2368](https://github.com/mojaloop/project/issues/2368) +6. Testing-Toolkit + * Test execution stops with error 'max call stack' when http outbound errors like socket hangup [#2312](https://github.com/mojaloop/project/issues/2312) + * Proper progress updates [#2331](https://github.com/mojaloop/project/issues/2331) + * Change UI to insert normalized lower case request headers [#2310](https://github.com/mojaloop/project/issues/2310) + * Add input values not working [#2329](https://github.com/mojaloop/project/issues/2329) + * Callback timeout in settings [#2330](https://github.com/mojaloop/project/issues/2330) + +## 4. Application versions + +1. ml-api-adapter: **v11.1.6** +2. central-ledger: **v13.12.1** +3. account-lookup-service: v11.5.3 -> **v11.7.0** +4. quoting-service: **v12.0.6** +5. central-settlement: v13.2.0 -> **13.4.1** +6. central-event-processor: **v11.0.2** +7. bulk-api-adapter: **v11.1.4** +8. email-notifier: **v11.0.2** +9. als-oracle-pathfinder: **v11.0.0** +10. transaction-requests-service: **v11.1.5** +11. finance-portal-ui: **v10.4.3** +12. finance-portal-backend-service: **v15.0.2** +13. settlement-management: **v11.0.0** +14. operator-settlement: **v11.0.0** +15. event-sidecar: **v11.0.1** +16. event-stream-processor: **v11.0.0-snapshot** +17. simulator: **v11.1.2** +18. mojaloop-simulator: **v11.4.3** +19. sdk-scheme-adapter: **v11.17.1** +20. ml-testing-toolkit: v12.4.2 -> **v13.2.1** +21. ml-testing-toolkit-ui: v12.2.3 -> **v13.2.1** + +## 5. Application release notes + +1. ml-api-adapter - https://github.com/mojaloop/ml-api-adapter/releases/tag/v11.1.6 +2. central-ledger - https://github.com/mojaloop/central-ledger/releases/tag/v13.12.1 +3. account-lookup-service - https://github.com/mojaloop/account-lookup-service/releases/tag/v11.7.0 +4. quoting-service - https://github.com/mojaloop/quoting-service/releases/tag/v12.0.6 +5. central-settlement- https://github.com/mojaloop/central-settlement/releases/tag/v13.4.1 +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/v11.1.4 +8. email-notifier - https://github.com/mojaloop/email-notifier/releases/tag/v11.0.2 +9. als-oracle-pathfinder - https://github.com/mojaloop/als-oracle-pathfinder/releases/tag/v11.0.0 +10. transaction-requests-service - https://github.com/mojaloop/transaction-requests-service/releases/tag/v11.1.5 +11. finance-portal-ui - https://github.com/mojaloop/finance-portal-ui/releases/tag/v10.4.3 +12. finance-portal-backend-service - https://github.com/mojaloop/finance-portal-backend-service/releases/tag/v15.0.2 +13. settlement-management - https://github.com/mojaloop/settlement-management/releases/tag/v11.0.0 +14. operator-settlement - https://github.com/mojaloop/operator-settlement/releases/tag/v11.0.0 +15. event-sidecar - https://github.com/mojaloop/event-sidecar/releases/tag/v11.0.1 +16. event-stream-processor - https://github.com/mojaloop/event-stream-processor/releases/v11.0.0-snapshot +17. simulator - https://github.com/mojaloop/simulator/releases/tag/v11.1.2 +18. mojaloop-simulator - https://github.com/mojaloop/mojaloop-simulator/releases/tag/v11.4.3 +19. sdk-scheme-adapter - https://github.com/mojaloop/sdk-scheme-adapter/releases/tag/v11.17.1 +20. ml-testing-toolkit - https://github.com/mojaloop/ml-testing-toolkit/releases/tag/v13.2.1 +21. ml-testing-toolkit-ui - https://github.com/mojaloop/ml-testing-toolkit-ui/releases/tag/v13.2.1 + +## 6. Operational Chart versions + +1. EFK: **v12.0.0** +2. Promfana: **v11.0.0** + +## 7. Breaking changes + +N/A + +## 8. Testing notes + +1. It is recommended that all Mojaloop deployments are verified using the [Mojaloop Testing Toolkit](https://docs.mojaloop.io/documentation/mojaloop-technical-overview/ml-testing-toolkit/). More information can be found in the [Mojaloop Deployment Guide](https://docs.mojaloop.io/documentation/deployment-guide). + +2. The [testing-toolkit-test-cases](https://github.com/mojaloop/testing-toolkit-test-cases/releases/tag/v13.0.0)' Golden Path collections expects: + - the Quoting service operating mode to be set [quoting-service.config.simple_routing_mode_enabled](https://github.com/mojaloop/helm/blob/v13.0.0/mojaloop/values.yaml#L4664)=true. If this is incorrectly configured, it will result in several failures in the quoting-service tests (7 expected failures). If this is disabled, ensure that you update the corresponding test-case environment variable parameter [SIMPLE_ROUTING_MODE_ENABLED](https://github.com/mojaloop/helm/blob/v13.0.0/mojaloop/values.yaml#L7420) to match. + - the [on-us transfers](https://github.com/mojaloop/helm/blob/v13.0.0/mojaloop/values.yaml#L321) configuration to be disabled. The test-case environment variable parameter ([ON_US_TRANSFERS_ENABLED](https://github.com/mojaloop/helm/blob/v13.0.0/mojaloop/values.yaml#L7423), the same name used on postman collections) must similarly match this value. + +3. Simulators + - [Mojaloop-Simulator](https://github.com/mojaloop/mojaloop-simulator) is enabled by default (six instances used). + - Ensure that correct Postman Scripts are used if you wish to test against the Mojaloop-Simulators: + - Setup Mojaloop Hub: [MojaloopHub_Setup](https://github.com/mojaloop/postman/blob/v12.0.0/MojaloopHub_Setup.postman_collection.json) + - Setup Mojaloop Simulators for testing : [MojaloopSims_Onboarding](https://github.com/mojaloop/postman/blob/v12.0.0/MojaloopSims_Onboarding.postman_collection.json) + - Golden path tests: [Golden_Path_Mojaloop](https://github.com/mojaloop/postman/blob/v12.0.0/Golden_Path_Mojaloop.postman_collection.json) + - Legacy Simulators are still required and deployed by default; disabling this will cause issues since there is Account Lookup directory mocking functionality in this service. + +3. This release has been tested against the following: + - Kubernetes: v1.20.6 + - Nginx Ingress Controllers: 0.43.0 + - Testing Toolkit Test Cases: [v13.0.1](https://github.com/mojaloop/testing-toolkit-test-cases/releases/tag/v13.0.1) + +## 9. Known Issues + +1. [#2119 - Idempotency for duplicate quote request](https://github.com/mojaloop/project/issues/2119) +2. [#2322 - Helm install failing with with "medium to large" release names](https://github.com/mojaloop/project/issues/2322) + +## 10. Contributors + +- Contributing organizations: BMGF, ModusBox +- ModusBox: @elnyry-sam-k , @mdebarros, @vgenev , @vijayg10, @shashi165, @kleyow, @bushjames + +_Note: companies in alphabetical order_ diff --git a/central/Chart.yaml b/central/Chart.yaml index 09f7f7d09..0358a6e61 100644 --- a/central/Chart.yaml +++ b/central/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Central Helm chart for Kubernetes name: central version: 13.0.1 -appVersion: "central-ledger: v13.12.1; central-settlement: v13.4.0; central-event-processor: v11.0.2" +appVersion: "central-ledger: v13.12.1; central-settlement: v13.4.1; central-event-processor: v11.0.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/central/values.yaml b/central/values.yaml index d6fe2d17d..578d42678 100644 --- a/central/values.yaml +++ b/central/values.yaml @@ -1921,7 +1921,7 @@ centralsettlement: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -1970,8 +1970,8 @@ centralsettlement: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -2198,7 +2198,7 @@ centralsettlement: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' service: @@ -2247,8 +2247,8 @@ centralsettlement: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -2482,7 +2482,7 @@ centralsettlement: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: @@ -2531,8 +2531,8 @@ centralsettlement: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -2766,7 +2766,7 @@ centralsettlement: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--rules"]' service: @@ -2815,8 +2815,8 @@ centralsettlement: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 diff --git a/centralsettlement/Chart.yaml b/centralsettlement/Chart.yaml index 291bf99cd..3bd2e4a5c 100644 --- a/centralsettlement/Chart.yaml +++ b/centralsettlement/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Central-Settlement Helm chart for Kubernetes name: centralsettlement version: 13.0.1 -appVersion: "13.4.0" +appVersion: "13.4.1" 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 1890bd291..25dfa018f 100644 --- a/centralsettlement/chart-service/Chart.yaml +++ b/centralsettlement/chart-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Central-Settlement helm chart for API services and handlers name: centralsettlement-service version: 13.0.0 -appVersion: "13.4.0" +appVersion: "13.4.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralsettlement/chart-service/configs/default-sidecar.json b/centralsettlement/chart-service/configs/default-sidecar.json new file mode 100644 index 000000000..cff11d89b --- /dev/null +++ b/centralsettlement/chart-service/configs/default-sidecar.json @@ -0,0 +1,50 @@ +{{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}} +{ + "PORT": {{ .Values.sidecar.service.internalPort }}, + "EVENT_LOGGER_GRPC_HOST": "{{ .Values.sidecar.config.event_log_grpc_host }}", + "EVENT_LOGGER_GRPC_PORT": {{ .Values.sidecar.config.event_log_grpc_port }}, + "INSTRUMENTATION": { + "METRICS": { + "DISABLED": false, + "labels": { + "eventId": "*" + }, + "config": { + "timeout": 5000, + "prefix": "moja_", + "defaultLabels": { + "serviceName": "{{ template "centralsettlement-service.name" . }}-event-sidecar" + } + } + } + }, + "KAFKA": { + "TOPIC_TEMPLATES": { + "GENERAL_TOPIC_TEMPLATE": { + "TEMPLATE": "topic-{{"{{"}}functionality{{"}}"}}", + "REGEX": "topic-(.*)" + } + }, + "PRODUCER": { + "EVENT": { + "config": { + "options": { + "messageCharset": "utf8" + }, + "rdkafkaConf": { + "metadata.broker.list": "{{ $kafkaHost }}:{{ .Values.config.kafka_port }}", + "client.id": "es-prod-event", + "event_cb": true, + "dr_cb": true, + "socket.keepalive.enable": true, + "queue.buffering.max.messages": 10000000 + }, + "topicConf": { + "request.required.acks": "all", + "partitioner": "{{ .Values.config.kafka_partitioner }}" + } + } + } + } + } +} diff --git a/centralsettlement/chart-service/templates/config.yaml b/centralsettlement/chart-service/templates/config.yaml index bfc1f4595..5809f27a7 100644 --- a/centralsettlement/chart-service/templates/config.yaml +++ b/centralsettlement/chart-service/templates/config.yaml @@ -25,3 +25,18 @@ data: {{- range $key, $value := .Values.config.rules }} {{ $key }}: {{ $value | quote }} {{- end }} +{{- if .Values.sidecar.enabled }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "centralsettlement-service.fullname" . }}-sidecar + labels: + app.kubernetes.io/name: {{ include "centralsettlement-service.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} +data: + default.json: {{ (tpl (.Files.Get "configs/default-sidecar.json") . ) | quote }} +{{- end }} diff --git a/centralsettlement/chart-service/templates/deployment.yaml b/centralsettlement/chart-service/templates/deployment.yaml index 1470bcb7e..6df5d94a4 100644 --- a/centralsettlement/chart-service/templates/deployment.yaml +++ b/centralsettlement/chart-service/templates/deployment.yaml @@ -97,72 +97,73 @@ spec: value: {{ .Values.config.log_level }} - name: CSL_LOG_TRANSPORT value: {{ .Values.config.log_transport}} -## UNCOMMENT AFTER EVENTSDK IS IMPLEMENTED - # {{- if .Values.sidecar.enabled }} - # - name: EVENT_SDK_SIDECAR_DISABLED - # value: "false" - # - name: EVENT_SDK_SERVER_HOST - # value: {{ .Values.sidecar.config.event_log_grpc_host | quote }} - # - name: EVENT_SDK_SERVER_PORT - # value: {{ .Values.sidecar.config.event_log_grpc_port | quote }} - # {{- end }} - # - name: EVENT_SDK_VENDOR_PREFIX - # value: {{ .Values.config.event_trace_vendor | quote }} - # - name: EVENT_SDK_TRACESTATE_HEADER_ENABLED - # value: {{ .Values.config.event_trace_state_enabled | quote }} - # - name: EVENT_SDK_ASYNC_OVERRIDE_EVENTS - # value: {{ .Values.config.event_async_override | quote }} - # - name: EVENT_SDK_TRACEID_PER_VENDOR - # value: {{ .Values.config.event_traceid_per_vendor | quote }} - # - name: LIB_RESOURCE_VERSIONS - # value: {{ .Values.config.resource_versions}} + - name: EVENT_SDK_LOG_FILTER + value: {{ .Values.config.event_log_filter | quote }} + - name: EVENT_SDK_LOG_METADATA_ONLY + value: {{ .Values.config.event_log_metadata_only | quote }} + {{- if .Values.sidecar.enabled }} + - name: EVENT_SDK_SIDECAR_DISABLED + value: "false" + - name: EVENT_SDK_SERVER_HOST + value: {{ .Values.sidecar.config.event_log_grpc_host | quote }} + - name: EVENT_SDK_SERVER_PORT + value: {{ .Values.sidecar.config.event_log_grpc_port | quote }} + {{- end }} + - name: EVENT_SDK_VENDOR_PREFIX + value: {{ .Values.config.event_trace_vendor | quote }} + - name: EVENT_SDK_TRACESTATE_HEADER_ENABLED + value: {{ .Values.config.event_trace_state_enabled | quote }} + - name: EVENT_SDK_ASYNC_OVERRIDE_EVENTS + value: {{ .Values.config.event_async_override | quote }} + - name: EVENT_SDK_TRACEID_PER_VENDOR + value: {{ .Values.config.event_traceid_per_vendor | quote }} + - name: LIB_RESOURCE_VERSIONS + value: {{ .Values.config.resource_versions}} volumeMounts: - name: {{ template "centralsettlement-service.fullname" . }}-cfg-vol mountPath: /opt/central-settlement/config - name: {{ template "centralsettlement-service.fullname" . }}-rules-vol mountPath: "/opt/central-settlement/{{ .Values.config.handlers.settings.scripts_folder }}" -## UNCOMMENT AFTER EVENTSDK IS IMPLEMENTED - # {{- if .Values.sidecar.enabled }} - # - name: {{ .Chart.Name }}-sidecar - # image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" - # imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }} - # {{- if .Values.sidecar.image.imagePullSecrets }} - # imagePullSecrets: - # {{ toYaml .Values.sidecar.image.imagePullSecrets | indent 10 }} - # {{- end }} - # command: {{ .Values.sidecar.image.command }} - # ports: - # - containerPort: {{ .Values.sidecar.service.internalPort }} - # {{- if .Values.sidecar.readinessProbe.enabled }} - # readinessProbe: - # httpGet: - # path: {{ .Values.sidecar.readinessProbe.httpGet.path }} - # port: {{ .Values.sidecar.service.internalPort }} - # initialDelaySeconds: {{ .Values.sidecar.readinessProbe.initialDelaySeconds }} - # periodSeconds: {{ .Values.sidecar.readinessProbe.periodSeconds }} - # {{- end }} - # {{- if .Values.sidecar.livenessProbe.enabled }} - # livenessProbe: - # httpGet: - # path: {{ .Values.sidecar.livenessProbe.httpGet.path }} - # port: {{ .Values.sidecar.service.internalPort }} - # initialDelaySeconds: {{ .Values.sidecar.livenessProbe.initialDelaySeconds }} - # periodSeconds: {{ .Values.sidecar.livenessProbe.periodSeconds }} - # {{- end }} - # volumeMounts: - # - name: {{ template "centralsettlement-handler-deferredsettlement.fullname" . }}-sidecar-volum - # mountPath: /opt/event-sidecar/config - # env: - # - name: LOG_LEVEL - # value: {{ .Values.sidecar.config.log_level | quote }} - # - name: LOG_FILTER - # value: {{ .Values.sidecar.config.log_filter | quote }} - # - name: EVENT_SDK_LOG_FILTER - # value: {{ .Values.sidecar.config.event_log_filter | quote }} - # - name: EVENT_SDK_LOG_METADATA_ONLY - # value: {{ .Values.sidecar.config.event_log_metadata_only | quote }} - # {{- end }} - + {{- if .Values.sidecar.enabled }} + - name: {{ template "centralsettlement-service.name" . }}-sidecar + image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}" + imagePullPolicy: {{ .Values.sidecar.image.pullPolicy }} + {{- if .Values.sidecar.image.imagePullSecrets }} + imagePullSecrets: + {{ toYaml .Values.sidecar.image.imagePullSecrets | indent 10 }} + {{- end }} + command: {{ .Values.sidecar.image.command }} + ports: + - containerPort: {{ .Values.sidecar.service.internalPort }} + {{- if .Values.sidecar.readinessProbe.enabled }} + readinessProbe: + httpGet: + path: {{ .Values.sidecar.readinessProbe.httpGet.path }} + port: {{ .Values.sidecar.service.internalPort }} + initialDelaySeconds: {{ .Values.sidecar.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sidecar.readinessProbe.periodSeconds }} + {{- end }} + {{- if .Values.sidecar.livenessProbe.enabled }} + livenessProbe: + httpGet: + path: {{ .Values.sidecar.livenessProbe.httpGet.path }} + port: {{ .Values.sidecar.service.internalPort }} + initialDelaySeconds: {{ .Values.sidecar.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.sidecar.livenessProbe.periodSeconds }} + {{- end }} + volumeMounts: + - name: {{ template "centralsettlement-service.fullname" . }}-sidecar-vol + mountPath: /opt/event-sidecar/config + env: + - name: LOG_LEVEL + value: {{ .Values.sidecar.config.log_level | quote }} + - name: LOG_FILTER + value: {{ .Values.sidecar.config.log_filter | quote }} + - name: EVENT_SDK_LOG_FILTER + value: {{ .Values.sidecar.config.event_log_filter | quote }} + - name: EVENT_SDK_LOG_METADATA_ONLY + value: {{ .Values.sidecar.config.event_log_metadata_only | quote }} + {{- end }} volumes: - name: {{ template "centralsettlement-service.fullname" . }}-cfg-vol configMap: @@ -172,15 +173,14 @@ spec: path: default.json # - key: knexfile.js # path: knexfile.js - ## UNCOMMENT AFTER EVENTSDK IS IMPLEMENTED - # {{- if .Values.sidecar.enabled }} - # - name: {{ template "centralsettlement-handler-deferredsettlement.fullname" . }}-sidecar-volum - # configMap: - # name: {{ template "centralsettlement-handler-deferredsettlement.fullname" . }}-sidecar - # items: - # - key: default.json - # path: default.json - # {{- end }} + {{- if .Values.sidecar.enabled }} + - name: {{ template "centralsettlement-service.fullname" . }}-sidecar-vol + configMap: + name: {{ template "centralsettlement-service.fullname" . }}-sidecar + items: + - key: default.json + path: default.json + {{- end }} - name: {{ template "centralsettlement-service.fullname" . }}-rules-vol {{- if .Values.config.rules }} configMap: diff --git a/centralsettlement/chart-service/values.yaml b/centralsettlement/chart-service/values.yaml index 9e0057e10..04ea198ea 100644 --- a/centralsettlement/chart-service/values.yaml +++ b/centralsettlement/chart-service/values.yaml @@ -11,7 +11,7 @@ containers: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: @@ -59,35 +59,34 @@ nodeSelector: {} ## 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' + enabled: true + 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: @@ -104,6 +103,7 @@ config: # 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_partitioner: 'murmur2_random' kafka: consumer: notification: @@ -199,23 +199,38 @@ config: db_reap_interval_millis: 1000 db_create_retry_interval_millis: 200 db_debug: false - # Api Handler Configuration + + ## Api Handler Configuration handlers: disabled: false api: disabled: false settings: scripts_folder: 'scripts/grosssettlementTemp' - # Settlement Window aggregation Configuration + + ## Settlement Window aggregation Configuration window_aggregation: retry_count: 3 retry_interval: 3000 hub_participant: id: 1 name: Hub + + ## Log config log_level: info log_transport: file + ## Tracing Configuration + event_trace_vendor: mojaloop + event_log_filter: 'audit:*, log:warn, log:error' + # If set to true, only the metadata object from the event will be printed. + event_log_metadata_only: false + # A comma-separated list of events that should return immediately instead of waiting for the event promises to resolve + # Any combination of: `log,audit,trace` + event_async_override: 'log,trace' + event_trace_state_enabled: true + event_traceid_per_vendor: false + error_handling: include_cause_extension: false truncate_extensions: true diff --git a/centralsettlement/values.yaml b/centralsettlement/values.yaml index ef54cb4b9..ceed02f28 100644 --- a/centralsettlement/values.yaml +++ b/centralsettlement/values.yaml @@ -11,7 +11,7 @@ centralsettlement-service: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -60,8 +60,8 @@ centralsettlement-service: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -288,7 +288,7 @@ centralsettlement-handler-deferredsettlement: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' service: @@ -337,8 +337,8 @@ centralsettlement-handler-deferredsettlement: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -572,7 +572,7 @@ centralsettlement-handler-grosssettlement: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: @@ -621,8 +621,8 @@ centralsettlement-handler-grosssettlement: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -856,7 +856,7 @@ centralsettlement-handler-rules: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--rules"]' service: @@ -905,8 +905,8 @@ centralsettlement-handler-rules: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index 776f68746..15d4534e4 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Mojaloop Helm chart for Kubernetes name: mojaloop version: 13.0.1 -appVersion: "ml-api-adapter: v11.1.6; central-ledger: v13.12.1; account-lookup-service: v11.7.0; quoting-service: v12.0.6; central-settlement: v13.4.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: v13.2.1; ml-testing-toolkit-ui: v13.2.1;" +appVersion: "ml-api-adapter: v11.1.6; central-ledger: v13.12.1; account-lookup-service: v11.7.0; quoting-service: v12.0.6; central-settlement: v13.4.1; 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: v13.2.1; ml-testing-toolkit-ui: v13.2.1;" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 3506bcbae..d919aef81 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -1824,7 +1824,7 @@ central: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/api/index.js"]' service: @@ -1873,8 +1873,8 @@ central: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -2101,7 +2101,7 @@ central: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' service: @@ -2150,8 +2150,8 @@ central: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -2385,7 +2385,7 @@ central: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' service: @@ -2434,8 +2434,8 @@ central: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1 @@ -2669,7 +2669,7 @@ central: api: image: repository: mojaloop/central-settlement - tag: v13.4.0 + tag: v13.4.1 pullPolicy: IfNotPresent command: '["node", "src/handlers/index.js", "h", "--rules"]' service: @@ -2718,8 +2718,8 @@ central: tolerations: [] ## UNCOMMENT AFTER THE EVENT SDK AND METRICS ARE IMPLEMENTED - sidecar: - enabled: false + # sidecar: + # enabled: false # image: # repository: mojaloop/event-sidecar # tag: v11.0.1