diff --git a/.changelog/release-v16.0.0.md b/.changelog/release-v16.0.0.md new file mode 100644 index 000000000..ff92d0dac --- /dev/null +++ b/.changelog/release-v16.0.0.md @@ -0,0 +1,157 @@ +# Helm Release Notes +Date | Revision | Description +---------|----------|--------- +2024-02-06 | 0 | Initial draft +2024-03-12 | 0 | Initial release + +## 0. Summary + +Enhancements and breaking changes to the [v15.2.0 Release](https://github.com/mojaloop/helm/blob/master/.changelog/release-v15.2.0.md), which includes: + +1. Performance improvement in Central Ledger via batching of position prepare and position filfill messages +2. Performance improvement in ALS with the addition of participant requests caching, and logging fixes +3. Refactoring of Quoting Service into an event-driven service to improve performance +4. Helm chart: external K8s secret are now used for JWS signing key source if present +5. General maintenance, bug fixes, and Nodejs upgrades + +## 1. New Features +* **mojaloop/#3426** add participant req caching, enable cache metrics, log fixes ([mojaloop/#465](https://github.com/mojaloop/account-lookup-service/pull/465)), closes [mojaloop/#3426](https://github.com/mojaloop/project/issues/3426) +* **mojaloop/#3427** add oracle endpoint db caching and oracle request caching ([mojaloop/#467](https://github.com/mojaloop/account-lookup-service/pull/467)), closes [mojaloop/#3427](https://github.com/mojaloop/project/issues/3427) +* **mojaloop/#3441** nodejs upgrade ([mojaloop/#252](https://github.com/mojaloop/central-event-processor/pull/252)), closes [mojaloop/#3441](https://github.com/mojaloop/project/issues/3441) +* **mojaloop/#3636** batching implementation for position prepare messages ([mojaloop/#968](https://github.com/mojaloop/central-ledger/pull/968)), closes [mojaloop/#3636](https://github.com/mojaloop/project/issues/3636) +* **mojaloop/#3524** add position fulfil to binprocessor ([mojaloop/#990](https://github.com/mojaloop/central-ledger/pull/990)), closes [mojaloop/#3524](https://github.com/mojaloop/project/issues/3524) +* **mojaloop/#3524** add reserve action to fulfil logic ([mojaloop/#992](https://github.com/mojaloop/central-ledger/pull/992)), closes [mojaloop/#3524](https://github.com/mojaloop/project/issues/3524) +* **mojaloop/#321** refactor quoting service into an event driven solution to improve performance ([mojaloop/#321](https://github.com/mojaloop/quoting-service/pull/321)), closes [mojaloop/#321](https://github.com/mojaloop/project/issues/321) +* **mojaloop/#3445** nodejs upgrade ([mojaloop/#252](https://github.com/mojaloop/simulator/pull/252)), closes [mojaloop/#3445](https://github.com/mojaloop/project/issues/3445) +* **mojaloop/#3666** refactor quoting service into an event driven solution to improve performance ([mojaloop/#321](https://github.com/mojaloop/quoting-service/pull/321)), closes [mojaloop/#3666](https://github.com/mojaloop/project/issues/3666) +* **mojaloop/#3666** add external k8s secret for jws signing keys ([mojaloop/#600](https://github.com/mojaloop/helm/pull/600)), closes [mojaloop/#3760](https://github.com/mojaloop/project/issues/3760) +* **mojaloop/#3768** create dashboard-performance-troubleshooting.json ([mojaloop/#601](https://github.com/mojaloop/helm/pull/601)), closes [mojaloop/#3768](https://github.com/mojaloop/project/issues/3768) +* **mojaloop/#3768** node list regexp shows all the nodes in dashboard-performance-troubleshooting.json ([mojaloop/#604](https://github.com/mojaloop/helm/pull/604)), closes [mojaloop/#3768](https://github.com/mojaloop/project/issues/3768) +* **mojaloop/#3768** add replicaset count to performance-troubleshooting dashboard ([mojaloop/#606](https://github.com/mojaloop/helm/pull/606)), closes [mojaloop/#3768](https://github.com/mojaloop/project/issues/3768) +* **iprod/#379** added integration tests; updated docker-compose ([mojaloop/#324](https://github.com/mojaloop/quoting-service/pull/324)), closes [iprod/#379](https://github.com/mojaloop/project/issues) + +## 2. Bug Fixes +* **mojaloop/#3682** fix cache implementation ([mojaloop/#468](https://github.com/mojaloop/account-lookup-service/pull/468)), closes [mojaloop/#3682](https://github.com/mojaloop/project/issues/3682) +* **mojaloop/#3603** fix container permission issues ([mojaloop/#9](https://github.com/mojaloop/ml-testing-toolkit-client-lib/pull/9)), closes [mojaloop/#3603](https://github.com/mojaloop/project/issues/3603) + * **mojaloop/3806** fix: update k8s monitoring dashboard ([mojaloop/#597](https://github.com/mojaloop/helm/pull/597)), closes [mojaloop/#3806](https://github.com/mojaloop/project/issues/3806) + * **mojaloop/#3768** fix container cpu and memory utilization charts in k8s monitoring dashboard ([mojaloop/#610](https://github.com/mojaloop/helm/pull/610)), closes [mojaloop/#3768](https://github.com/mojaloop/project/issues/3768) + * **mojaloop/#3768** node list regexp shows all the nodes in dashboard-performance-troubleshooting.json ([mojaloop/#604](https://github.com/mojaloop/helm/pull/604)), closes [mojaloop/#3768](https://github.com/mojaloop/project/issues/3768) + +## 3. Application Versions + +1. central-event-processor: v12.0.0 -> [v12.1.0](https://github.com/mojaloop/central-event-processor/releases/v12.1.0) ([Compare](https://github.com/mojaloop/central-event-processor/compare/v12.0.0...v12.1.0)) +2. ml-testing-toolkit-ui: v15.4.0 -> [v15.4.2](https://github.com/mojaloop/ml-testing-toolkit-ui/releases/v15.4.2) ([Compare](https://github.com/mojaloop/ml-testing-toolkit-ui/compare/v15.4.0...v15.4.2)) +3. als-oracle-pathfinder: v12.0.0 -> [v12.1.0](https://github.com/mojaloop/als-oracle-pathfinder/releases/v12.1.0) ([Compare](https://github.com/mojaloop/als-oracle-pathfinder/compare/v12.0.0...v12.1.0)) +4. ml-testing-toolkit-client-lib: v1.2.0 -> [v1.2.2](https://github.com/mojaloop/ml-testing-toolkit-client-lib/releases/v1.2.2) ([Compare](https://github.com/mojaloop/ml-testing-toolkit-client-lib/compare/v1.2.0...v1.2.2)) +5. account-lookup-service: v15.0.0 -> [v15.2.3](https://github.com/mojaloop/account-lookup-service/releases/v15.2.3) ([Compare](https://github.com/mojaloop/account-lookup-service/compare/v15.0.0...v15.2.3)) +6. simulator: v12.0.0 -> [v12.1.0](https://github.com/mojaloop/simulator/releases/v12.1.0) ([Compare](https://github.com/mojaloop/simulator/compare/v12.0.0...v12.1.0)) +7. quoting-service: v15.5.0 -> [v15.7.0](https://github.com/mojaloop/quoting-service/releases/v15.7.0) ([Compare](https://github.com/mojaloop/quoting-service/compare/v15.5.0...v15.7.0)) +8. central-ledger: v17.3.2 -> [v17.6.0](https://github.com/mojaloop/central-ledger/releases/v17.6.0) ([Compare](https://github.com/mojaloop/central-ledger/compare/v17.3.2...v17.6.0)) +9. event-stream-processor: v12.0.0-snapshot.7 -> [v12.0.0-snapshot.9](https://github.com/mojaloop/event-stream-processor/releases/v12.0.0-snapshot.9) ([Compare](https://github.com/mojaloop/event-stream-processor/compare/v12.0.0-snapshot.7...v12.0.0-snapshot.9)) +10. sdk-scheme-adapter: v23.1.1 -> [v23.4.0](https://github.com/mojaloop/sdk-scheme-adapter/releases/v23.4.0) ([Compare](https://github.com/mojaloop/sdk-scheme-adapter/compare/v23.1.1...v23.4.0)) +11. bulk-api-adapter: [v17.0.0](https://github.com/mojaloop/bulk-api-adapter/releases/v17.0.0) +12. event-sidecar: [v14.0.0](https://github.com/mojaloop/event-sidecar/releases/v14.0.0) +13. auth-service: [v15.0.0](https://github.com/mojaloop/auth-service/releases/v15.0.0) +14. ml-testing-toolkit: [v17.0.0](https://github.com/mojaloop/ml-testing-toolkit/releases/v17.0.0) +15. transaction-requests-service: [v14.1.2](https://github.com/mojaloop/transaction-requests-service/releases/v14.1.2) +16. ml-api-adapter: [v14.0.5](https://github.com/mojaloop/ml-api-adapter/releases/v14.0.5) +17. mojaloop-simulator: [v15.0.0](https://github.com/mojaloop/mojaloop-simulator/releases/v15.0.0) +18. thirdparty-api-svc: [v14.0.0](https://github.com/mojaloop/thirdparty-api-svc/releases/v14.0.0) +19. als-consent-oracle: [v0.2.2](https://github.com/mojaloop/als-consent-oracle/releases/v0.2.2) +20. thirdparty-sdk: [v15.1.1](https://github.com/mojaloop/thirdparty-sdk/releases/v15.1.1) +21. central-settlement: [v16.0.0](https://github.com/mojaloop/central-settlement/releases/v16.0.0) +22. email-notifier: [v14.0.0](https://github.com/mojaloop/email-notifier/releases/v14.0.0) + +## 4. API Versions + +This release supports the following versions of the [Mojaloop family of APIs](https://docs.mojaloop.io/api): + +| API | Supported Versions | Notes | +| ----------- | ------------------------------------------------------------------------------------------------------------------------------------------ | ----- | +| FSPIOP | [v1.1](https://docs.mojaloop.io/api/fspiop/v1.1/api-definition.html), [v1.0](https://docs.mojaloop.io/api/fspiop/v1.0/api-definition.html) | | +| Settlements | [v2.0](https://docs.mojaloop.io/api/settlement) | | +| Admin | [v1.0](https://docs.mojaloop.io/api/administration/central-ledger-api.html) | | +| Oracle | [v1.0](https://docs.mojaloop.io/legacy/api/als-oracle-api-specification.html) | | +| Thirdparty | [v1.0](https://docs.mojaloop.io/api/thirdparty) | | + +## 5. Testing notes + +1. This release has been validated against the following Dependency Test Matrix: + + | Dependency | Version | Notes | + | ---------- | ------- | --- | + | Kubernetes | v1.29 | [AWS EKS](https://aws.amazon.com/eks/), [AWS EKS Supported Version Notes](https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html) | + | containerd | v1.6.19 | | + | Nginx Ingress Controller | [helm-ingress-nginx-4.7.0](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.7.0) / [ingress-controller-v1.8.0](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.8.0) | | + | Amazon Linux | v2 | | + | MySQL | bitnami/mysql:8.0.32-debian-11-r0 | | + | Kafka | bitnami/kafka:3.3.1-debian-11-r1 | | + | Redis | bitnami/redis:7.0.5-debian-11-r7 | | + | MongoDB | bitnami/mongodb:6.0.2-debian-11-r11 | | + | Testing Toolkit Test Cases | [v16.0.0](https://github.com/mojaloop/testing-toolkit-test-cases/releases/tag/v16.0.0) | | + | example-mojaloop-backend | v15.0.0 | [README](https://github.com/mojaloop/helm/blob/master/example-mojaloop-backend/README.md) | + +2. 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). + +3. The [testing-toolkit-test-cases](https://github.com/mojaloop/testing-toolkit-test-cases/releases) (See above Dependency Test Matrix for exact version required for this release) Golden Path collections expects: + - the Quoting service operating mode to be set quoting-service.config.simple_routing_mode_enabled=true (in helm mojaloop/values.yaml under quoting-service config). 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** ( in helm mojaloop/values.yaml ml-testing-toolkit -> extraEnvironments.hub-k8s-default-environment.json.inputValues) to match. + - the **on-us transfers** (in mojaloop/values.yaml "enable_on_us_transfers: false" under centralledger-handler-transfer-prepare -> config and cl-handler-bulk-transfer-prepare -> config) configuration to be disabled. The test-case environment variable parameter (**ON_US_TRANSFERS_ENABLED** (in helm mojaloop/values.yaml ml-testing-toolkit -> extraEnvironments.hub-k8s-default-environment.json.inputValues), the same name used on postman collections) must similarly match this value. + +4. Simulators + - We recommend using Testing Toolkit instead of Postman which is better suited for the async nature of the Mojaloop API specification (see above) + - [Mojaloop-Simulator](https://github.com/mojaloop/mojaloop-simulator) is enabled by default (six instances used for single transfers usually and three more specific to bulk). + - 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. + +5. Thirdparty Testing Toolkit Test Collections are not repeatable. Please refer to the following issue for more information [#2717 - Thirdparty TTK Test-Collection is not repeatable](https://github.com/mojaloop/project/issues/2717). It is possible to manually cleanup persistent data to re-run the test if required. + +6. Bulk API Helm Tests + + Refer to the [Testing Deployments](https://github.com/mojaloop/helm/blob/master/README.md#testing-deployments) section in the main README for detailed information on how to enable bulk-api-adapter tests. + +7. Thirdparty API Helm Tests + + Refer to [thirdparty/README.md#validating-and-testing-the-3p-api](https://github.com/mojaloop/helm/blob/master/thirdparty/README.md#validating-and-testing-the-3p-api) on how to enabled and execute Thirdparty verification tests. + +8. Testing the Bulk functionality including "sdk-scheme-adapter" + + For details regarding deployment and validation of simulators needed for bulk (for adoption provided in sdk-scheme-adapter) refer to [deploying Mojaloop TTK simulators](https://github.com/mojaloop/helm/blob/master/mojaloop-ttk-simulators/README.md). + +## 6. Breaking Changes + +### central-ledger + * config/default.json:
+ The Kafka configuration has been expanded to include additional topics, batch size, consume timeout and `EVENT_TYPE_ACTION_TOPIC_MAP` configurations for the batching feature. + See [README](https://github.com/mojaloop/central-ledger/compare/v17.3.2...v17.6.0#diff-b335630551682c19a781afebcf4d07bf978fb1f8ac04c6bf87428ed5106870f5) for more details.
+ (https://github.com/mojaloop/central-ledger/blob/42238ff293bb27f1947831de1ef574ebd5bdb6fc/config%2Fdefault.json) +### quoting-service + * config/default.json:
+ Quoting Service has now been split into API service and Handler service. As a result, Kafka configuration has been added to allow for publishing and consuming of messages between the API service and the Handler service. See [diff](https://github.com/mojaloop/quoting-service/compare/v15.5.0...v15.7.0#diff-f07c42814e0913799fda32ac14d063f1ef8a04e24fb6febd873a5f161e58a8d4) for details.
+ (https://github.com/mojaloop/quoting-service/blob/0a68f45602d9180429537315f6c44f30b8ba99e5/config%2Fdefault.json) +### account-lookup-service + * config/default.json: (https://github.com/mojaloop/account-lookup-service/blob/283ef2140c166029255a4ddc9548eb3ffb4eaf17/config%2Fdefault.json) + * docker/account-lookup-service/default.json: (https://github.com/mojaloop/account-lookup-service/blob/283ef2140c166029255a4ddc9548eb3ffb4eaf17/docker%2Faccount-lookup-service%2Fdefault.json)
+ The `ENPOINT_CACHE_CONFIG` has been replaced with three (3) separate cache configurations (`CENTRAL_SHARED_ENDPOINT_CACHE_CONFIG`, `CENTRAL_SHARED_PARTICIPANT_CACHE_CONFIG`, and `GENERAL_CACHE_CONFIG`) to cater for the additional caching features in the service. + See [diff](https://github.com/mojaloop/account-lookup-service/compare/v15.0.0...v15.2.3#diff-f07c42814e0913799fda32ac14d063f1ef8a04e24fb6febd873a5f161e58a8d4) for details. + +## 7. 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) +3. [#2317 - Mojaloop Helm deployments are not compatible when deployed to ARM-arch based hosts](https://github.com/mojaloop/project/issues/2317) +4. [#2435 - Quoting-Service is incorrectly handling failed responses to FSPs when forwarding requests](https://github.com/mojaloop/project/issues/2435) +5. Test issues causing instability/intermitant failures on Test Case Results + 1. [#2717 - Thirdparty TTK Test-Collection is not repeatable](https://github.com/mojaloop/project/issues/2717) + 2. [#2925 - Helm Test Intermittent failure with 'Generic ID not found](https://github.com/mojaloop/project/issues/2925) + +## 8. Contributors + +- Organizations: BMGF, InFiTX, MLF +- Individuals: @aaronreynoza, @elnyry-sam-k, @geka-evk, @kleyow, @muzammil360, @oderayi, @vijayg10 + +*Note: companies and individuals are in alphabetical order* + +**Full Changelog**: https://github.com/mojaloop/helm/compare/v15.2.0...v16.0.0 diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index d38b74aec..009611438 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -5,6 +5,13 @@ # The secret should contain a github access token with the permissions specified above. # The secret is used by the `create-pull-request` action to create the pull request and `updatecli` to access all updateable repositories. # The secret can be created at https://github.com/mojaloop/helm/settings/secrets/actions +# +# KNOWN ISSUES: +# - https://github.com/updatecli/updatecli/issues/1332 +# - https://github.com/goccy/go-yaml/issues/298 +# The underlying libraries used by updatecli for parsing yaml files have issues with maintaining multiline strings format and nodes with anchor. +# These issues are being worked on by the maintainers of the libraries and will be resolved in future releases. +# In the meantime, the workaround is to manually fix the affected files after the updatecli run. name: Create Release PR diff --git a/.github/workflows/manifests/first-pass/mojaloop.yaml b/.github/workflows/manifests/first-pass/mojaloop.yaml index 2e8725e84..d52f02d66 100644 --- a/.github/workflows/manifests/first-pass/mojaloop.yaml +++ b/.github/workflows/manifests/first-pass/mojaloop.yaml @@ -219,11 +219,11 @@ conditions: kind: dockerimage spec: image: mojaloop/ml-testing-toolkit - # docker-ml-testing-toolkit-ui: - # sourceid: ml-testing-toolkit-ui - # kind: dockerimage - # spec: - # image: mojaloop/ml-testing-toolkit-ui + docker-ml-testing-toolkit-ui: + sourceid: ml-testing-toolkit-ui + kind: dockerimage + spec: + image: mojaloop/ml-testing-toolkit-ui targets: appVersion-ml-api-adapter: @@ -280,7 +280,7 @@ targets: kind: file spec: file: mojaloop/Chart.yaml - matchpattern: '(simulator:) (v[\d\.]+)' + matchpattern: '(; simulator:) (v[\d\.]+)' replacepattern: '$1 {{ source "simulator" }}' appVersion-mojaloop-simulator: sourceid: mojaloop-simulator @@ -379,14 +379,28 @@ targets: spec: name: mojaloop file: values.yaml - key: $.quoting-service.image.tag + key: $.quoting-service.quoting-service.image.tag quoting-service--sidecar: sourceid: event-sidecar kind: helmchart spec: name: mojaloop file: values.yaml - key: $.quoting-service.sidecar.image.tag + key: $.quoting-service.quoting-service.sidecar.image.tag + quoting-service-handler: + sourceid: quoting-service + kind: helmchart + spec: + name: mojaloop + file: values.yaml + key: $.quoting-service.quoting-service-handler.image.tag + quoting-service-handler--sidecar: + sourceid: event-sidecar + kind: helmchart + spec: + name: mojaloop + file: values.yaml + key: $.quoting-service.quoting-service-handler.sidecar.image.tag ml-api-adapter: sourceid: ml-api-adapter kind: helmchart diff --git a/.github/workflows/manifests/first-pass/quoting-service.yaml b/.github/workflows/manifests/first-pass/quoting-service.yaml index a60564cda..de25bc185 100644 --- a/.github/workflows/manifests/first-pass/quoting-service.yaml +++ b/.github/workflows/manifests/first-pass/quoting-service.yaml @@ -38,7 +38,7 @@ targets: spec: name: quoting-service file: values.yaml - key: $.image.tag + key: $.quoting-service.image.tag appversion: true quoting-service--sidecar: sourceid: event-sidecar @@ -46,12 +46,70 @@ targets: spec: name: quoting-service file: values.yaml - key: $.sidecar.image.tag + key: $.quoting-service.sidecar.image.tag + quoting-service-handler: + sourceid: quoting-service + kind: helmchart + spec: + name: quoting-service + file: values.yaml + key: $.quoting-service-handler.image.tag + quoting-service-handler--sidecar: + sourceid: event-sidecar + kind: helmchart + spec: + name: quoting-service + file: values.yaml + key: $.quoting-service-handler.sidecar.image.tag common: sourceid: common kind: helmchart spec: name: quoting-service file: Chart.yaml + key: $.dependencies[2].version + chart-handler--quoting-service: + sourceid: quoting-service + kind: helmchart + spec: + name: quoting-service/chart-handler + file: values.yaml + key: $.image.tag + appversion: true + chart-handler--quoting-service--sidecar: + sourceid: event-sidecar + kind: helmchart + spec: + name: quoting-service/chart-handler + file: values.yaml + key: $.sidecar.image.tag + chart-handler--common: + sourceid: common + kind: helmchart + spec: + name: quoting-service/chart-handler + file: Chart.yaml + key: $.dependencies[0].version + chart-service--quoting-service: + sourceid: quoting-service + kind: helmchart + spec: + name: quoting-service/chart-service + file: values.yaml + key: $.image.tag + appversion: true + chart-service--quoting-service--sidecar: + sourceid: event-sidecar + kind: helmchart + spec: + name: quoting-service/chart-service + file: values.yaml + key: $.sidecar.image.tag + chart-service--common: + sourceid: common + kind: helmchart + spec: + name: quoting-service/chart-service + file: Chart.yaml key: $.dependencies[0].version \ No newline at end of file diff --git a/.github/workflows/manifests/second-pass/quoting-service.yaml b/.github/workflows/manifests/second-pass/quoting-service.yaml new file mode 100644 index 000000000..e493aced4 --- /dev/null +++ b/.github/workflows/manifests/second-pass/quoting-service.yaml @@ -0,0 +1,37 @@ +name: quoting-service + +sources: + quoting-service: + kind: helmchart + spec: + url: file://./quoting-service + name: quoting-service + quoting-service-handler: + kind: helmchart + spec: + url: file://./quoting-service + name: quoting-service-handler + +conditions: {} + +targets: + quoting-service: + sourceid: quoting-service + kind: helmchart + spec: + name: quoting-service + file: Chart.yaml + key: $.dependencies[0].version + transformers: + - addprefix: '">= ' + - addsuffix: '"' + quoting-service-handler: + sourceid: quoting-service-handler + kind: helmchart + spec: + name: quoting-service + file: Chart.yaml + key: $.dependencies[1].version + transformers: + - addprefix: '">= ' + - addsuffix: '"' diff --git a/.github/workflows/scripts/determine-release-version.sh b/.github/workflows/scripts/determine-release-version.sh index 14b695249..9d1c54be6 100755 --- a/.github/workflows/scripts/determine-release-version.sh +++ b/.github/workflows/scripts/determine-release-version.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Description: This script is used to the next release version number based on changes from last release. +# Description: This script is used to determine the next release version number based on changes from last release. # Dependencies: This script depends on the changelog files (.tmp/changelogs/**) generated by the generate-changelog.sh script. # Requirements: bash, jq, awk, sed # Usage: .github/workflows/scripts/determine-release-version last_release_tag diff --git a/.github/workflows/templates/release-note-template.md b/.github/workflows/templates/release-note-template.md index ee5641372..2495f3081 100644 --- a/.github/workflows/templates/release-note-template.md +++ b/.github/workflows/templates/release-note-template.md @@ -4,9 +4,6 @@ Date | Revision | Description ---------|----------|--------- {{RELEASE_DATE}} | 0 | Initial draft -- For *BREAKING ISSUES*, please review the section `#6` ["Breaking Changes"](#6-breaking-changes) below. -- For *KNOWN ISSUES*, please review the section `#7` ["Known Issues"](#7-known-issues) below. - ## 0. Summary Enhancements and {{BREAKING_CHANGES_STATUS_TEXT}} changes to the [{{LAST_RELEASE_VERSION}} Release](https://github.com/mojaloop/helm/blob/master/.changelog/release-{{LAST_RELEASE_VERSION}}.md), which includes: @@ -40,7 +37,7 @@ This release supports the following versions of the [Mojaloop family of APIs](ht | Dependency | Version | Notes | | ---------- | ------- | --- | - | Kubernetes | v1.28 | [AWS EKS](https://aws.amazon.com/eks/), [AWS EKS Supported Version Notes](https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html) | + | Kubernetes | v1.29 | [AWS EKS](https://aws.amazon.com/eks/), [AWS EKS Supported Version Notes](https://docs.aws.amazon.com/eks/latest/userguide/kubernetes-versions.html) | | containerd | v1.6.19 | | | Nginx Ingress Controller | [helm-ingress-nginx-4.7.0](https://github.com/kubernetes/ingress-nginx/releases/tag/helm-chart-4.7.0) / [ingress-controller-v1.8.0](https://github.com/kubernetes/ingress-nginx/releases/tag/controller-v1.8.0) | | | Amazon Linux | v2 | | @@ -76,7 +73,7 @@ This release supports the following versions of the [Mojaloop family of APIs](ht Refer to [thirdparty/README.md#validating-and-testing-the-3p-api](https://github.com/mojaloop/helm/blob/master/thirdparty/README.md#validating-and-testing-the-3p-api) on how to enabled and execute Thirdparty verification tests. -8. Testing the new Bulk functionality (sdk-scheme-adapter) +8. Testing the Bulk functionality including "sdk-scheme-adapter" For details regarding deployment and validation of simulators needed for bulk (for adoption provided in sdk-scheme-adapter) refer to [deploying Mojaloop TTK simulators](https://github.com/mojaloop/helm/blob/master/mojaloop-ttk-simulators/README.md). @@ -96,7 +93,7 @@ This release supports the following versions of the [Mojaloop family of APIs](ht ## 8. Contributors -- Organizations: BMGF, InFiTX +- Organizations: BMGF, InFiTX, MLF - Individuals: {{INDIVIDUAL_CONTRIBUTORS}} *Note: companies are in alphabetical order, individuals are in no particular order.* diff --git a/account-lookup-service/Chart.yaml b/account-lookup-service/Chart.yaml index 9d97da243..f39f550f9 100644 --- a/account-lookup-service/Chart.yaml +++ b/account-lookup-service/Chart.yaml @@ -1,30 +1,28 @@ apiVersion: v2 -version: 14.2.0 -appVersion: "account-lookup-service: v15.0.0; als-oracle-pathfinder: v12.0.0" +version: 14.10.0 +appVersion: "account-lookup-service: v15.2.3; als-oracle-pathfinder: v12.1.0" description: Account Lookup Service Helm Chart for Mojaloop name: account-lookup-service maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: account-lookup-service - version: ">= 14.2.0" + version: ">= 14.5.0" repository: "file://./chart-service" condition: account-lookup-service.enabled - name: account-lookup-service-admin - version: ">= 14.2.0" + version: ">= 14.5.0" repository: "file://./chart-admin" condition: account-lookup-service-admin.enabled - name: als-oracle-pathfinder - version: ">= 13.0.1" + version: ">= 13.3.0" repository: "file://../als-oracle-pathfinder" condition: als-oracle-pathfinder.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/account-lookup-service/chart-admin/Chart.yaml b/account-lookup-service/chart-admin/Chart.yaml index 25c45b805..87d4eeca7 100644 --- a/account-lookup-service/chart-admin/Chart.yaml +++ b/account-lookup-service/chart-admin/Chart.yaml @@ -1,18 +1,16 @@ apiVersion: v2 -version: 14.2.0 -appVersion: "15.0.0" +version: 14.5.0 +appVersion: v15.2.1 description: A Helm chart for Kubernetes name: account-lookup-service-admin maintainers: - name: Miguel de Barros - email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com + email: miguel.debarros@modusbox.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/account-lookup-service/chart-admin/configs/default.json b/account-lookup-service/chart-admin/configs/default.json index 07e0f8086..f1ae5e359 100644 --- a/account-lookup-service/chart-admin/configs/default.json +++ b/account-lookup-service/chart-admin/configs/default.json @@ -22,6 +22,11 @@ }, "DISPLAY_ROUTES": {{ .Values.config.display_routes }}, "RUN_MIGRATIONS": {{ .Values.config.run_migrations }}, + "PARTICIPANT_CACHE_CONFIG": { + "expiresIn": 10, + "generateTimeout": 30000, + "getDecoratedValue": true + }, "CENTRAL_SHARED_ENDPOINT_CACHE_CONFIG": { "expiresIn": {{ .Values.config.central_shared_end_point_cache.expiresIn }}, "generateTimeout": {{ .Values.config.central_shared_end_point_cache.generateTimeout }}, diff --git a/account-lookup-service/chart-admin/values.yaml b/account-lookup-service/chart-admin/values.yaml index 7b5ab9e60..c5b18f403 100644 --- a/account-lookup-service/chart-admin/values.yaml +++ b/account-lookup-service/chart-admin/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.0.0 + tag: v15.2.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -19,10 +19,8 @@ image: ## - myRegistryKeySecretName ## pullSecrets: [] - replicaCount: 1 -command: '["node", "src/index.js", "server", "--admin"]' - +command: '["node", "src/index.js", "server", "--admin"]' ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -31,7 +29,7 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/index.js - server @@ -40,7 +38,6 @@ diagnosticMode: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -176,10 +173,8 @@ config: enabled: false maxByteSize: 10000000 expiresIn: 61000 - - ## DB Configuration - db_type: mysql + db_type: mysql db_driver: mysql db_host: mysqldb db_port: 3306 @@ -212,21 +207,24 @@ config: endpointSecurity: jwsSign: false fspiopSourceSigningName: switch - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - - ## Tracing Configuration + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null +# To generate this key: +# Private: +# ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key +# Public: +# openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub +# Should look like: +# -----BEGIN RSA PRIVATE KEY----- +# MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R +# .. +# .. +# mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 +# -----END RSA PRIVATE KEY----- +## 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. @@ -258,13 +256,13 @@ initContainers: | - sh - -c - | - until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; + until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -329,17 +327,15 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -359,66 +355,62 @@ service: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} - ingress: enabled: true - ## @param ingress.pathType Ingress path type - ## + ## @param ingress.pathType Ingress path type + ## pathType: ImplementationSpecific - ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) - ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: null ## @param ingress.hostname Default host for the ingress record +## hostname: account-lookup-service-admin.local - ## @param servicePort : port for the service - ## + ## @param servicePort : port for the service + ## servicePort: 80 - ## @param ingress.path Default path for the ingress record - ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers path: / - ## @param ingress.annotations Additional custom annotations for the ingress record - ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added - ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false - ## @param ingress.certManager Add the corresponding annotations for cert-manager integration - ## + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## certManager: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## selfSigned: false - ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record - ## e.g: - ## extraHosts: - ## - name: transfer-api-svc.local - ## path: / - ## - extraHosts: - extraPaths: - extraTls: - secrets: + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## # - 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 +# 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 diff --git a/account-lookup-service/chart-service/Chart.yaml b/account-lookup-service/chart-service/Chart.yaml index cf7edd64d..516c2b245 100644 --- a/account-lookup-service/chart-service/Chart.yaml +++ b/account-lookup-service/chart-service/Chart.yaml @@ -1,18 +1,16 @@ apiVersion: v2 -version: 14.2.0 -appVersion: "15.0.0" +version: 14.5.0 +appVersion: v15.2.1 description: A Helm chart for Kubernetes name: account-lookup-service maintainers: - name: Miguel de Barros - email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com + email: miguel.debarros@modusbox.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/account-lookup-service/chart-service/configs/default.json b/account-lookup-service/chart-service/configs/default.json index 9eaff5875..cf56c94ce 100644 --- a/account-lookup-service/chart-service/configs/default.json +++ b/account-lookup-service/chart-service/configs/default.json @@ -22,6 +22,11 @@ }, "DISPLAY_ROUTES": {{ .Values.config.display_routes }}, "RUN_MIGRATIONS": {{ .Values.config.run_migrations }}, + "PARTICIPANT_CACHE_CONFIG": { + "expiresIn": 10, + "generateTimeout": 30000, + "getDecoratedValue": true + }, "CENTRAL_SHARED_ENDPOINT_CACHE_CONFIG": { "expiresIn": {{ .Values.config.central_shared_end_point_cache.expiresIn }}, "generateTimeout": {{ .Values.config.central_shared_end_point_cache.generateTimeout }}, diff --git a/account-lookup-service/chart-service/templates/deployment.yaml b/account-lookup-service/chart-service/templates/deployment.yaml index a6f4453ad..c38f5acaf 100644 --- a/account-lookup-service/chart-service/templates/deployment.yaml +++ b/account-lookup-service/chart-service/templates/deployment.yaml @@ -197,7 +197,14 @@ spec: {{- if .Values.config.endpointSecurity.jwsSign }} - name: jws-signing-key secret: + {{- if .Values.config.endpointSecurity.jwsSigningKeySecret }} + secretName: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.name }} + items: + - key: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.key }} + path: jwsSigningKey.key + {{ else }} secretName: {{ template "account-lookup-service-api.fullname" . }}-jws-signing-key + {{- end }} {{- end }} {{- if .Values.sidecar.enabled }} - name: {{ template "account-lookup-service-api.fullname" . }}-sidecar-volume diff --git a/account-lookup-service/chart-service/templates/secret-jws.yaml b/account-lookup-service/chart-service/templates/secret-jws.yaml index 7fecb9211..01fdff5eb 100644 --- a/account-lookup-service/chart-service/templates/secret-jws.yaml +++ b/account-lookup-service/chart-service/templates/secret-jws.yaml @@ -1,6 +1,6 @@ -{{- if .Values.config.endpointSecurity.jwsSign }} +{{- if (and .Values.config.endpointSecurity.jwsSign (not .Values.config.endpointSecurity.jwsSigningKeySecret)) }} {{- if (not .Values.config.endpointSecurity.jwsSigningKey) }} - {{- fail "JWS signing enabled but no jwsSigningKey provided. You will need to supply a JWS signing key in string form .Values.endpointSecurity.jwsSigningKey." }} + {{- fail "JWS signing enabled but neither jwsSigningKey nor jwsSigningKeySecret was provided. You will need to supply a JWS signing key in string form via .Values.endpointSecurity.jwsSigningKey or a secret via .Values.endpointSecurity.jwsSigningKeySecret." }} {{- end }} apiVersion: v1 kind: Secret diff --git a/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 407aee76c..aaa038db9 100644 --- a/account-lookup-service/chart-service/values.yaml +++ b/account-lookup-service/chart-service/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.0.0 + tag: v15.2.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -31,7 +31,7 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/index.js - server @@ -40,7 +40,6 @@ diagnosticMode: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -177,9 +176,8 @@ config: ] } } - ## DB Configuration - db_type: mysql + db_type: mysql db_driver: mysql db_host: mysqldb db_port: 3306 @@ -211,22 +209,25 @@ config: endpointSecurity: jwsSign: false fspiopSourceSigningName: switch - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - # Thirdparty API Config + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null +# To generate this key: +# Private: +# ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key +# Public: +# openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub +# Should look like: +# -----BEGIN RSA PRIVATE KEY----- +# MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R +# .. +# .. +# mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 +# -----END RSA PRIVATE KEY----- +# Thirdparty API Config featureEnableExtendedPartyIdType: false - ## Tracing Configuration event_trace_vendor: mojaloop event_log_filter: 'audit:*, log:warn, log:error' @@ -260,9 +261,9 @@ initContainers: | do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -305,17 +306,15 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -335,66 +334,62 @@ service: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} - ingress: enabled: true - ## @param ingress.pathType Ingress path type - ## + ## @param ingress.pathType Ingress path type + ## pathType: ImplementationSpecific - ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) - ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: null ## @param ingress.hostname Default host for the ingress record +## hostname: account-lookup-service.local - ## @param servicePort : port for the service - ## + ## @param servicePort : port for the service + ## servicePort: 80 - ## @param ingress.path Default path for the ingress record - ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers path: / - ## @param ingress.annotations Additional custom annotations for the ingress record - ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added - ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false - ## @param ingress.certManager Add the corresponding annotations for cert-manager integration - ## + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## certManager: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## selfSigned: false - ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record - ## e.g: - ## extraHosts: - ## - name: transfer-api-svc.local - ## path: / - ## - extraHosts: - extraPaths: - extraTls: - secrets: + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## # - 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 +# 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 diff --git a/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index 873cb4b95..26d140787 100644 --- a/account-lookup-service/values.yaml +++ b/account-lookup-service/values.yaml @@ -7,7 +7,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.0.0 + tag: v15.2.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -130,23 +130,25 @@ account-lookup-service: endpointSecurity: jwsSign: false fspiopSourceSigningName: switch - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- # Thirdparty API Config featureEnableExtendedPartyIdType: false - ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ## e.g: @@ -169,9 +171,9 @@ account-lookup-service: do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -209,17 +211,17 @@ account-lookup-service: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: + http: null + https: null ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -253,7 +255,7 @@ account-lookup-service: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: account-lookup-service.local @@ -266,7 +268,7 @@ account-lookup-service: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -287,31 +289,28 @@ account-lookup-service: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - + # - 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 - + # 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 account-lookup-service-admin: enabled: true - # Default values for account-lookup-service. # This is a YAML-formatted file. # Declare variables to be passed into your templates. @@ -319,7 +318,7 @@ account-lookup-service-admin: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.0.0 + tag: v15.2.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -383,9 +382,8 @@ account-lookup-service-admin: enabled: false maxByteSize: 10000000 expiresIn: 61000 - ## DB Configuration - db_type: mysql + db_type: mysql db_driver: mysql db_host: mysqldb db_port: 3306 @@ -439,20 +437,23 @@ account-lookup-service-admin: endpointSecurity: jwsSign: false fspiopSourceSigningName: switch - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- # Log config log_level: info log_transport: file @@ -478,13 +479,13 @@ account-lookup-service-admin: - sh - -c - | - until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; + until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -544,17 +545,17 @@ account-lookup-service-admin: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -588,7 +589,7 @@ account-lookup-service-admin: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: account-lookup-service-admin.local @@ -601,7 +602,7 @@ account-lookup-service-admin: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -622,34 +623,32 @@ account-lookup-service-admin: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - + # - 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 - + # 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 als-oracle-pathfinder: enabled: false # Declare variables to be passed into your templates. image: repository: mojaloop/als-oracle-pathfinder - tag: v12.0.0 + tag: v12.1.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -675,14 +674,13 @@ als-oracle-pathfinder: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - /opt/app/src/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -871,13 +869,13 @@ als-oracle-pathfinder: - sh - -c - | - until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; + until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -906,7 +904,7 @@ als-oracle-pathfinder: - | echo Running MySQL init scripts; mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e "SET @service_name='${SERVICE_NAME}'; source /opt/app/init-central-ledger.sql;"; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -935,13 +933,13 @@ als-oracle-pathfinder: - sh - -c - | - until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; + until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -970,7 +968,7 @@ als-oracle-pathfinder: - | echo Running MySQL init scripts; mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e "SET @service_name='${SERVICE_NAME}'; source /opt/app/init-account-lookup.sql;"; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -1020,7 +1018,7 @@ als-oracle-pathfinder: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: als-oracle-pathfinder.local @@ -1033,7 +1031,7 @@ als-oracle-pathfinder: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -1054,22 +1052,20 @@ als-oracle-pathfinder: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## 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 + # 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 - - diff --git a/als-oracle-pathfinder/Chart.yaml b/als-oracle-pathfinder/Chart.yaml index 737464b30..cb12861cc 100644 --- a/als-oracle-pathfinder/Chart.yaml +++ b/als-oracle-pathfinder/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: A PathFinder oracle for ALS. Resolves MSISDN to participant ID. name: als-oracle-pathfinder -version: 13.0.1 -appVersion: "12.0.0" +version: 13.3.0 +appVersion: v12.1.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -10,13 +10,11 @@ sources: - https://github.com/mojaloop/helm - https://github.com/mojaloop/als-oracle-pathfinder maintainers: - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/als-oracle-pathfinder/values.yaml b/als-oracle-pathfinder/values.yaml index c57132628..dbe520654 100644 --- a/als-oracle-pathfinder/values.yaml +++ b/als-oracle-pathfinder/values.yaml @@ -7,7 +7,7 @@ global: {} # Declare variables to be passed into your templates. image: repository: mojaloop/als-oracle-pathfinder - tag: v12.0.0 + tag: v12.1.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -33,14 +33,13 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - /opt/app/src/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -424,62 +423,61 @@ service: provisioning: name: http-api externalPort: 3000 - ingress: enabled: true - ## @param ingress.pathType Ingress path type - ## + ## @param ingress.pathType Ingress path type + ## pathType: ImplementationSpecific - ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) - ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: null +## @param ingress.hostname Default host for the ingress record +## hostname: als-oracle-pathfinder.local - ## @param servicePort : port for the service - ## + ## @param servicePort : port for the service + ## servicePort: 80 - ## @param ingress.path Default path for the ingress record - ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers path: / - ## @param ingress.annotations Additional custom annotations for the ingress record - ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added - ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: null +## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false - ## @param ingress.certManager Add the corresponding annotations for cert-manager integration - ## + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## certManager: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## selfSigned: false - ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record - ## e.g: - ## extraHosts: - ## - name: transfer-api-svc.local - ## path: / - ## - extraHosts: - extraPaths: - extraTls: - secrets: + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## 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 +# 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 diff --git a/bulk-api-adapter/Chart.yaml b/bulk-api-adapter/Chart.yaml index e68d7afed..71d89264f 100644 --- a/bulk-api-adapter/Chart.yaml +++ b/bulk-api-adapter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: bulk-api-adapter Helm chart for Kubernetes name: bulk-api-adapter -version: 14.0.0 -appVersion: "17.0.0" +version: 14.5.0 +appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,21 +12,19 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: bulk-api-adapter-service - version: ">= 14.0.0" + version: ">= 14.3.0" repository: "file://./chart-service" condition: bulk-api-adapter-service.enabled - name: bulk-api-adapter-handler-notification - version: ">= 14.0.0" + version: ">= 14.3.0" repository: "file://./chart-handler-notification" condition: bulk-api-adapter-handler-notification.enabled - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/bulk-api-adapter/chart-handler-notification/Chart.yaml b/bulk-api-adapter/chart-handler-notification/Chart.yaml index 964cc4f03..0999d3c1c 100644 --- a/bulk-api-adapter/chart-handler-notification/Chart.yaml +++ b/bulk-api-adapter/chart-handler-notification/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: bulk-api-adapter Handler for Notifications component Helm chart for Kubernetes name: bulk-api-adapter-handler-notification -version: 14.0.0 -appVersion: "17.0.0" +version: 14.3.0 +appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml index c54874a63..5d9a7cb82 100644 --- a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -135,5 +135,12 @@ spec: {{- if .Values.config.endpointSecurity.jwsSign }} - name: jws-signing-key secret: + {{- if .Values.config.endpointSecurity.jwsSigningKeySecret }} + secretName: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.name }} + items: + - key: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.key }} + path: jwsSigningKey.key + {{ else }} secretName: {{ template "bulk-api-adapter-handler-notification.fullname" . }}-jws-signing-key + {{- end }} {{- end }} diff --git a/bulk-api-adapter/chart-handler-notification/templates/secret-jws.yaml b/bulk-api-adapter/chart-handler-notification/templates/secret-jws.yaml index 71b4b6652..f3c3777df 100644 --- a/bulk-api-adapter/chart-handler-notification/templates/secret-jws.yaml +++ b/bulk-api-adapter/chart-handler-notification/templates/secret-jws.yaml @@ -1,6 +1,6 @@ -{{- if .Values.config.endpointSecurity.jwsSign }} +{{- if and .Values.config.endpointSecurity.jwsSign (not .Values.config.endpointSecurity.jwsSigningKeySecret) }} {{- if (not .Values.config.endpointSecurity.jwsSigningKey) }} - {{- fail "JWS signing enabled but no jwsSigningKey provided. You will need to supply a JWS signing key in string form .Values.endpointSecurity.jwsSigningKey." }} + {{- fail "JWS signing enabled but neither jwsSigningKey nor jwsSigningKeySecret was provided. You will need to supply a JWS signing key in string form via .Values.endpointSecurity.jwsSigningKey or a secret via .Values.endpointSecurity.jwsSigningKeySecret." }} {{- end }} apiVersion: v1 kind: Secret diff --git a/bulk-api-adapter/chart-handler-notification/values.yaml b/bulk-api-adapter/chart-handler-notification/values.yaml index f997c6739..742e4998a 100644 --- a/bulk-api-adapter/chart-handler-notification/values.yaml +++ b/bulk-api-adapter/chart-handler-notification/values.yaml @@ -146,7 +146,11 @@ config: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key diff --git a/bulk-api-adapter/chart-service/Chart.yaml b/bulk-api-adapter/chart-service/Chart.yaml index cd34e01fb..96af45d5d 100644 --- a/bulk-api-adapter/chart-service/Chart.yaml +++ b/bulk-api-adapter/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: bulk-api-adapter API component Helm chart for Kubernetes name: bulk-api-adapter-service -version: 14.0.0 -appVersion: "17.0.0" +version: 14.3.0 +appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/bulk-api-adapter/values.yaml b/bulk-api-adapter/values.yaml index 492efa490..3fa9b4c92 100644 --- a/bulk-api-adapter/values.yaml +++ b/bulk-api-adapter/values.yaml @@ -476,7 +476,11 @@ bulk-api-adapter-handler-notification: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key diff --git a/bulk-centralledger/Chart.yaml b/bulk-centralledger/Chart.yaml index 31fdb6de9..8684a6786 100644 --- a/bulk-centralledger/Chart.yaml +++ b/bulk-centralledger/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Bulk Services Helm chart for Kubernetes name: bulk-centralledger -version: 14.1.0 -appVersion: "17.3.2" +version: 14.7.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,21 +12,19 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: cl-handler-bulk-transfer-prepare - version: ">= 14.1.0" + version: ">= 14.4.0" repository: "file://./chart-handler-bulk-transfer-prepare" condition: cl-handler-bulk-transfer-prepare.enabled - name: cl-handler-bulk-transfer-fulfil - version: ">= 14.1.0" + version: ">= 14.4.0" repository: "file://./chart-handler-bulk-transfer-fulfil" condition: cl-handler-bulk-transfer-fulfil.enabled - name: cl-handler-bulk-transfer-processing - version: ">= 14.1.0" + version: ">= 14.4.0" repository: "file://./chart-handler-bulk-transfer-processing" condition: cl-handler-bulk-transfer-processing.enabled - name: cl-handler-bulk-transfer-get @@ -34,7 +32,7 @@ dependencies: repository: "file://./chart-handler-bulk-transfer-get" condition: cl-handler-bulk-transfer-get.enabled - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml index 03f5e587e..ee11c69a5 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: v2 description: Central-Ledger Bulk Transfer Fulfil Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-fulfil -version: 14.1.0 -appVersion: "17.3.2" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml index fab2f1aba..1f16f1c46 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: v2 description: Central-Ledger Bulk Transfer Get Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-get -version: 14.1.0 -appVersion: "17.3.2" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml index 71a9a22d8..10fc14c46 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: v2 description: Central-Ledger Bulk Transfer Prepare Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-prepare -version: 14.1.0 -appVersion: "17.3.2" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml index 1e5c0ac19..9d69f8db1 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: v2 description: Central-Ledger Bulk Transfer Processing Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-processing -version: 14.1.0 -appVersion: "17.3.2" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/centralenduserregistry/Chart.yaml b/centralenduserregistry/Chart.yaml index 7d015232b..f2a703485 100644 --- a/centralenduserregistry/Chart.yaml +++ b/centralenduserregistry/Chart.yaml @@ -11,8 +11,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: postgresql version: 0.9.1 diff --git a/centraleventprocessor/Chart.yaml b/centraleventprocessor/Chart.yaml index 32573eb23..03de73f5b 100644 --- a/centraleventprocessor/Chart.yaml +++ b/centraleventprocessor/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central Event Processor for Mojaloop name: centraleventprocessor -version: 13.0.1 -appVersion: "12.0.0" +version: 13.3.0 +appVersion: v12.1.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,11 +12,9 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/centraleventprocessor/values.yaml b/centraleventprocessor/values.yaml index fd1b84680..b039129dd 100644 --- a/centraleventprocessor/values.yaml +++ b/centraleventprocessor/values.yaml @@ -10,7 +10,7 @@ global: image: registry: docker.io repository: mojaloop/central-event-processor - tag: v12.0.0 + tag: v12.1.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -36,14 +36,13 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -197,17 +196,17 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null +## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null +## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -235,9 +234,9 @@ ingress: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + apiVersion: null +## @param ingress.hostname Default host for the ingress record +## hostname: central-event-processor.local ## @param servicePort : port for the service ## @@ -248,14 +247,14 @@ ingress: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + annotations: null +## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false ## @param ingress.certManager Add the corresponding annotations for cert-manager integration ## @@ -269,12 +268,11 @@ ingress: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 diff --git a/centralkms/Chart.yaml b/centralkms/Chart.yaml index dc69ccc5a..68dfde071 100644 --- a/centralkms/Chart.yaml +++ b/centralkms/Chart.yaml @@ -11,8 +11,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: postgresql version: 0.9.1 diff --git a/centralledger/Chart.yaml b/centralledger/Chart.yaml index 1daa37861..dd69d2ec9 100644 --- a/centralledger/Chart.yaml +++ b/centralledger/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Helm chart for Kubernetes name: centralledger -version: 14.3.0 -appVersion: "17.6.0" +version: 14.15.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,37 +12,35 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: centralledger-service - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-service" condition: centralledger-service.enabled - name: centralledger-handler-transfer-prepare - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-handler-transfer-prepare" condition: centralledger-handler-transfer-prepare.enabled - name: centralledger-handler-transfer-position - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-handler-transfer-position" condition: centralledger-handler-transfer-position.enabled - name: centralledger-handler-transfer-position-batch - version: ">= 15.4.0" + version: ">= 14.4.0" repository: "file://./chart-handler-transfer-position-batch" condition: centralledger-handler-transfer-position-batch.enabled - name: centralledger-handler-transfer-get - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-handler-transfer-get" condition: centralledger-handler-transfer-get.enabled - name: centralledger-handler-transfer-fulfil - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-handler-transfer-fulfil" condition: centralledger-handler-transfer-fulfil.enabled - name: centralledger-handler-timeout - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-handler-timeout" condition: centralledger-handler-timeout.enabled - name: centralledger-handler-admin-transfer diff --git a/centralledger/chart-handler-admin-transfer/Chart.yaml b/centralledger/chart-handler-admin-transfer/Chart.yaml index 7688065c8..cc1f63148 100644 --- a/centralledger/chart-handler-admin-transfer/Chart.yaml +++ b/centralledger/chart-handler-admin-transfer/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes name: centralledger-handler-admin-transfer -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralledger/chart-handler-timeout/Chart.yaml b/centralledger/chart-handler-timeout/Chart.yaml index 2a7dbbe59..7ab1a69bd 100644 --- a/centralledger/chart-handler-timeout/Chart.yaml +++ b/centralledger/chart-handler-timeout/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Timeout Handler Helm chart for Kubernetes name: centralledger-handler-timeout -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralledger/chart-handler-transfer-fulfil/Chart.yaml b/centralledger/chart-handler-transfer-fulfil/Chart.yaml index fb60ab0f4..b9470a59c 100644 --- a/centralledger/chart-handler-transfer-fulfil/Chart.yaml +++ b/centralledger/chart-handler-transfer-fulfil/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Transfer Fulfil Handler Helm chart for Kubernetes name: centralledger-handler-transfer-fulfil -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralledger/chart-handler-transfer-get/Chart.yaml b/centralledger/chart-handler-transfer-get/Chart.yaml index a0a99abba..3dddc84d8 100644 --- a/centralledger/chart-handler-transfer-get/Chart.yaml +++ b/centralledger/chart-handler-transfer-get/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Get Transfer Handler Helm chart for Kubernetes name: centralledger-handler-transfer-get -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralledger/chart-handler-transfer-position/Chart.yaml b/centralledger/chart-handler-transfer-position/Chart.yaml index f091f213d..67074ccfc 100644 --- a/centralledger/chart-handler-transfer-position/Chart.yaml +++ b/centralledger/chart-handler-transfer-position/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Transfer Position Handler Helm chart for Kubernetes name: centralledger-handler-transfer-position -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralledger/chart-handler-transfer-prepare/Chart.yaml b/centralledger/chart-handler-transfer-prepare/Chart.yaml index 447cec757..e9d1e54a9 100644 --- a/centralledger/chart-handler-transfer-prepare/Chart.yaml +++ b/centralledger/chart-handler-transfer-prepare/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes name: centralledger-handler-transfer-prepare -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralledger/chart-service/Chart.yaml b/centralledger/chart-service/Chart.yaml index ca4723f2b..e3aeb8b6e 100644 --- a/centralledger/chart-service/Chart.yaml +++ b/centralledger/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Ledger Service Helm chart for Kubernetes name: centralledger-service -version: 14.3.0 -appVersion: "17.6.0" +version: 14.4.0 +appVersion: v17.6.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: diff --git a/centralsettlement/Chart.yaml b/centralsettlement/Chart.yaml index 3f615537d..d2dedc613 100644 --- a/centralsettlement/Chart.yaml +++ b/centralsettlement/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Central-Settlement Helm chart for Kubernetes name: centralsettlement -version: 14.1.1 -appVersion: "v16.0.0" +version: 14.6.0 +appVersion: v16.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,33 +12,31 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: centralsettlement-service - version: ">= 15.0.1" + version: ">= 15.1.0" repository: "file://./chart-service" alias: centralsettlement-service condition: centralsettlement-service.enabled - name: centralsettlement-service - version: ">= 15.0.1" + version: ">= 15.1.0" repository: "file://./chart-service" alias: centralsettlement-handler-deferredsettlement condition: centralsettlement-handler-deferredsettlement.enabled - name: centralsettlement-service - version: ">= 15.0.1" + version: ">= 15.1.0" repository: "file://./chart-service" alias: centralsettlement-handler-grosssettlement condition: centralsettlement-handler-grosssettlement.enabled - name: centralsettlement-service - version: ">= 15.0.1" + version: ">= 15.1.0" repository: "file://./chart-service" alias: centralsettlement-handler-rules condition: centralsettlement-handler-rules.enabled - name: common - repository: https://mojaloop.github.io/charts/repo + repository: https://mojaloop.github.io/charts/repo version: 2.0.0 tags: - moja-common diff --git a/centralsettlement/chart-service/Chart.yaml b/centralsettlement/chart-service/Chart.yaml index c2bc07e05..153b41f64 100644 --- a/centralsettlement/chart-service/Chart.yaml +++ b/centralsettlement/chart-service/Chart.yaml @@ -1,25 +1,23 @@ apiVersion: v2 description: Central-Settlement helm chart for API services and handlers name: centralsettlement-service -version: 15.0.1 -appVersion: "v16.0.0" +version: 15.1.0 +appVersion: v16.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: - - https://github.com/mojaloop/mojaloop - - https://github.com/mojaloop/helm + - https://github.com/mojaloop/mojaloop + - https://github.com/mojaloop/helm maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - name: Valentin Genev email: valentin.genev@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - - name: common - repository: "https://mojaloop.github.io/charts/repo" - tags: - - moja-common - version: 2.0.0 + - name: common + repository: "https://mojaloop.github.io/charts/repo" + tags: + - moja-common + version: 2.0.0 diff --git a/emailnotifier/Chart.yaml b/emailnotifier/Chart.yaml index a69f0f637..67e0a87b8 100644 --- a/emailnotifier/Chart.yaml +++ b/emailnotifier/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Email Notifier For Mojaloop name: emailnotifier -version: 13.0.1 -appVersion: "14.0.0" +version: 13.3.0 +appVersion: v14.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -14,11 +14,9 @@ maintainers: email: valentin.genev@modusbox.com - name: Deon Botha email: deon.botha@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/eventstreamprocessor/Chart.yaml b/eventstreamprocessor/Chart.yaml index ca1d6cf93..e83a73ffb 100644 --- a/eventstreamprocessor/Chart.yaml +++ b/eventstreamprocessor/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Event Stream Processor for Mojaloop name: eventstreamprocessor -version: 13.0.1 -appVersion: "12.0.0-snapshot.7" +version: 13.3.0 +appVersion: v12.0.0-snapshot.9 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,11 +12,9 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/eventstreamprocessor/values.yaml b/eventstreamprocessor/values.yaml index e72b826e0..3e2243839 100644 --- a/eventstreamprocessor/values.yaml +++ b/eventstreamprocessor/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/event-stream-processor - tag: v12.0.0-snapshot.7 + tag: v12.0.0-snapshot.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -35,14 +35,13 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -117,25 +116,25 @@ config: span: START_CRITERIA: transfer: - - prepare: - service: ml_transfer_prepare - - fulfil: - service: ml_transfer_fulfil - - abort: - service: ml_transfer_abort - - timeout-received: - service: cl_transfer_timeout + - prepare: + service: ml_transfer_prepare + - fulfil: + service: ml_transfer_fulfil + - abort: + service: ml_transfer_abort + - timeout-received: + service: cl_transfer_timeout END_CRITERIA: transfer: - - fulfil: - service: ml_notification_event - - abort: - service: ml_notification_event - - prepare: - service: ml_notification_event - isError: true - - timeout-received: - service: ml_notification_event + - fulfil: + service: ml_notification_event + - abort: + service: ml_notification_event + - prepare: + service: ml_notification_event + isError: true + - timeout-received: + service: ml_notification_event exceptionList: [] # log level config log_level: info @@ -193,17 +192,17 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null +## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null +## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -231,9 +230,9 @@ ingress: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + apiVersion: null +## @param ingress.hostname Default host for the ingress record +## hostname: event-stream-processor.local ## @param servicePort : port for the service ## @@ -244,14 +243,14 @@ ingress: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + annotations: null +## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false ## @param ingress.certManager Add the corresponding annotations for cert-manager integration ## @@ -265,12 +264,11 @@ ingress: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 diff --git a/example-mojaloop-backend/Chart.yaml b/example-mojaloop-backend/Chart.yaml index f40b96191..e7cfba819 100644 --- a/example-mojaloop-backend/Chart.yaml +++ b/example-mojaloop-backend/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Example Helm chart for mojaloop backend dependencies name: example-mojaloop-backend -version: 15.0.0 -appVersion: "nginx: 4.4.2; mysql: 9.4.1; kafka: 19.0.2; mongodb: 13.3.1; redis: 17.3.7" +version: 15.7.0 +appVersion: "nginx: 4.4.2; mysql: 9.19.1; kafka: 26.8.5; mongodb: 14.8.3; redis: 18.12.1" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -13,8 +13,6 @@ maintainers: email: miguel.debarros@modusbox.com - name: Vijay Kumar Guthi email: vijaya.guthi@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: kafka alias: kafka @@ -25,7 +23,7 @@ dependencies: - dependency - backend - kafka - version: 19.0.2 + version: 26.8.5 ## mysql database - name: mysql alias: mysql @@ -38,7 +36,7 @@ dependencies: - mysql - centralledger - account-lookup - version: 9.4.8 + version: 9.19.1 ## Bulk backend - name: mongodb alias: cl-mongodb @@ -50,7 +48,7 @@ dependencies: - backend - mongodb - centralledger - version: 13.3.1 + version: 14.8.3 ## Central-event-processor backend - name: mongodb alias: cep-mongodb @@ -62,7 +60,7 @@ dependencies: - backend - mongodb - centralledger - version: 13.3.1 + version: 14.8.3 - name: mongodb alias: ttk-mongodb condition: ttk-mongodb.enabled @@ -73,7 +71,7 @@ dependencies: - backend - mongodb - centralledger - version: 13.3.1 + version: 14.8.3 ## Redis for SDK-Scheme-Adapter that are part of the TTKSims - name: redis alias: ttksims-redis @@ -87,7 +85,7 @@ dependencies: - sdk - bulk - ttksims - version: 17.3.7 + version: 18.12.1 ## Redis for Thirdparty Auth-Service - name: redis alias: auth-svc-redis @@ -99,4 +97,4 @@ dependencies: - backend - redis - thirdparty - version: 17.3.7 + version: 18.12.1 diff --git a/finance-portal-settlement-management/Chart.yaml b/finance-portal-settlement-management/Chart.yaml index 6953f53a7..00c6a7993 100755 --- a/finance-portal-settlement-management/Chart.yaml +++ b/finance-portal-settlement-management/Chart.yaml @@ -6,8 +6,6 @@ appVersion: "settlement-management: v11.0.0; operator-settlement: v11.0.0" maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common repository: https://mojaloop.github.io/charts/repo diff --git a/finance-portal/Chart.yaml b/finance-portal/Chart.yaml index a4d81d2d5..4c8ad870d 100644 --- a/finance-portal/Chart.yaml +++ b/finance-portal/Chart.yaml @@ -6,8 +6,6 @@ appVersion: "finance-portal-ui: v10.4.3; finance-portal-backend-service: v15.0.2 maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common repository: https://mojaloop.github.io/charts/repo diff --git a/forensicloggingsidecar/Chart.yaml b/forensicloggingsidecar/Chart.yaml index 3cbcc0912..08e22ed8b 100644 --- a/forensicloggingsidecar/Chart.yaml +++ b/forensicloggingsidecar/Chart.yaml @@ -11,8 +11,6 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: centralkms version: ">= 2.5.0" diff --git a/kube-system/ntpd/Chart.yaml b/kube-system/ntpd/Chart.yaml index 1548d41b0..8e991917d 100644 --- a/kube-system/ntpd/Chart.yaml +++ b/kube-system/ntpd/Chart.yaml @@ -2,15 +2,13 @@ apiVersion: v2 appVersion: "1.0" description: ntpd Helm chart for Kubernetes name: ntpd -version: 0.3.0 +version: 0.5.0 maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/ml-api-adapter/Chart.yaml b/ml-api-adapter/Chart.yaml index d299e78bf..55574e563 100644 --- a/ml-api-adapter/Chart.yaml +++ b/ml-api-adapter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: ml-api-adapter Helm chart for Kubernetes name: ml-api-adapter -version: 13.0.1 -appVersion: "14.0.5" +version: 13.5.0 +appVersion: v14.0.5 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,21 +12,19 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: ml-api-adapter-service - version: ">= 13.0.1" + version: ">= 13.3.0" repository: "file://./chart-service" condition: ml-api-adapter-service.enabled - name: ml-api-adapter-handler-notification - version: ">= 13.0.1" + version: ">= 13.3.0" repository: "file://./chart-handler-notification" condition: ml-api-adapter-handler-notification.enabled - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/ml-api-adapter/chart-handler-notification/Chart.yaml b/ml-api-adapter/chart-handler-notification/Chart.yaml index 117485e16..ed430a82b 100644 --- a/ml-api-adapter/chart-handler-notification/Chart.yaml +++ b/ml-api-adapter/chart-handler-notification/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: ml-api-adapter Handler for Notifications component Helm chart for Kubernetes name: ml-api-adapter-handler-notification -version: 13.0.1 -appVersion: "14.0.5" +version: 13.3.0 +appVersion: v14.0.5 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/ml-api-adapter/chart-handler-notification/templates/deployment.yaml b/ml-api-adapter/chart-handler-notification/templates/deployment.yaml index 146700cc7..69d59cf53 100644 --- a/ml-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/ml-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -180,7 +180,14 @@ spec: {{- if .Values.config.endpointSecurity.jwsSign }} - name: jws-signing-key secret: + {{- if .Values.config.endpointSecurity.jwsSigningKeySecret }} + secretName: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.name }} + items: + - key: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.key }} + path: jwsSigningKey.key + {{ else }} secretName: {{ template "ml-api-adapter-handler-notification.fullname" . }}-jws-signing-key + {{- end }} {{- end }} - name: {{ template "ml-api-adapter-handler-notification.fullname" . }}-config-volume configMap: diff --git a/ml-api-adapter/chart-handler-notification/templates/secret-jws.yaml b/ml-api-adapter/chart-handler-notification/templates/secret-jws.yaml index 2db032acf..1543da7e4 100644 --- a/ml-api-adapter/chart-handler-notification/templates/secret-jws.yaml +++ b/ml-api-adapter/chart-handler-notification/templates/secret-jws.yaml @@ -1,6 +1,6 @@ -{{- if .Values.config.endpointSecurity.jwsSign }} +{{- if and .Values.config.endpointSecurity.jwsSign (not .Values.config.endpointSecurity.jwsSigningKeySecret) }} {{- if (not .Values.config.endpointSecurity.jwsSigningKey) }} - {{- fail "JWS signing enabled but no jwsSigningKey provided. You will need to supply a JWS signing key in string form .Values.endpointSecurity.jwsSigningKey." }} + {{- fail "JWS signing enabled but neither jwsSigningKey nor jwsSigningKeySecret was provided. You will need to supply a JWS signing key in string form via .Values.endpointSecurity.jwsSigningKey or a secret via .Values.endpointSecurity.jwsSigningKeySecret." }} {{- end }} apiVersion: v1 kind: Secret diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 6448788f5..4e95070a6 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -31,7 +31,7 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/handlers/index.js - handler @@ -40,7 +40,6 @@ diagnosticMode: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -72,7 +71,7 @@ sidecar: enabled: true image: repository: mojaloop/event-sidecar - tag: v14.0.0 + tag: v14.0.5 pullPolicy: IfNotPresent command: '["npm", "run", "start"]' service: @@ -114,14 +113,7 @@ initContainers: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; - do - echo --------------------; - echo Waiting for Kafka...; - sleep 2; - done; - echo ====================; - echo Kafka ok!; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; sleep 2; done; echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST value: '{{ .Values.config.kafka_host }}' @@ -216,21 +208,24 @@ config: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - - ## Error handling Configuration + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null +# To generate this key: +# Private: +# ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key +# Public: +# openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub +# Should look like: +# -----BEGIN RSA PRIVATE KEY----- +# MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R +# .. +# .. +# mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 +# -----END RSA PRIVATE KEY----- +## Error handling Configuration error_handling: include_cause_extension: false truncate_extensions: true @@ -257,17 +252,15 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -295,9 +288,8 @@ ingress: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + apiVersion: null ## @param ingress.hostname Default host for the ingress record +## hostname: ml-api-adapter-notification.local ## @param servicePort : port for the service ## @@ -308,14 +300,13 @@ ingress: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false ## @param ingress.certManager Add the corresponding annotations for cert-manager integration ## @@ -329,12 +320,11 @@ ingress: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 diff --git a/ml-api-adapter/chart-service/Chart.yaml b/ml-api-adapter/chart-service/Chart.yaml index c1d52b9e8..35dec0030 100644 --- a/ml-api-adapter/chart-service/Chart.yaml +++ b/ml-api-adapter/chart-service/Chart.yaml @@ -1,25 +1,22 @@ apiVersion: v2 description: ml-api-adapter API component Helm chart for Kubernetes name: ml-api-adapter-service -version: 13.0.1 -appVersion: "14.0.5" +version: 13.3.0 +appVersion: v14.0.5 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: - - https://github.com/mojaloop/mojaloop - - https://github.com/mojaloop/helm - - https://github.com/mojaloop/ml-api-adapter + - https://github.com/mojaloop/mojaloop + - https://github.com/mojaloop/helm + - https://github.com/mojaloop/ml-api-adapter maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common - diff --git a/ml-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 5defff602..627101eb5 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -501,7 +501,11 @@ ml-api-adapter-handler-notification: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key diff --git a/ml-operator/Chart.yaml b/ml-operator/Chart.yaml index 4fc0cb260..fc728cb5c 100644 --- a/ml-operator/Chart.yaml +++ b/ml-operator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: ml-operator description: ml-operator makes running and managing a Mojaloop deployment easier type: application -version: 0.2.0 +version: 0.4.0 appVersion: 0.1.3 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png @@ -10,13 +10,11 @@ sources: - https://github.com/mojaloop/ml-operator - https://github.com/mojaloop/helm maintainers: - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/ml-testing-toolkit-cli/Chart.yaml b/ml-testing-toolkit-cli/Chart.yaml index e01718f9a..e070108aa 100644 --- a/ml-testing-toolkit-cli/Chart.yaml +++ b/ml-testing-toolkit-cli/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: ml-testing-toolkit-cli Helm chart for Kubernetes name: ml-testing-toolkit-cli -version: 15.3.2 -appVersion: "v1.2.1" +version: 15.6.0 +appVersion: v1.2.1 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Vijay Kumar Guthi email: vijaya.guthi@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/ml-testing-toolkit-cli/values.yaml b/ml-testing-toolkit-cli/values.yaml index b77001d49..1f07b387e 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-client-lib - tag: v1.2.0 + tag: v1.2.2 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -19,8 +19,6 @@ image: backoffLimit: 0 restartPolicy: Never - - ## Bash script for TTK CLI script: | echo "Downloading the test collection..."; @@ -106,10 +104,8 @@ job: # argocd.argoproj.io/hook: PostSync # argocd.argoproj.io/sync-wave: "-5" #### If passing the arguments using commad line, may be necessary scape the "." character -> i.e: "argocd\.argoproj\.io/hook": PostSync - # Add custom labels of job template here. templateLabels: {} - config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: https://github.com/mojaloop/testing-toolkit-test-cases/archive/v.zip @@ -162,16 +158,14 @@ testCaseEnvironmentFile: # } # } inputValues: {} - 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 - +# 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 diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index 34aa5a205..a65903a25 100644 --- a/ml-testing-toolkit/Chart.yaml +++ b/ml-testing-toolkit/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: ml-testing-toolkit Helm chart for Kubernetes name: ml-testing-toolkit -version: 17.0.0 -appVersion: "ml-testing-toolkit: v17.0.0 ml-testing-toolkit-ui: v15.4.0" +version: 17.4.0 +appVersion: "ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -15,23 +15,21 @@ sources: maintainers: - name: Vijay Kumar email: vijaya.guthi@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: ml-testing-toolkit-frontend - version: ">= 15.4.0" + version: ">= 15.7.0" repository: "file://./chart-frontend" condition: ml-testing-toolkit-frontend.enabled - name: ml-testing-toolkit-backend - version: ">= 16.0.0" + version: ">= 16.3.0" repository: "file://./chart-backend" condition: ml-testing-toolkit-backend.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index ba2b07643..d983ad0d3 100644 --- a/ml-testing-toolkit/chart-backend/Chart.yaml +++ b/ml-testing-toolkit/chart-backend/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: ml-testing-toolkit-backend Helm chart for Kubernetes name: ml-testing-toolkit-backend -version: 16.0.0 -appVersion: "v17.0.0" +version: 16.3.0 +appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,8 +12,6 @@ sources: maintainers: - name: Vijay Kumar Guthi email: vijaya.guthi@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com - name: Steven Oderayi @@ -21,6 +19,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index 6a23cf2cb..63c97ab63 100644 --- a/ml-testing-toolkit/chart-backend/values.yaml +++ b/ml-testing-toolkit/chart-backend/values.yaml @@ -9,7 +9,7 @@ enabled: true image: repository: mojaloop/ml-testing-toolkit - tag: v17.0.0 + tag: v17.1.1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/ml-testing-toolkit/chart-frontend/Chart.yaml b/ml-testing-toolkit/chart-frontend/Chart.yaml index d157b6dfb..2be4ede7d 100644 --- a/ml-testing-toolkit/chart-frontend/Chart.yaml +++ b/ml-testing-toolkit/chart-frontend/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: ml-testing-toolkit-frontend Helm chart for Kubernetes name: ml-testing-toolkit-frontend -version: 15.4.0 -appVersion: "v15.4.0" +version: 15.7.0 +appVersion: v15.4.2 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -12,13 +12,11 @@ sources: maintainers: - name: Vijay Kumar Guthi email: vijaya.guthi@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/ml-testing-toolkit/chart-frontend/values.yaml b/ml-testing-toolkit/chart-frontend/values.yaml index 976b50220..f9bdba8d9 100644 --- a/ml-testing-toolkit/chart-frontend/values.yaml +++ b/ml-testing-toolkit/chart-frontend/values.yaml @@ -1,10 +1,9 @@ # Default values for ml-api-adapter. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - image: repository: mojaloop/ml-testing-toolkit-ui - tag: v15.4.0 + tag: v15.4.2 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -69,8 +68,8 @@ config: ## imagePullPolicy: Always ## command: ['sh', '-c', 'echo "hello world"'] ## -initContainers: [] # We want to disable init-containers as there is no need - +initContainers: [] +# We want to disable init-containers as there is no need ## @param master.podLabels Extra labels for pod(s) ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ ## @@ -93,17 +92,17 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null +## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null +## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -133,29 +132,27 @@ ingress: port: 6060 paths: ['/'] 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" tls: [] - # Secrets must be manually created in the namespace. - # - secretName: chart-example-tls - # hosts: - # - chart-example.local + # Secrets must be manually created in the namespace. + # - secretName: chart-example-tls + # hosts: + # - chart-example.local className: "nginx" - 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 - +# 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 diff --git a/mojaloop-bulk/Chart.yaml b/mojaloop-bulk/Chart.yaml index b7fa21b67..731a3f0ad 100644 --- a/mojaloop-bulk/Chart.yaml +++ b/mojaloop-bulk/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Mojaloop Bulk Helm chart for Kubernetes name: mojaloop-bulk -version: 16.0.0 -appVersion: "bulk-api-adapter: v17.0.0; central-ledger: v17.3.2" +version: 16.6.0 +appVersion: "bulk-api-adapter: v17.0.0; central-ledger: v17.6.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -11,21 +11,19 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: bulk-api-adapter - version: ">= 14.0.0" + version: ">= 14.5.0" repository: "file://../bulk-api-adapter" condition: bulk-api-adapter.enabled - name: bulk-centralledger - version: ">= 14.1.0" + version: ">= 14.7.0" repository: "file://../bulk-centralledger" condition: bulk-centralledger.enabled - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/mojaloop-bulk/values.yaml b/mojaloop-bulk/values.yaml index cadaf624d..b31de5faf 100644 --- a/mojaloop-bulk/values.yaml +++ b/mojaloop-bulk/values.yaml @@ -478,7 +478,11 @@ bulk-api-adapter: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key diff --git a/mojaloop-simulator/Chart.yaml b/mojaloop-simulator/Chart.yaml index d04dcc149..c30d94c98 100644 --- a/mojaloop-simulator/Chart.yaml +++ b/mojaloop-simulator/Chart.yaml @@ -1,18 +1,16 @@ apiVersion: v2 description: "Helm Chart for the Mojaloop (SDK-based) Simulator" name: mojaloop-simulator -version: 15.0.0 -appVersion: "sdk-scheme-adapter: v23.1.1; mojaloop-simulator: v15.0.0; thirdparty-sdk: v15.1.1" +version: 15.2.0 +appVersion: "sdk-scheme-adapter: v23.4.0; mojaloop-simulator: v15.0.0; thirdparty-sdk: v15.1.1" dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com diff --git a/mojaloop-simulator/templates/deployment.yaml b/mojaloop-simulator/templates/deployment.yaml index 5038ce5ad..0de5c545e 100644 --- a/mojaloop-simulator/templates/deployment.yaml +++ b/mojaloop-simulator/templates/deployment.yaml @@ -55,8 +55,11 @@ spec: {{- if $config.config.schemeAdapter.env.JWS_SIGN }} - name: jws-private-key secret: - {{- if $config.config.schemeAdapter.secrets.jws.privKeySecretName }} - secretName: {{ $config.config.schemeAdapter.secrets.jws.privKeySecretName }} + {{- if $config.config.schemeAdapter.secrets.jws.privateKeySecret }} + secretName: {{ $config.config.schemeAdapter.secrets.jws.privateKeySecret.name }} + items: + - key: {{ $config.config.schemeAdapter.secrets.jws.privateKeySecret.key }} + path: private.key {{- else }} secretName: {{ $fullName }}-jws-priv-key {{- end }} diff --git a/mojaloop-simulator/templates/secret.yaml b/mojaloop-simulator/templates/secret.yaml index da2c82f8d..ae2f49a61 100644 --- a/mojaloop-simulator/templates/secret.yaml +++ b/mojaloop-simulator/templates/secret.yaml @@ -2,7 +2,12 @@ {{- range $name, $customConfig := .Values.simulators }} {{- $config := merge $customConfig $.Values.defaults }} {{- $fullName := printf "%s%s" (include "mojaloop-simulator.prefix" $) $name -}} -{{- if (and $config.config.schemeAdapter.env.JWS_SIGN (not $config.config.schemeAdapter.secrets.jws.privKeySecretName)) }} +{{- if (and $config.config.schemeAdapter.env.JWS_SIGN (not $config.config.schemeAdapter.secrets.jws.privateKeySecret)) }} +# Note that due to a bug with helm 2.9.1 the `required` function in combination with a missing +# key will not work in place of this if statement. +{{- if eq $config.config.schemeAdapter.secrets.jws.privateKey "" }} + {{ fail (printf "JWS_SIGN enabled- JWS private key required for %s. You need to specify %s.schemeAdapter.secrets.jws.privateKey or %s.schemeAdapter.secrets.jws.privateKeySecret." $name $name) }} +{{- end }} apiVersion: v1 kind: Secret metadata: @@ -11,11 +16,6 @@ metadata: 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 - # key will not work in place of this if statement. - {{- if eq $config.config.schemeAdapter.secrets.jws.privateKey "" }} - {{ fail (printf "JWS_SIGN enabled- JWS private key required for %s. You need to specify %s.schemeAdapter.secrets.jws.privateKey." $name $name) }} - {{- end }} "private.key": {{ $config.config.schemeAdapter.secrets.jws.privateKey | b64enc }} --- {{- end }} diff --git a/mojaloop-simulator/values.yaml b/mojaloop-simulator/values.yaml index 958142243..de5d2f880 100644 --- a/mojaloop-simulator/values.yaml +++ b/mojaloop-simulator/values.yaml @@ -262,20 +262,18 @@ defaults: inbound: &inbound outbound: *inbound jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: - # + privateKeySecret: {} # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to # populate JWS public keys. The format of this ConfigMap must be as described for @@ -287,7 +285,7 @@ defaults: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -578,19 +576,18 @@ defaults: inbound: &inbound outbound: *inbound jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: + privateKeySecret: {} # # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to diff --git a/mojaloop-ttk-simulators/Chart.yaml b/mojaloop-ttk-simulators/Chart.yaml index 9843ef0b4..50b7e32da 100644 --- a/mojaloop-ttk-simulators/Chart.yaml +++ b/mojaloop-ttk-simulators/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: mojaloop-ttk-simulator Helm chart for Kubernetes name: mojaloop-ttk-simulators -version: 2.0.0 -appVersion: "ml-testing-toolkit: v17.0.0, ml-testing-toolkit-ui: v15.4.0, sdk-scheme-adapter: v23.1.1" +version: 2.3.0 +appVersion: "ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.2; sdk-scheme-adapter: v23.4.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -21,7 +21,7 @@ dependencies: - mojaloop-simulator - testing-toolkit - sdk-scheme-adapter - version: ">= 2.0.0" + version: ">= 2.2.0" condition: mojaloop-ttk-sim1-svc.enabled - name: mojaloop-ttk-sim2-svc repository: "file://./chart-sim2" @@ -29,7 +29,7 @@ dependencies: - mojaloop-simulator - testing-toolkit - sdk-scheme-adapter - version: ">= 2.0.0" + version: ">= 2.2.0" condition: mojaloop-ttk-sim2-svc.enabled - name: mojaloop-ttk-sim3-svc repository: "file://./chart-sim3" @@ -37,5 +37,5 @@ dependencies: - mojaloop-simulator - testing-toolkit - sdk-scheme-adapter - version: ">= 2.0.0" + version: ">= 2.2.0" condition: mojaloop-ttk-sim3-svc.enabled diff --git a/mojaloop-ttk-simulators/chart-sim1/Chart.yaml b/mojaloop-ttk-simulators/chart-sim1/Chart.yaml index 7353e7973..9f5b4b1aa 100644 --- a/mojaloop-ttk-simulators/chart-sim1/Chart.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: mojaloop-ttk-sim1-svc -version: 2.0.0 +version: 2.2.0 description: A Helm chart for Kubernetes -appVersion: "ml-testing-toolkit: v17.0.0, ml-testing-toolkit-ui: v15.4.0, sdk-scheme-adapter: v23.1.1" +appVersion: "ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.2; sdk-scheme-adapter: v23.4.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -35,4 +35,4 @@ dependencies: repository: "https://mojaloop.github.io/charts/repo" tags: - moja-common - version: 2.0.0 + version: 3.0.0 diff --git a/mojaloop-ttk-simulators/chart-sim1/values.yaml b/mojaloop-ttk-simulators/chart-sim1/values.yaml index 8ac68e457..92841e179 100644 --- a/mojaloop-ttk-simulators/chart-sim1/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/values.yaml @@ -211,11 +211,11 @@ ml-testing-toolkit: } ] } - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/rules_response/default.json' - api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' - api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/rules_response/default.json' + api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' + api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) diff --git a/mojaloop-ttk-simulators/chart-sim2/Chart.yaml b/mojaloop-ttk-simulators/chart-sim2/Chart.yaml index 9f252c832..ed00f3c51 100644 --- a/mojaloop-ttk-simulators/chart-sim2/Chart.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: mojaloop-ttk-sim2-svc -version: 2.0.0 +version: 2.2.0 description: A Helm chart for Kubernetes -appVersion: "ml-testing-toolkit: v17.0.0, ml-testing-toolkit-ui: v15.4.0, sdk-scheme-adapter: v23.1.1" +appVersion: "ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.2; sdk-scheme-adapter: v23.4.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -35,4 +35,4 @@ dependencies: repository: "https://mojaloop.github.io/charts/repo" tags: - moja-common - version: 2.0.0 + version: 3.0.0 diff --git a/mojaloop-ttk-simulators/chart-sim2/values.yaml b/mojaloop-ttk-simulators/chart-sim2/values.yaml index 0352606c6..e0431a3b2 100644 --- a/mojaloop-ttk-simulators/chart-sim2/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/values.yaml @@ -206,11 +206,11 @@ ml-testing-toolkit: } ] } - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/rules_response/default.json' - api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' - api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/rules_response/default.json' + api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' + api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ diff --git a/mojaloop-ttk-simulators/chart-sim3/Chart.yaml b/mojaloop-ttk-simulators/chart-sim3/Chart.yaml index f1d7afcb3..3d6763c75 100644 --- a/mojaloop-ttk-simulators/chart-sim3/Chart.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: mojaloop-ttk-sim3-svc -version: 2.0.0 +version: 2.2.0 description: A Helm chart for Kubernetes -appVersion: "ml-testing-toolkit: v17.0.0, ml-testing-toolkit-ui: v15.4.0, sdk-scheme-adapter: v23.1.1" +appVersion: "ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.2; sdk-scheme-adapter: v23.4.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -35,4 +35,4 @@ dependencies: repository: "https://mojaloop.github.io/charts/repo" tags: - moja-common - version: 2.0.0 + version: 3.0.0 diff --git a/mojaloop-ttk-simulators/chart-sim3/values.yaml b/mojaloop-ttk-simulators/chart-sim3/values.yaml index 8af38f80d..07db71657 100644 --- a/mojaloop-ttk-simulators/chart-sim3/values.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/values.yaml @@ -206,11 +206,11 @@ ml-testing-toolkit: } ] } - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.0.1/test/func/config/ttk-ttksim3/spec_files/rules_response/default.json' - api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.0.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' - api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.0.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.0.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.0.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/rules_response/default.json' + api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' + api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index 0ac445d23..74fe8f5a8 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Mojaloop Helm chart for Kubernetes name: mojaloop -version: 15.4.0 -appVersion: "ml-api-adapter: v14.0.5; central-ledger: v17.6.0; account-lookup-service: v15.0.0; quoting-service: v15.5.0; central-settlement: v16.0.0; bulk-api-adapter: v17.0.0; transaction-requests-service: v14.1.2; simulator: v12.0.0; mojaloop-simulator: v15.0.0; sdk-scheme-adapter: v23.1.1; auth-service: v15.0.0; als-consent-oracle: v0.2.2; thirdparty-sdk: v15.1.1; ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.0;" +version: 16.0.0 +appVersion: "ml-api-adapter: v14.0.5; central-ledger: v17.6.0; account-lookup-service: v15.2.3; quoting-service: v15.7.0; central-settlement: v16.0.0; bulk-api-adapter: v17.0.0; transaction-requests-service: v14.1.2; simulator: v12.1.0; mojaloop-simulator: v15.0.0; sdk-scheme-adapter: v23.4.0; auth-service: v15.0.0; als-consent-oracle: v0.2.2; thirdparty-sdk: v15.1.1; ml-testing-toolkit: v17.0.0; ml-testing-toolkit-ui: v15.4.2;" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -11,126 +11,124 @@ sources: maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: account-lookup-service - version: ">= 14.2.0" + version: ">= 14.10.0" repository: "file://../account-lookup-service" condition: account-lookup-service.enabled - name: quoting-service - version: ">= 15.0.0" + version: ">= 15.6.0" repository: "file://../quoting-service" condition: quoting-service.enabled - name: ml-api-adapter - version: ">= 13.0.1" + version: ">= 13.5.0" repository: "file://../ml-api-adapter" condition: ml-api-adapter.enabled - name: centralledger - version: ">= 14.3.0" + version: ">= 14.15.0" repository: "file://../centralledger" condition: centralledger.enabled - name: centralsettlement - version: ">= 14.1.1" + version: ">= 14.6.0" repository: "file://../centralsettlement" condition: centralsettlement.enabled - name: simulator - version: ">= 13.0.0" + version: ">= 13.3.0" repository: "file://../simulator" condition: simulator.enabled - name: mojaloop-simulator - version: ">= 15.0.0" + version: ">= 15.2.0" repository: "file://../mojaloop-simulator" condition: mojaloop-simulator.enabled - name: mojaloop-bulk - version: ">= 16.0.0" + version: ">= 16.6.0" repository: "file://../mojaloop-bulk" condition: mojaloop-bulk.enabled - name: transaction-requests-service - version: ">= 13.0.1" + version: ">= 13.2.0" repository: "file://../transaction-requests-service" condition: transaction-requests-service.enabled - name: thirdparty - version: ">= 3.0.2" + version: ">= 3.6.0" repository: "file://../thirdparty" condition: thirdparty.enabled - name: mojaloop-ttk-simulators - version: ">= 2.0.0" + version: ">= 2.3.0" repository: "file://../mojaloop-ttk-simulators" condition: mojaloop-ttk-simulators.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + version: 3.0.0 tags: - moja-common - name: ml-testing-toolkit - version: ">= 17.0.0" + version: ">= 17.4.0" repository: "file://../ml-testing-toolkit" condition: ml-testing-toolkit.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-setup - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-setup.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-val-gp - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-val-gp.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-val-bulk - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-val-bulk.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-setup-tp - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-setup-tp.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-val-tp - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-val-tp.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-posthook-setup - version: ">= 15.3.2" + version: ">= 15.6.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: ">= 15.3.2" + version: ">= 15.6.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: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-cronjob-tests.scheduling.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-cronjob-cleanup - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-cronjob-cleanup.scheduling.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-setup-sdk-bulk - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-setup-sdk-bulk.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-val-sdk-bulk - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-val-sdk-bulk.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-val-sdk-r2p - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-val-sdk-r2p.tests.enabled - name: ml-testing-toolkit-cli alias: ml-ttk-test-cleanup - version: ">= 15.3.2" + version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-cleanup.tests.enabled diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 403cf862c..6d9e9f066 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -95,7 +95,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.0.0 + tag: v15.2.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -237,19 +237,23 @@ account-lookup-service: endpointSecurity: jwsSign: true fspiopSourceSigningName: switch + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null # jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- # The following is an example key and shouldn't be used in production jwsSigningKey: |- -----BEGIN PRIVATE KEY----- @@ -346,17 +350,17 @@ account-lookup-service: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: + http: null + https: null ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -390,7 +394,7 @@ account-lookup-service: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: account-lookup-service.local @@ -403,7 +407,7 @@ account-lookup-service: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -424,10 +428,10 @@ account-lookup-service: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## # - secretName: chart-example-tls @@ -462,7 +466,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.0.0 + tag: v15.2.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -598,38 +602,39 @@ account-lookup-service: endpointSecurity: jwsSign: false fspiopSourceSigningName: switch + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null # jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- # The following is an example key and shouldn't be used in production - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - - + jwsSigningKey: null + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- display_routes: true run_migrations: false - # Log config log_level: info log_transport: file @@ -721,17 +726,17 @@ account-lookup-service: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -765,7 +770,7 @@ account-lookup-service: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: account-lookup-service-admin.local @@ -778,7 +783,7 @@ account-lookup-service: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -790,37 +795,35 @@ account-lookup-service: ## @param ingress.certManager Add the corresponding annotations for cert-manager integration ## certManager: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## selfSigned: false - ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record - ## e.g: - ## extraHosts: - ## - name: transfer-api-svc.local - ## path: / - ## - extraHosts: - extraPaths: - extraTls: - secrets: + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## # - 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 - + # 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 requests: {} # cpu: 100m # memory: 128Mi @@ -835,10 +838,9 @@ account-lookup-service: enabled: false # Declare variables to be passed into your templates. # Declare variables to be passed into your templates. - image: repository: mojaloop/als-oracle-pathfinder - tag: v12.0.0 + tag: v12.1.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -1209,7 +1211,7 @@ account-lookup-service: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: als-oracle-pathfinder.local @@ -1222,7 +1224,7 @@ account-lookup-service: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -1243,27 +1245,59 @@ account-lookup-service: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - 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: + # 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: quoting-service: quoting-service: enabled: true + image: + registry: docker.io + repository: mojaloop/quoting-service + tag: v15.7.0 config: + ## 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: *CL_DB_HOST + db_port: *CL_DB_PORT + db_user: *CL_DB_USER + ## Secret-Management + ### Set this if you are using a clear password configured in the config section + # db_password: *CL_DB_PASSWORD + ### Configure this if you want to use a secret. Note, this will override the db_password, + ### Use the next line if you do wish to use the db_password value instead. + # db_secret: + ### Example config for an existing secret + db_secret: + name: *CL_DB_SECRET_NAME + key: *CL_DB_SECRET_KEY + db_database: *CL_DB_NAME + 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 + simple_routing_mode_enabled: true log_level: info log_transport: file @@ -1282,6 +1316,33 @@ quoting-service: include_cause_extension: false truncate_extensions: true + endpointSecurity: + jwsSign: false + fspiopSourceSigningName: 'switch' + jwsSigningKey: null + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- + + ## metric configuration for prometheus instrumentation + metrics: + ## flag to enable/disable the metrics end-points + enabled: true + config: + timeout: 5000 + prefix: moja_ + defaultLabels: + serviceName: quoting-service + sidecar: enabled: true image: @@ -1301,18 +1362,12 @@ quoting-service: event_log_grpc_port: 50051 log_level: info - ## metric configuration for prometheus instrumentation - metrics: - ## flag to enable/disable the metrics end-points - enabled: true - config: - timeout: 5000 - prefix: moja_ - defaultLabels: - serviceName: quoting-service - quoting-service-handler: enabled: true + image: + registry: docker.io + repository: mojaloop/quoting-service + tag: v15.7.0 config: ## DB Configuration @@ -1345,16 +1400,7 @@ quoting-service: db_debug: false simple_routing_mode_enabled: true log_level: info - - ## metric configuration for prometheus instrumentation - metrics: - ## flag to enable/disable the metrics end-points - enabled: true - config: - timeout: 5000 - prefix: moja_ - defaultLabels: - serviceName: quoting-service + log_transport: file # 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` @@ -1372,17 +1418,21 @@ quoting-service: endpointSecurity: jwsSign: true fspiopSourceSigningName: 'switch' - # jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + # jwsSigningKey: + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 # -----END RSA PRIVATE KEY----- # The following is an example key and shouldn't be used in production @@ -1416,6 +1466,17 @@ quoting-service: ecaG/Oyo/S+eM8nR7mc= -----END PRIVATE KEY----- + ## metric configuration for prometheus instrumentation + metrics: + ## flag to enable/disable the metrics end-points + enabled: true + config: + timeout: 5000 + prefix: moja_ + defaultLabels: + serviceName: quoting-service + + # sidecar configuration sidecar: enabled: true image: @@ -1435,19 +1496,8 @@ quoting-service: event_log_grpc_port: 50051 log_level: info - ## metric configuration for prometheus instrumentation - metrics: - ## flag to enable/disable the metrics end-points - enabled: true - config: - timeout: 5000 - prefix: moja_ - defaultLabels: - serviceName: quoting-service-handler - ml-api-adapter: enabled: true - ml-api-adapter-service: enabled: true # Default values for ml-api-adapter. @@ -1539,7 +1589,7 @@ ml-api-adapter: - name: wait-for-kafka image: solsson/kafka:2.8.1 imagePullPolicy: IfNotPresent - command: + command: - sh - -c - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; @@ -1630,17 +1680,17 @@ ml-api-adapter: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -1674,7 +1724,7 @@ ml-api-adapter: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: ml-api-adapter.local @@ -1687,7 +1737,7 @@ ml-api-adapter: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -1708,12 +1758,11 @@ ml-api-adapter: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -1820,7 +1869,7 @@ ml-api-adapter: - name: wait-for-kafka image: solsson/kafka:2.8.1 imagePullPolicy: IfNotPresent - command: + command: - sh - -c - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; @@ -1900,19 +1949,23 @@ ml-api-adapter: endpointSecurity: jwsSign: true fspiopSourceSigningName: 'switch' + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null # jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- # The following is an example key and shouldn't be used in production jwsSigningKey: |- -----BEGIN PRIVATE KEY----- @@ -1966,17 +2019,17 @@ ml-api-adapter: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -2010,7 +2063,7 @@ ml-api-adapter: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: ml-api-adapter-notification.local @@ -2023,7 +2076,7 @@ ml-api-adapter: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -2044,12 +2097,11 @@ ml-api-adapter: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -2308,17 +2360,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -2352,7 +2404,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger.local @@ -2365,7 +2417,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -2386,12 +2438,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -2649,17 +2700,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -2693,7 +2744,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-prepare.local @@ -2706,7 +2757,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -2727,12 +2778,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -2984,17 +3034,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -3028,7 +3078,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-position.local @@ -3041,7 +3091,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -3062,12 +3112,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -3163,7 +3212,7 @@ centralledger: enabled: true image: repository: mojaloop/event-sidecar - tag: v13.0.0 + tag: v14.0.0 pullPolicy: IfNotPresent readinessProbe: enabled: true @@ -3327,17 +3376,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -3371,7 +3420,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-position.local @@ -3384,7 +3433,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -3405,12 +3454,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -3662,17 +3710,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -3706,7 +3754,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-get.local @@ -3719,7 +3767,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -3740,12 +3788,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -4000,17 +4047,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -4044,7 +4091,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-fulfil.local @@ -4057,7 +4104,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -4078,12 +4125,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -4340,17 +4386,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -4384,7 +4430,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-timeout.local @@ -4397,7 +4443,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -4418,12 +4464,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -4675,17 +4720,17 @@ centralledger: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -4719,7 +4764,7 @@ centralledger: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-admin-transfer.local @@ -4732,7 +4777,7 @@ centralledger: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -4753,12 +4798,11 @@ centralledger: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -5109,17 +5153,17 @@ centralsettlement: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -5153,7 +5197,7 @@ centralsettlement: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-settlement-service.local @@ -5166,7 +5210,7 @@ centralsettlement: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -5187,12 +5231,11 @@ centralsettlement: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -5542,17 +5585,17 @@ centralsettlement: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -5586,7 +5629,7 @@ centralsettlement: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-settlement-deferredsettlement.local @@ -5599,7 +5642,7 @@ centralsettlement: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -5620,12 +5663,11 @@ centralsettlement: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -5977,17 +6019,17 @@ centralsettlement: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -6021,7 +6063,7 @@ centralsettlement: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-settlement-rules.local @@ -6034,7 +6076,7 @@ centralsettlement: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -6055,12 +6097,11 @@ centralsettlement: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -6349,13 +6390,13 @@ centralsettlement: # // End: 2100-12-31T23:59:59.999Z # // Description: This is empty rules script # // ******************************************************** - ## Globals: + ## Globals: # // payload: The contents of the message from the Kafka topic. # // transfer: The transfer object. # // # Functions: - ## Data retrieval functions: + ## Data retrieval functions: # // getTransfer(transferId): Retrieves a mojaloop transfer from the central-ledger API. - ## Helper functions: + ## 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: @@ -6502,17 +6543,17 @@ centralsettlement: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -6546,7 +6587,7 @@ centralsettlement: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-settlement-grosssettlement.local @@ -6559,7 +6600,7 @@ centralsettlement: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -6580,12 +6621,11 @@ centralsettlement: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -6774,17 +6814,17 @@ transaction-requests-service: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -6818,7 +6858,7 @@ transaction-requests-service: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: transaction-request-service.local @@ -6831,7 +6871,7 @@ transaction-requests-service: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -6852,12 +6892,11 @@ transaction-requests-service: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -7160,17 +7199,17 @@ thirdparty: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -7206,7 +7245,7 @@ thirdparty: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: auth-service.local @@ -7350,13 +7389,11 @@ thirdparty: ## Set toleration for scheduler ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] - # Add exta environment variables here env: [] - # e.g. - # - name: LOG_LEVEL - # value: debug - + # e.g. + # - name: LOG_LEVEL + # value: debug ## Svc configs config: ## DB Configuration @@ -7421,17 +7458,17 @@ thirdparty: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -7467,7 +7504,7 @@ thirdparty: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: consent-oracle.local @@ -7612,16 +7649,13 @@ thirdparty: ## Set toleration for scheduler ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] - # Add exta environment variables here env: [] - # e.g. to change the Log Level: - # - name: LOG_LEVEL - # value: debug - + # e.g. to change the Log Level: + # - name: LOG_LEVEL + # value: debug ## Svc configs config: {} - ## Svc config files config_files: default.json: | @@ -7698,17 +7732,17 @@ thirdparty: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -7744,7 +7778,7 @@ thirdparty: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: tp-api-svc.local @@ -8006,12 +8040,12 @@ thirdparty: "tempOverrideQuotesPartyIdType": "MSISDN", "testShouldOverrideConsentId": true, "testConsentRequestToConsentMap": { - "76059a0a-684f-4002-a880-b01159afe119": "76059a0a-684f-4002-a880-b01159afe119", - "6bf07f98-cfce-45ba-b048-7a86bac45d79": "be433b9e-9473-4b7d-bdd5-ac5b42463afb", - "c51ec534-ee48-4575-b6a9-ead2955b8069": "46876aac-5db8-4353-bb3c-a6a905843ce7", - "d51ec534-ee48-4575-b6a9-ead2955b8069": "23b07761-6b41-442a-b3d5-d876a6ea9ecc", - "b5d6206c-4f06-497d-af15-ed866ea6958f": "2acf1dfa-ce45-486e-b19e-ae4ad9804a63" - }, + "76059a0a-684f-4002-a880-b01159afe119": "76059a0a-684f-4002-a880-b01159afe119", + "6bf07f98-cfce-45ba-b048-7a86bac45d79": "be433b9e-9473-4b7d-bdd5-ac5b42463afb", + "c51ec534-ee48-4575-b6a9-ead2955b8069": "46876aac-5db8-4353-bb3c-a6a905843ce7", + "d51ec534-ee48-4575-b6a9-ead2955b8069": "23b07761-6b41-442a-b3d5-d876a6ea9ecc", + "b5d6206c-4f06-497d-af15-ed866ea6958f": "2acf1dfa-ce45-486e-b19e-ae4ad9804a63" + }, "testOverrideTransactionChallenge": "OWZhYjAxZTcwYjU4YzRhMzRmOWQwNzBmZjllZDFiNjc2NWVhMzA1NGI1MWZjZThjZGFjNDEyZDBmNmM2MWFhMQ" }, "pm4mlEnabled": false, @@ -8021,10 +8055,13 @@ thirdparty: "jwsVerificationKeysDirectory": null } } - schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -8584,6 +8621,10 @@ thirdparty: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -8634,6 +8675,10 @@ thirdparty: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -8728,12 +8773,11 @@ thirdparty: # your switch is using `FSPIOP-Source: peter` you will need a property `peter` in the following # object. Do not add the public keys of your simulators to this object. Instead, put them in # `mojaloop-simulator.simulators.$yourSimName.config.schemeAdapter.secrets.jws.publicKey`. - sharedJWSPubKeys: - # switch: |- - # -----BEGIN PUBLIC KEY----- - # blah blah blah - # -----END PUBLIC KEY----- - + sharedJWSPubKeys: null + # switch: |- + # -----BEGIN PUBLIC KEY----- + # blah blah blah + # -----END PUBLIC KEY----- defaults: # Changes to this object in the parent chart, for example 'mojaloop-simulator.defaults' will be # applied to all simulators deployed by this child chart. @@ -8742,11 +8786,8 @@ thirdparty: initContainers: waitForCache: enabled: true - imagePullSecretName: dock-casa-secret - cache: - # These will be supplied directly to the init containers array in the deployment for the # scheme adapter. They should look exactly as you'd declare them inside the deployment. # Example: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/#init-containers-in-use @@ -8774,20 +8815,18 @@ thirdparty: schemeAdapter: secrets: jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: - # + privateKeySecret: {} # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to # populate JWS public keys. The format of this ConfigMap must be as described for @@ -8799,7 +8838,7 @@ thirdparty: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -9071,20 +9110,18 @@ thirdparty: # DO NOT REMOVE COMMENT outbound: *inbound jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: - # + privateKeySecret: {} # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to # populate JWS public keys. The format of this ConfigMap must be as described for @@ -9201,8 +9238,7 @@ thirdparty: "jwsSigningKey": "/jwsSigningKey.key", "jwsVerificationKeysDirectory": null } - } - + } env: NODE_ENV: production INBOUND_LISTEN_PORT: 4005 @@ -9220,19 +9256,17 @@ thirdparty: # - 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 - + # 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 ## Pod scheduling preferences. ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -9254,7 +9288,7 @@ simulator: image: registry: docker.io repository: mojaloop/simulator - tag: v12.0.0 + tag: v12.1.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -9311,18 +9345,15 @@ simulator: scheme: HTTP initialDelaySeconds: 5 periodSeconds: 15 - ## Pod scheduling preferences. - ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity + ## 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 + ## 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/ + ## Set toleration for scheduler + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ tolerations: [] - metrics: enabled: true prefix: moja_ @@ -9365,17 +9396,17 @@ simulator: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -9409,7 +9440,7 @@ simulator: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: moja-simulator.local @@ -9422,7 +9453,7 @@ simulator: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -9443,12 +9474,11 @@ simulator: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -9572,11 +9602,15 @@ mojaloop-simulator: ingress: enabled: true hosts: - - sim-payerfsp.local + - sim-payerfsp.local config: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -9621,11 +9655,15 @@ mojaloop-simulator: ingress: enabled: true hosts: - - sim-payeefsp.local + - sim-payeefsp.local config: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -9670,11 +9708,15 @@ mojaloop-simulator: ingress: enabled: true hosts: - - sim-testfsp1.local + - sim-testfsp1.local config: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -9719,11 +9761,15 @@ mojaloop-simulator: ingress: enabled: true hosts: - - sim-testfsp2.local + - sim-testfsp2.local config: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -9768,11 +9814,15 @@ mojaloop-simulator: ingress: enabled: true hosts: - - sim-testfsp3.local + - sim-testfsp3.local config: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -9817,11 +9867,15 @@ mojaloop-simulator: ingress: enabled: true hosts: - - sim-testfsp4.local + - sim-testfsp4.local config: schemeAdapter: secrets: jws: + # `privateKeySecret` is used to specify the secret that contains the JWS signing key. + # If `privateKeySecret` is not null, then the `privateKey` value will be ignored. + # Expected properties of `privateKeySecret` are `name` and `key`. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -9914,12 +9968,11 @@ mojaloop-simulator: # your switch is using `FSPIOP-Source: peter` you will need a property `peter` in the following # object. Do not add the public keys of your simulators to this object. Instead, put them in # `mojaloop-simulator.simulators.$yourSimName.config.schemeAdapter.secrets.jws.publicKey`. - sharedJWSPubKeys: - # switch: |- - # -----BEGIN PUBLIC KEY----- - # blah blah blah - # -----END PUBLIC KEY----- - + sharedJWSPubKeys: null + # switch: |- + # -----BEGIN PUBLIC KEY----- + # blah blah blah + # -----END PUBLIC KEY----- defaults: # Changes to this object in the parent chart, for example 'mojaloop-simulator.defaults' will be # applied to all simulators deployed by this child chart. @@ -9928,11 +9981,8 @@ mojaloop-simulator: initContainers: waitForCache: enabled: true - imagePullSecretName: dock-casa-secret - cache: - # These will be supplied directly to the init containers array in the deployment for the # scheme adapter. They should look exactly as you'd declare them inside the deployment. # Example: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/#init-containers-in-use @@ -9943,8 +9993,8 @@ mojaloop-simulator: # SIM_SCHEME_ADAPTER_SERVICE_NAME: "sim-$SIM_NAME-scheme-adapter" # SIM_BACKEND_SERVICE_NAME: "sim-$SIM_NAME-backend" # SIM_CACHE_SERVICE_NAME: "sim-$SIM_NAME-cache" - initContainers: [] enabled: true + initContainers: [] image: repository: redis tag: 5.0.4-alpine @@ -9960,20 +10010,18 @@ mojaloop-simulator: schemeAdapter: secrets: jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: - # + privateKeySecret: {} # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to # populate JWS public keys. The format of this ConfigMap must be as described for @@ -9985,7 +10033,7 @@ mojaloop-simulator: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -10005,13 +10053,12 @@ mojaloop-simulator: minReplicas: 1 maxReplicas: 10 metrics: - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: 80 - + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 80 env: # Ports the scheme adapter listens on. Shouldn't really matter for a user of this chart. # You probably shouldn't bother configuring them- it likely won't do you much good. But it @@ -10253,23 +10300,21 @@ mojaloop-simulator: # cert: | # .. # outbound: *inbound - inbound: - outbound: + inbound: null + outbound: null jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: - # + privateKeySecret: {} # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to # populate JWS public keys. The format of this ConfigMap must be as described for @@ -10302,13 +10347,12 @@ mojaloop-simulator: minReplicas: 1 maxReplicas: 10 metrics: - - type: Resource - resource: - name: cpu - target: - type: Utilization - averageUtilization: 80 - + - type: Resource + resource: + name: cpu + target: + type: Utilization + averageUtilization: 80 env: NODE_ENV: production INBOUND_LISTEN_PORT: 4005 @@ -10321,24 +10365,22 @@ mojaloop-simulator: enabled: false path: / hosts: - - mojaloop-simulators.local + - mojaloop-simulators.local tls: [] # - 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 - + # 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 ## Pod scheduling preferences. ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -10376,7 +10418,7 @@ mojaloop-ttk-simulators: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: ttksim1-sdk-scheme-adapter.local @@ -10503,11 +10545,8 @@ mojaloop-ttk-simulators: redis: host: *MOJA_TTK_SIM_REDIS_HOST port: *MOJA_TTK_SIM_REDIS_PORT - ml-testing-toolkit: - ml-testing-toolkit-backend: - - ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) + ml-testing-toolkit-backend: ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ## e.g: ## initContainers: @@ -10579,16 +10618,14 @@ mojaloop-ttk-simulators: database: *TTK_MONGO_DATABASE config_files: - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/rules_response/default.json' - api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' - api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' - + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/rules_response/default.json' + api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' + api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim1/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' extraEnvironments: - hub-k8s-default-environment.json: &ttksim1InputValues - { - "inputValues": { + hub-k8s-default-environment.json: &ttksim1InputValues { + "inputValues": { "TTKSIM1_FSPID": "ttksim1", "TTKSIM1_MSISDN_1": "16135551212", "TTKSIM1_MSISDN_1_FIRST_NAME": "ReceiverFirst", @@ -10616,9 +10653,8 @@ mojaloop-ttk-simulators: "TTKSIM3_MSISDN_PREFIX": "5671", "HOST_CENTRAL_LEDGER": "http://$release_name-centralledger-service", "HOST_CENTRAL_SETTLEMENT": "http://$release_name-centralsettlement-service/v2" - } } - + } ml-testing-toolkit-frontend: ingress: enabled: true @@ -10650,7 +10686,7 @@ mojaloop-ttk-simulators: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: ttksim2-sdk-scheme-adapter.local @@ -10789,11 +10825,11 @@ mojaloop-ttk-simulators: host: 'ttksim2.local' config_files: - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/rules_response/default.json' - api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' - api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/rules_response/default.json' + api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' + api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ml-testing-toolkit-frontend: ingress: @@ -10827,7 +10863,7 @@ mojaloop-ttk-simulators: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: ttksim3-sdk-scheme-adapter.local @@ -10966,11 +11002,11 @@ mojaloop-ttk-simulators: host: 'ttksim3.local' config_files: - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim3/spec_files/rules_response/default.json' - api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' - api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' - api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.1.1/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/rules_response/default.json' + api_definitions__mojaloop_simulator_sim_1.4__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/api_spec.yaml' + api_definitions__mojaloop_simulator_sim_1.4__response_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_simulator_sim_1.4/response_map.json' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__api_spec.yaml: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/api_spec.yaml' + api_definitions__mojaloop_sdk_outbound_scheme_adapter_1.0__callback_map.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.4.0/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ml-testing-toolkit-frontend: ingress: @@ -11194,7 +11230,7 @@ mojaloop-bulk: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: bulk-api-adapter.local @@ -11207,7 +11243,7 @@ mojaloop-bulk: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -11228,12 +11264,11 @@ mojaloop-bulk: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -11372,6 +11407,29 @@ mojaloop-bulk: } } + # Parameters for JWS signing requests + endpointSecurity: + jwsSign: false + fspiopSourceSigningName: 'switch' + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null + jwsSigningKey: null + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- + + ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ## e.g: @@ -11453,17 +11511,17 @@ mojaloop-bulk: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -11497,7 +11555,7 @@ mojaloop-bulk: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: bulk-api-adapter-notification.local @@ -11510,7 +11568,7 @@ mojaloop-bulk: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -11531,12 +11589,11 @@ mojaloop-bulk: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -11821,17 +11878,17 @@ mojaloop-bulk: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -11865,7 +11922,7 @@ mojaloop-bulk: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-bulkprepare.local @@ -11878,7 +11935,7 @@ mojaloop-bulk: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -11899,12 +11956,11 @@ mojaloop-bulk: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -12183,17 +12239,17 @@ mojaloop-bulk: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: - ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + http: null + https: null + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -12227,7 +12283,7 @@ mojaloop-bulk: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-bulkfulfil.local @@ -12240,7 +12296,7 @@ mojaloop-bulk: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -12261,12 +12317,11 @@ mojaloop-bulk: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -12545,17 +12600,17 @@ mojaloop-bulk: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: + http: null + https: null ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -12589,7 +12644,7 @@ mojaloop-bulk: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-bulkprocessing.local @@ -12602,7 +12657,7 @@ mojaloop-bulk: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -12623,12 +12678,11 @@ mojaloop-bulk: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -12907,17 +12961,17 @@ mojaloop-bulk: ## NOTE: choose port between <30000-32767> ## nodePorts: - http: - https: + http: null + https: null ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -12951,7 +13005,7 @@ mojaloop-bulk: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: central-ledger-transfer-bulkget.local @@ -12964,7 +13018,7 @@ mojaloop-bulk: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -12985,12 +13039,11 @@ mojaloop-bulk: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 @@ -13005,10 +13058,7 @@ mojaloop-bulk: ml-testing-toolkit: enabled: true - - ml-testing-toolkit-backend: - - ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) + ml-testing-toolkit-backend: ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) ## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ ## e.g: ## initContainers: @@ -13078,11 +13128,8 @@ ml-testing-toolkit: host: testing-toolkit-specapi.local adminApi: host: testing-toolkit.local - config_files: - user_config.json: { - "DEFAULT_ENVIRONMENT_FILE_NAME": "hub-k8s-default-environment.json" - } + user_config.json: {"DEFAULT_ENVIRONMENT_FILE_NAME": "hub-k8s-default-environment.json"} # system_config.json: { # ## Uncomment for Socket IO configs for UI to Backend interactions. This may help if long running Test-Collections time-out. # # "SOCKET_IO_ENGINE_OPTIONS": { @@ -13098,10 +13145,9 @@ ml-testing-toolkit: ## We can pass the JSON content as the value for the parameters ## Or we can pass a http/https URL for the JSON file as the value for the parameters. Then the file will be downloaded and replaced in the corresponding location. ## Ex: rules_callback__default.json: "https://raw.githubusercontent.com/mojaloop/ml-testing-toolkit/master/spec_files/rules_callback/default.json" - rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v15.3.0-snapshot/rules/mojaloop/ml-testing-toolkit/spec_files/rules_callback/default.json" - rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v15.3.0-snapshot/rules/mojaloop/ml-testing-toolkit/spec_files/rules_response/default.json" - rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v15.3.0-snapshot/rules/mojaloop/ml-testing-toolkit/spec_files/rules_validation/default.json" - + rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.0.0/rules/mojaloop/ml-testing-toolkit/spec_files/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.0.0/rules/mojaloop/ml-testing-toolkit/spec_files/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.0.0/rules/mojaloop/ml-testing-toolkit/spec_files/rules_validation/default.json" # We can change the names of the simulators to configure the environment files for the testing toolkit. # If you change these values, you need to change the simulator names in the mojaloop-simulats->simulators section parameters: &simNames @@ -13115,7 +13161,6 @@ ml-testing-toolkit: simNameTTKSim1: 'ttksim1' simNameTTKSim2: 'ttksim2' simNameTTKSim3: 'ttksim3' - extraEnvironments: hub-k8s-default-environment.json: &ttkInputValues { "inputValues": { @@ -13368,7 +13413,6 @@ ml-testing-toolkit: "TTKSIM2_PARTY_TIMES_OUT": "partytimesout" } } - ml-testing-toolkit-frontend: ingress: enabled: true @@ -13384,8 +13428,8 @@ 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/v15.3.0-snapshot.zip - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/provisioning + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v16.0.0.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-16.0.0/collections/hub/provisioning ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13398,7 +13442,7 @@ ml-ttk-posthook-tests: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-16.0.0/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -13499,7 +13543,7 @@ ml-ttk-cronjob-cleanup: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/cleanup + testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-16.0.0/collections/hub/cleanup # testCasesPathInZip: *ttkGitPathGP # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports @@ -13608,7 +13652,7 @@ ml-ttk-test-val-bulk: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/other_tests/bulk_transfers + testCasesPathInZip: testing-toolkit-test-cases-16.0.0/collections/hub/other_tests/bulk_transfers ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required. # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports @@ -13653,7 +13697,7 @@ ml-ttk-test-setup-tp: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/provisioning_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-16.0.0/collections/hub/provisioning_thirdparty ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required. # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports @@ -13698,7 +13742,7 @@ ml-ttk-test-val-tp: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/thirdparty + testCasesPathInZip: testing-toolkit-test-cases-16.0.0/collections/hub/thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -13731,7 +13775,7 @@ ml-ttk-test-val-tp: # } parameters: <<: *simNames - testCaseEnvironmentFile: *ttkInputValues + testCaseEnvironmentFile: *ttkInputValues ml-ttk-test-setup-sdk-bulk: tests: @@ -13740,7 +13784,7 @@ ml-ttk-test-setup-sdk-bulk: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/provisioning_sdkbulk + testCasesPathInZip: testing-toolkit-test-cases-16.0.0/collections/hub/provisioning_sdkbulk ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required. # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports @@ -13785,7 +13829,7 @@ ml-ttk-test-val-sdk-bulk: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/sdk_scheme_adapter/bulk/basic + testCasesPathInZip: testing-toolkit-test-cases-16.0.0/collections/hub/sdk_scheme_adapter/bulk/basic ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required. # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports @@ -13821,7 +13865,7 @@ ml-ttk-test-val-sdk-bulk: # } parameters: <<: *simNames - testCaseEnvironmentFile: *ttksim1InputValues + testCaseEnvironmentFile: *ttksim1InputValues ml-ttk-test-val-sdk-r2p: tests: @@ -13830,7 +13874,7 @@ ml-ttk-test-val-sdk-r2p: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-15.3.0-snapshot/collections/hub/sdk_scheme_adapter/request-to-pay/basic + testCasesPathInZip: testing-toolkit-test-cases-16.0.0/collections/hub/sdk_scheme_adapter/request-to-pay/basic ## Optional config for uploading reports to S3 Buckets. If enabled: WS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_REGION under the 'configCreds' is required. # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports @@ -13866,7 +13910,7 @@ ml-ttk-test-val-sdk-r2p: # } parameters: <<: *simNames - testCaseEnvironmentFile: *ttksim1InputValues + testCaseEnvironmentFile: *ttksim1InputValues ml-ttk-test-cleanup: tests: diff --git a/monitoring/efk/Chart.yaml b/monitoring/efk/Chart.yaml index 9572f7465..09b667777 100644 --- a/monitoring/efk/Chart.yaml +++ b/monitoring/efk/Chart.yaml @@ -6,8 +6,6 @@ appVersion: "elasticsearch: 7.11.1; kibana: 7.11.1; apm-server: 7.11.1; fluentd- maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: fluentd-elasticsearch version: 11.8.0 diff --git a/monitoring/promfana/Chart.yaml b/monitoring/promfana/Chart.yaml index 4fcdd19f6..abddfa7cd 100644 --- a/monitoring/promfana/Chart.yaml +++ b/monitoring/promfana/Chart.yaml @@ -6,8 +6,6 @@ name: promfana maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: prometheus version: 11.12.0 diff --git a/quoting-service/Chart.yaml b/quoting-service/Chart.yaml index ffdccf4bf..5ecd0f313 100644 --- a/quoting-service/Chart.yaml +++ b/quoting-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Quoting-Service Helm chart for Kubernetes name: quoting-service -version: 15.0.0 -appVersion: "v15.6.0-snapshot.5" +version: 15.7.0 +appVersion: v15.7.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -16,15 +16,15 @@ maintainers: email: steven.oderayi@infitx.com dependencies: - name: quoting-service - version: 15.0.0 + version: ">= 15.3.0" repository: "file://./chart-service" condition: quoting-service.enabled - name: quoting-service-handler - version: 15.0.0 + version: ">= 15.3.0" repository: "file://./chart-handler" condition: quoting-service-handler.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/quoting-service/chart-handler/Chart.yaml b/quoting-service/chart-handler/Chart.yaml index ac1b53680..97355544d 100644 --- a/quoting-service/chart-handler/Chart.yaml +++ b/quoting-service/chart-handler/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Quoting-Service Handler Helm chart for Kubernetes name: quoting-service-handler -version: 15.0.0 -appVersion: "v15.6.0-snapshot.5" +version: 15.3.0 +appVersion: v15.7.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -16,6 +16,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/quoting-service/chart-handler/configs/default.json b/quoting-service/chart-handler/configs/default.json index f11805e44..59646e805 100644 --- a/quoting-service/chart-handler/configs/default.json +++ b/quoting-service/chart-handler/configs/default.json @@ -2,7 +2,7 @@ { "HOSTNAME": "http://quoting-service-handler.local", "LISTEN_ADDRESS": "0.0.0.0", - "PORT": "{{ .Values.service.internalPort }}", + "PORT": {{ .Values.service.internalPort }}, "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }}, "SWITCH_ENDPOINT": "http://{{ .Release.Name }}-centralledger-service:80", "AMOUNT": { diff --git a/quoting-service/chart-handler/templates/deployment.yaml b/quoting-service/chart-handler/templates/deployment.yaml index 89078ed3c..758acb6ce 100644 --- a/quoting-service/chart-handler/templates/deployment.yaml +++ b/quoting-service/chart-handler/templates/deployment.yaml @@ -183,7 +183,14 @@ spec: {{- if .Values.config.endpointSecurity.jwsSign }} - name: jws-signing-key secret: + {{- if .Values.config.endpointSecurity.jwsSigningKeySecret }} + secretName: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.name }} + items: + - key: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.key }} + path: jwsSigningKey.key + {{ else }} secretName: {{ template "quotingservice-handler.fullname" . }}-jws-signing-key + {{- end }} {{- end }} - name: {{ template "quotingservice-handler.fullname" . }}-config-volume configMap: diff --git a/quoting-service/chart-handler/templates/secret-jws.yaml b/quoting-service/chart-handler/templates/secret-jws.yaml index 4cc6bc713..3e64e98f2 100644 --- a/quoting-service/chart-handler/templates/secret-jws.yaml +++ b/quoting-service/chart-handler/templates/secret-jws.yaml @@ -1,7 +1,7 @@ # todo: do we need secret-jws for consumer? -{{- if .Values.config.endpointSecurity.jwsSign }} +{{- if and .Values.config.endpointSecurity.jwsSign (not .Values.config.endpointSecurity.jwsSigningKeySecret) }} {{- if (not .Values.config.endpointSecurity.jwsSigningKey) }} - {{- fail "JWS signing enabled but no jwsSigningKey provided. You will need to supply a JWS signing key in string form .Values.endpointSecurity.jwsSigningKey." }} + {{- fail "JWS signing enabled but neither jwsSigningKey nor jwsSigningKeySecret was provided. You will need to supply a JWS signing key in string form via .Values.endpointSecurity.jwsSigningKey or a secret via .Values.endpointSecurity.jwsSigningKeySecret." }} {{- end }} apiVersion: v1 kind: Secret diff --git a/quoting-service/chart-handler/values.yaml b/quoting-service/chart-handler/values.yaml index aaeba2045..0bbc9d50d 100644 --- a/quoting-service/chart-handler/values.yaml +++ b/quoting-service/chart-handler/values.yaml @@ -7,7 +7,7 @@ global: {} image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.6.0-snapshot.5 + tag: v15.7.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -197,20 +197,19 @@ config: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - + jwsSigningKey: null +# To generate this key: +# Private: +# ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key +# Public: +# openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub +# Should look like: +# -----BEGIN RSA PRIVATE KEY----- +# MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R +# .. +# .. +# mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 +# -----END RSA PRIVATE KEY----- error_handling: include_cause_extension: false truncate_extensions: true @@ -312,17 +311,15 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -342,15 +339,14 @@ service: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} - 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 +# 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 diff --git a/quoting-service/chart-service/Chart.yaml b/quoting-service/chart-service/Chart.yaml index 3cf59f8ec..698fb4147 100644 --- a/quoting-service/chart-service/Chart.yaml +++ b/quoting-service/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Quoting-Service API Helm chart for Kubernetes name: quoting-service -version: 15.0.0 -appVersion: "v15.6.0-snapshot.5" +version: 15.3.0 +appVersion: v15.7.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -16,6 +16,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/quoting-service/chart-service/templates/deployment.yaml b/quoting-service/chart-service/templates/deployment.yaml index 53baa9173..1109f3e1a 100644 --- a/quoting-service/chart-service/templates/deployment.yaml +++ b/quoting-service/chart-service/templates/deployment.yaml @@ -183,7 +183,14 @@ spec: {{- if .Values.config.endpointSecurity.jwsSign }} - name: jws-signing-key secret: + {{- if .Values.config.endpointSecurity.jwsSigningKeySecret }} + secretName: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.name }} + items: + - key: {{ .Values.config.endpointSecurity.jwsSigningKeySecret.key }} + path: jwsSigningKey.key + {{ else }} secretName: {{ template "quotingservice.fullname" . }}-jws-signing-key + {{- end }} {{- end }} - name: {{ template "quotingservice.fullname" . }}-config-volume configMap: diff --git a/quoting-service/chart-service/templates/secret-jws.yaml b/quoting-service/chart-service/templates/secret-jws.yaml index b708b298f..2535c0a09 100644 --- a/quoting-service/chart-service/templates/secret-jws.yaml +++ b/quoting-service/chart-service/templates/secret-jws.yaml @@ -1,6 +1,6 @@ -{{- if .Values.config.endpointSecurity.jwsSign }} +{{- if and .Values.config.endpointSecurity.jwsSign (not .Values.config.endpointSecurity.jwsSigningKeySecret) }} {{- if (not .Values.config.endpointSecurity.jwsSigningKey) }} - {{- fail "JWS signing enabled but no jwsSigningKey provided. You will need to supply a JWS signing key in string form .Values.endpointSecurity.jwsSigningKey." }} + {{- fail "JWS signing enabled but neither jwsSigningKey nor jwsSigningKeySecret was provided. You will need to supply a JWS signing key in string form via .Values.endpointSecurity.jwsSigningKey or a secret via .Values.endpointSecurity.jwsSigningKeySecret." }} {{- end }} apiVersion: v1 kind: Secret diff --git a/quoting-service/chart-service/values.yaml b/quoting-service/chart-service/values.yaml index 893d8c90c..808f6b476 100644 --- a/quoting-service/chart-service/values.yaml +++ b/quoting-service/chart-service/values.yaml @@ -7,7 +7,7 @@ global: {} image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.6.0-snapshot.5 + tag: v15.7.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -199,20 +199,19 @@ config: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - + jwsSigningKey: null +# To generate this key: +# Private: +# ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key +# Public: +# openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub +# Should look like: +# -----BEGIN RSA PRIVATE KEY----- +# MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R +# .. +# .. +# mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 +# -----END RSA PRIVATE KEY----- error_handling: include_cause_extension: false truncate_extensions: true @@ -279,17 +278,15 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: - ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP - ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer - ## - loadBalancerIP: - ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources - ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service - ## e.g: - ## loadBalancerSourceRanges: - ## - 10.10.10.0/24 - ## + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP +## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer +## + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources +## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service +## e.g: +## loadBalancerSourceRanges: +## - 10.10.10.0/24 +## loadBalancerSourceRanges: [] ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip @@ -309,62 +306,58 @@ service: ## timeoutSeconds: 300 ## sessionAffinityConfig: {} - ingress: enabled: true - ## @param ingress.pathType Ingress path type - ## + ## @param ingress.pathType Ingress path type + ## pathType: ImplementationSpecific - ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) - ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: null ## @param ingress.hostname Default host for the ingress record +## hostname: quoting-service.local - ## @param servicePort : port for the service - ## + ## @param servicePort : port for the service + ## servicePort: 80 - ## @param ingress.path Default path for the ingress record - ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers path: / - ## @param ingress.annotations Additional custom annotations for the ingress record - ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added - ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false - ## @param ingress.certManager Add the corresponding annotations for cert-manager integration - ## + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## certManager: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## selfSigned: false - ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record - ## e.g: - ## extraHosts: - ## - name: transfer-api-svc.local - ## path: / - ## - extraHosts: - extraPaths: - extraTls: - secrets: + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - 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 +# 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 diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index b4ce33e63..4bb82e915 100644 --- a/quoting-service/values.yaml +++ b/quoting-service/values.yaml @@ -13,7 +13,7 @@ quoting-service: # API image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.6.0-snapshot.5 + tag: v15.7.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -126,10 +126,8 @@ quoting-service: # API prefix: moja_ defaultLabels: serviceName: quoting-service - - config: - - # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept), + + config: # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept), # and for generating requests/callbacks from the Switch itself (DEFAULT value) protocol_versions: |- { @@ -203,20 +201,19 @@ quoting-service: # API endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: - # To generate this key: - # Private: - # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key - # Public: - # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub - # Should look like: - # -----BEGIN RSA PRIVATE KEY----- - # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R - # .. - # .. - # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 - # -----END RSA PRIVATE KEY----- - + jwsSigningKey: null + # To generate this key: + # Private: + # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key + # Public: + # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub + # Should look like: + # -----BEGIN RSA PRIVATE KEY----- + # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R + # .. + # .. + # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 + # -----END RSA PRIVATE KEY----- error_handling: include_cause_extension: false truncate_extensions: true @@ -274,11 +271,11 @@ quoting-service: # API ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -304,66 +301,64 @@ quoting-service: # API ## timeoutSeconds: 300 ## sessionAffinityConfig: {} - ingress: enabled: true - ## @param ingress.pathType Ingress path type - ## + ## @param ingress.pathType Ingress path type + ## pathType: ImplementationSpecific - ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) - ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: null + ## @param ingress.hostname Default host for the ingress record + ## hostname: quoting-service.local - ## @param servicePort : port for the service - ## + ## @param servicePort : port for the service + ## servicePort: 80 - ## @param ingress.path Default path for the ingress record - ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers path: / - ## @param ingress.annotations Additional custom annotations for the ingress record - ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added - ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: null + ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter + ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` + ## You can: + ## - Use the `ingress.secrets` parameter to create this TLS secret + ## - Relay on cert-manager to create it by setting `ingress.certManager=true` + ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` + ## tls: false - ## @param ingress.certManager Add the corresponding annotations for cert-manager integration - ## + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## certManager: false - ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm - ## + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## selfSigned: false - ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record - ## e.g: - ## extraHosts: - ## - name: transfer-api-svc.local - ## path: / - ## - extraHosts: - extraPaths: - extraTls: - secrets: + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" ## 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 - + # 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 quoting-service-handler: enabled: true # Default values for ml-api-adapter. @@ -373,7 +368,7 @@ quoting-service-handler: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.6.0-snapshot.5 + tag: v15.7.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -486,85 +481,82 @@ quoting-service-handler: prefix: moja_ defaultLabels: serviceName: quoting-service-handler - + config: + # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept), + # and for generating requests/callbacks from the Switch itself (DEFAULT value) + protocol_versions: | + { + "CONTENT": { + "DEFAULT": "1.1", + "VALIDATELIST": [ + "1", + "1.0", + "1.1" + ] + }, + "ACCEPT": { + "DEFAULT": "1", + "VALIDATELIST": [ + "1", + "1.0", + "1.1" + ] + } + } -config: - - # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept), - # and for generating requests/callbacks from the Switch itself (DEFAULT value) - protocol_versions: | - { - "CONTENT": { - "DEFAULT": "1.1", - "VALIDATELIST": [ - "1", - "1.0", - "1.1" - ] - }, - "ACCEPT": { - "DEFAULT": "1", - "VALIDATELIST": [ - "1", - "1.0", - "1.1" - ] - } - } - - ## 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: mysqldb - db_port: 3306 - db_user: central_ledger - ## Secret-Management - ### Set this if you are using a clear password configured in the config section - db_password: '' - ### Configure this if you want to use a secret. Note, this will override the db_password, - ### Use the next line if you do wish to use the db_password value instead. - # db_secret: - ### Example config for an existing secret - db_secret: - name: mysqldb - key: mysql-password - 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 - simple_routing_mode_enabled: true - log_level: info - log_transport: file - - ## Kafka Configuration (used for sidecar) - # 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: kafka - kafka_port: 9092 - - ## 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 - - endpointSecurity: - jwsSign: false - fspiopSourceSigningName: 'switch' - jwsSigningKey: + ## 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: mysqldb + db_port: 3306 + db_user: central_ledger + ## Secret-Management + ### Set this if you are using a clear password configured in the config section + db_password: '' + ### Configure this if you want to use a secret. Note, this will override the db_password, + ### Use the next line if you do wish to use the db_password value instead. + # db_secret: + ### Example config for an existing secret + db_secret: + name: mysqldb + key: mysql-password + 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 + simple_routing_mode_enabled: true + log_level: info + log_transport: file + + ## Kafka Configuration (used for sidecar) + # 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: kafka + kafka_port: 9092 + + ## 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 + + endpointSecurity: + jwsSign: false + fspiopSourceSigningName: 'switch' + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key @@ -577,17 +569,16 @@ config: # .. # mBynFpdjO0D3PnLKjnBDn1vFAfANOwVpGXCw5mn+484A/SIXYebWruFd03g4 # -----END RSA PRIVATE KEY----- + error_handling: + include_cause_extension: false + truncate_extensions: true - error_handling: - include_cause_extension: false - truncate_extensions: true - - cache: - enum_data_expires_in_ms: 4170000 - # Setting this any higher will most likely cause GP tests to fail - # Best to only set this higher if you are not running GP tests - # Not specifying or setting to 0 will default the cache to 60 seconds - participant_data_expires_in_ms: 10 + cache: + enum_data_expires_in_ms: 4170000 + # Setting this any higher will most likely cause GP tests to fail + # Best to only set this higher if you are not running GP tests + # Not specifying or setting to 0 will default the cache to 60 seconds + participant_data_expires_in_ms: 10 rules: [] @@ -661,15 +652,14 @@ config: type: ClusterIP externalPort: 80 internalPort: 3002 - 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 + # 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 diff --git a/sdk-scheme-adapter/Chart.yaml b/sdk-scheme-adapter/Chart.yaml index eac6dd006..3061aa668 100644 --- a/sdk-scheme-adapter/Chart.yaml +++ b/sdk-scheme-adapter/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: sdk-scheme-adapter Helm chart for Kubernetes name: sdk-scheme-adapter -version: 1.2.0 -appVersion: "v23.1.1" +version: 1.8.0 +appVersion: v23.4.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -20,24 +20,24 @@ dependencies: repository: "file://./chart-service" tags: - sdk-scheme-adapter - version: ">= 1.2.0" + version: ">= 1.5.0" condition: sdk-scheme-adapter-api-svc.enabled - name: sdk-scheme-adapter-svc alias: sdk-scheme-adapter-dom-evt-handler repository: "file://./chart-service" tags: - sdk-scheme-adapter - version: ">= 1.2.0" + version: ">= 1.5.0" condition: sdk-scheme-adapter-dom-evt-handler.enabled - name: sdk-scheme-adapter-svc alias: sdk-scheme-adapter-cmd-evt-handler repository: "file://./chart-service" tags: - sdk-scheme-adapter - version: ">= 1.2.0" + version: ">= 1.5.0" condition: sdk-scheme-adapter-cmd-evt-handler.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" tags: - moja-common - version: 2.0.0 + version: 3.0.0 diff --git a/sdk-scheme-adapter/chart-service/Chart.yaml b/sdk-scheme-adapter/chart-service/Chart.yaml index d841871f6..62ea703f7 100644 --- a/sdk-scheme-adapter/chart-service/Chart.yaml +++ b/sdk-scheme-adapter/chart-service/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 name: sdk-scheme-adapter-svc -version: 1.2.0 +version: 1.5.0 description: A Helm chart for Kubernetes -appVersion: "v23.1.1" +appVersion: v23.4.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -19,4 +19,4 @@ dependencies: repository: "https://mojaloop.github.io/charts/repo" tags: - moja-common - version: 2.0.0 + version: 3.0.0 diff --git a/sdk-scheme-adapter/chart-service/templates/deployment.yaml b/sdk-scheme-adapter/chart-service/templates/deployment.yaml index b8e8c70c5..fcd1e685e 100644 --- a/sdk-scheme-adapter/chart-service/templates/deployment.yaml +++ b/sdk-scheme-adapter/chart-service/templates/deployment.yaml @@ -71,7 +71,14 @@ spec: {{- if .Values.env.JWS_SIGN }} - name: jws-private-key secret: + {{- if .Values.config.jwsSigningKeySecret }} + secretName: {{ .Values.config.jwsSigningKeySecret.name }} + items: + - key: {{ .Values.config.jwsSigningKeySecret.key }} + path: private.key + {{ else }} secretName: {{ template "common.names.fullname" . }}-jws-priv-key + {{- end }} {{- end }} {{- if .Values.env.VALIDATE_INBOUND_JWS }} - name: jws-public-keys diff --git a/sdk-scheme-adapter/chart-service/templates/secret.yaml b/sdk-scheme-adapter/chart-service/templates/secret.yaml index af6e6cf6c..282222861 100644 --- a/sdk-scheme-adapter/chart-service/templates/secret.yaml +++ b/sdk-scheme-adapter/chart-service/templates/secret.yaml @@ -1,4 +1,9 @@ -{{- if .Values.env.JWS_SIGN }} +{{- if (and .Values.env.JWS_SIGN (not .Values.config.jwsSigningKeySecret)) }} +# Note that due to a bug with helm 2.9.1 the `required` function in combination with a missing +# key will not work in place of this if statement. +{{- if (not .Values.config.jwsSigningKey) }} + {{ fail (printf "JWS_SIGN enabled- JWS private key source required. You need to specify .Values.config.jwsSigningKey or .Values.config.jwsSigningKeySecret.") }} +{{- end }} apiVersion: v1 kind: Secret metadata: @@ -13,11 +18,6 @@ metadata: annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- end }} data: - # Note that due to a bug with helm 2.9.1 the `required` function in combination with a missing - # key will not work in place of this if statement. - {{- if eq .Values.config.jwsSigningKey "" }} - {{ fail (printf "JWS_SIGN enabled- JWS private key required. You need to specify .Values.config.jwsSigningKey.") }} - {{- end }} "private.key": {{ .Values.config.jwsSigningKey | b64enc }} --- {{- end }} diff --git a/sdk-scheme-adapter/chart-service/values.yaml b/sdk-scheme-adapter/chart-service/values.yaml index 3f3084226..01dfea4a4 100644 --- a/sdk-scheme-adapter/chart-service/values.yaml +++ b/sdk-scheme-adapter/chart-service/values.yaml @@ -41,6 +41,10 @@ redis: {} config: simName: testFsp ## JWS configuration + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null jwsSigningKey: "" jwsVerificationKeys: {} @@ -304,7 +308,7 @@ containerSecurityContext: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/sdk-scheme-adapter/values.yaml b/sdk-scheme-adapter/values.yaml index 96ed893ac..bed429161 100644 --- a/sdk-scheme-adapter/values.yaml +++ b/sdk-scheme-adapter/values.yaml @@ -48,6 +48,10 @@ sdk-scheme-adapter-api-svc: config: simName: *CONFIG_SIM_NAME ## JWS configuration + # `jwsSigningKeySecret` is used to specify the secret that contains the JWS signing key. + # If `jwsSigningKeySecret` is not null, then the `jwsSigningKey` value will be ignored. + # Expected properties of `jwsSigningKeySecret` are `name` and `key`. + jwsSigningKeySecret: null jwsSigningKey: "" jwsVerificationKeys: {} @@ -285,7 +289,7 @@ sdk-scheme-adapter-api-svc: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -705,7 +709,7 @@ sdk-scheme-adapter-dom-evt-handler: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -1128,7 +1132,7 @@ sdk-scheme-adapter-cmd-evt-handler: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/simulator/Chart.yaml b/simulator/Chart.yaml index ae2bd80df..9c3ab5721 100644 --- a/simulator/Chart.yaml +++ b/simulator/Chart.yaml @@ -1,16 +1,14 @@ apiVersion: v2 description: Simulator Helm Chart for Simulators name: simulator -version: 13.0.0 -appVersion: "12.0.0" +version: 13.3.0 +appVersion: v12.1.0 maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/simulator/values.yaml b/simulator/values.yaml index f70d8d984..0d567e76b 100644 --- a/simulator/values.yaml +++ b/simulator/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/simulator - tag: v12.0.0 + tag: v12.1.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -31,14 +31,13 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -150,11 +149,11 @@ service: ## e.g.: ## clusterIP: None ## - clusterIP: + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -188,9 +187,9 @@ ingress: pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: - ## @param ingress.hostname Default host for the ingress record - ## + apiVersion: null +## @param ingress.hostname Default host for the ingress record +## hostname: moja-simulator.local ## @param servicePort : port for the service ## @@ -201,14 +200,14 @@ ingress: ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: - ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter - ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` - ## You can: - ## - Use the `ingress.secrets` parameter to create this TLS secret - ## - Relay on cert-manager to create it by setting `ingress.certManager=true` - ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` - ## + annotations: null +## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter +## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` +## You can: +## - Use the `ingress.secrets` parameter to create this TLS secret +## - Relay on cert-manager to create it by setting `ingress.certManager=true` +## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` +## tls: false ## @param ingress.certManager Add the corresponding annotations for cert-manager integration ## @@ -222,12 +221,11 @@ ingress: ## - name: transfer-api-svc.local ## path: / ## - extraHosts: - extraPaths: - extraTls: - secrets: + extraHosts: null + extraPaths: null + extraTls: null + secrets: null className: "nginx" - # 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 diff --git a/thirdparty/Chart.yaml b/thirdparty/Chart.yaml index 585b85e89..19c26fdef 100644 --- a/thirdparty/Chart.yaml +++ b/thirdparty/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: thirdparty -version: 3.0.2 +version: 3.6.0 description: Third Party API Support for Mojaloop appVersion: "auth-service: v15.0.0; als-consent-oracle: v0.2.2; thirdparty-sdk: v15.1.1" home: http://mojaloop.io @@ -10,32 +10,30 @@ sources: - https://github.com/mojaloop/helm - https://github.com/mojaloop/pisp-project maintainers: - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: auth-svc - version: ">= 3.0.1" + version: ">= 3.3.0" repository: "file://./chart-auth-svc" condition: auth-svc.enabled - name: consent-oracle - version: ">= 0.4.1" + version: ">= 0.7.0" repository: "file://./chart-consent-oracle" condition: consent-oracle.enabled - name: tp-api-svc - version: ">= 3.0.1" + version: ">= 3.3.0" repository: "file://./chart-tp-api-svc" condition: tp-api-svc.enabled - name: mojaloop-simulator alias: thirdparty-simulator - version: ">= 15.0.0" + version: ">= 15.2.0" repository: "file://../mojaloop-simulator" condition: mojaloop-simulator.enabled - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/thirdparty/chart-auth-svc/Chart.yaml b/thirdparty/chart-auth-svc/Chart.yaml index 33602472e..b706b59e1 100644 --- a/thirdparty/chart-auth-svc/Chart.yaml +++ b/thirdparty/chart-auth-svc/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: auth-svc chart for Mojaloop Thirdparty Services name: auth-svc -version: 3.0.1 -appVersion: "15.0.0" +version: 3.3.0 +appVersion: v15.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -10,13 +10,11 @@ sources: - https://github.com/mojaloop/helm - https://github.com/mojaloop/auth-service maintainers: - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/thirdparty/chart-consent-oracle/Chart.yaml b/thirdparty/chart-consent-oracle/Chart.yaml index 1995421cb..a481d480a 100644 --- a/thirdparty/chart-consent-oracle/Chart.yaml +++ b/thirdparty/chart-consent-oracle/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: consent-oracle chart for Mojaloop Thirdparty Overlay Services name: consent-oracle -version: 0.4.1 -appVersion: "0.2.2" +version: 0.7.0 +appVersion: v0.2.2 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -10,13 +10,11 @@ sources: - https://github.com/mojaloop/helm - https://github.com/mojaloop/als-consent-oracle maintainers: - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common - repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + repository: https://mojaloop.github.io/charts/repo + version: 3.0.0 tags: - moja-common diff --git a/thirdparty/chart-tp-api-svc/Chart.yaml b/thirdparty/chart-tp-api-svc/Chart.yaml index 2b47e3af7..48b16cf6e 100644 --- a/thirdparty/chart-tp-api-svc/Chart.yaml +++ b/thirdparty/chart-tp-api-svc/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 description: Thirdparty API Service chart for Mojaloop Thirdparty Overlay Services name: tp-api-svc -version: 3.0.1 -appVersion: "14.0.0" +version: 3.3.0 +appVersion: v14.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -10,13 +10,11 @@ sources: - https://github.com/mojaloop/helm - https://github.com/mojaloop/thirdparty-api-svc maintainers: - - name: Tom Daly - email: tomd@crosslaketech.com - name: Miguel de Barros email: miguel.debarros@modusbox.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.0.0 tags: - moja-common diff --git a/thirdparty/values.yaml b/thirdparty/values.yaml index d1198aa7e..3523214df 100644 --- a/thirdparty/values.yaml +++ b/thirdparty/values.yaml @@ -1249,6 +1249,18 @@ thirdparty-simulator: schemeAdapter: secrets: jws: + # Use the privateKeySecret field if you would like to supply a JWS private key external + # to this chart. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. + # These fields will take precedence over `privateKey` and `publicKey` below. + # This field is best supplied per-simulator, however it's here for documentation + # purposes. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -1808,6 +1820,18 @@ thirdparty-simulator: schemeAdapter: secrets: jws: + # Use the privateKeySecret field if you would like to supply a JWS private key external + # to this chart. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. + # These fields will take precedence over `privateKey` and `publicKey` below. + # This field is best supplied per-simulator, however it's here for documentation + # purposes. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -1858,6 +1882,18 @@ thirdparty-simulator: schemeAdapter: secrets: jws: + # Use the privateKeySecret field if you would like to supply a JWS private key external + # to this chart. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. + # These fields will take precedence over `privateKey` and `publicKey` below. + # This field is best supplied per-simulator, however it's here for documentation + # purposes. + privateKeySecret: {} # The following is an example key and shouldn't be used in production privateKey: |- -----BEGIN PRIVATE KEY----- @@ -1998,19 +2034,18 @@ thirdparty-simulator: schemeAdapter: secrets: jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: + privateKeySecret: {} # # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to @@ -2023,7 +2058,7 @@ thirdparty-simulator: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.1.1 + tag: v23.4.0 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -2295,19 +2330,18 @@ thirdparty-simulator: # DO NOT REMOVE COMMENT outbound: *inbound jws: - # Use the privKeySecretName field if you would like to supply a JWS private key external + # Use the privateKeySecret field if you would like to supply a JWS private key external # to this chart. - # For example, if you create a private key called `sim-payerfsp-jws-signing-key` external - # to this chart, you would supply `privKeySecretName: sim-payerfsp-jws-signing-key` here. + # For example, if you create a private key called `sim-payerfsp-jws-signing-key` with data property `private.key` + # external to this chart, you would supply + # `privateKeySecret: + # name: sim-payerfsp-jws-signing-key` + # key: private.key + # here. # These fields will take precedence over `privateKey` and `publicKey` below. # This field is best supplied per-simulator, however it's here for documentation # purposes. - privKeySecretName: {} - # TODO: update `privKeySecretName` above to contain both a name and a key in the secret. - # Add documentation on usage. - # privKeySecret: {} - # name: - # key: + privateKeySecret: {} # # The `publicKeyConfigMapName` field allows you to supply a ConfigMap containing JWS public # keys external to this release, and have this release reference that ConfigMap to diff --git a/transaction-requests-service/Chart.yaml b/transaction-requests-service/Chart.yaml index a6d932f14..976d8c46e 100644 --- a/transaction-requests-service/Chart.yaml +++ b/transaction-requests-service/Chart.yaml @@ -1,23 +1,21 @@ apiVersion: v2 description: Transaction-Requests-Service Helm chart for Kubernetes name: transaction-requests-service -version: 13.0.1 +version: 13.2.0 appVersion: "14.1.2" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: - - https://github.com/mojaloop/transaction-requests-service - - https://github.com/mojaloop/helm + - https://github.com/mojaloop/transaction-requests-service + - https://github.com/mojaloop/helm maintainers: - name: Miguel de Barros email: miguel.debarros@modusbox.com - - name: Tom Daly - email: tomd@crosslaketech.com - name: Steven Oderayi email: steven.oderayi@infitx.com dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" tags: - - moja-common - version: 2.0.0 + - moja-common + version: 3.0.0