From f0245c595bf92db2a506da3a59aebda345969b2e Mon Sep 17 00:00:00 2001 From: "geka.evk" Date: Tue, 8 Oct 2024 18:14:25 +0100 Subject: [PATCH 01/21] feat(csi-106): updated ALS version --- account-lookup-service/Chart.yaml | 4 ++-- .../chart-admin/templates/deployment.yaml | 6 ++++++ account-lookup-service/chart-admin/values.yaml | 8 ++++++-- .../chart-handler-timeout/templates/deployment.yaml | 8 ++++++++ .../chart-handler-timeout/values.yaml | 8 +++++++- .../chart-service/templates/deployment.yaml | 8 ++++++++ account-lookup-service/chart-service/values.yaml | 10 ++++++++-- account-lookup-service/values.yaml | 10 +++++----- mojaloop/Chart.yaml | 2 +- 9 files changed, 51 insertions(+), 13 deletions(-) diff --git a/account-lookup-service/Chart.yaml b/account-lookup-service/Chart.yaml index 87ae6bdda..c99d414ef 100644 --- a/account-lookup-service/Chart.yaml +++ b/account-lookup-service/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -version: 15.4.0 -appVersion: "account-lookup-service: v15.4.0; als-oracle-pathfinder: v12.1.0" +version: 15.5.0 +appVersion: "account-lookup-service: v15.5.0; als-oracle-pathfinder: v12.1.0" description: Account Lookup Service Helm Chart for Mojaloop name: account-lookup-service maintainers: diff --git a/account-lookup-service/chart-admin/templates/deployment.yaml b/account-lookup-service/chart-admin/templates/deployment.yaml index fd1064fb0..1a513a820 100644 --- a/account-lookup-service/chart-admin/templates/deployment.yaml +++ b/account-lookup-service/chart-admin/templates/deployment.yaml @@ -68,6 +68,12 @@ spec: args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} {{- end }} env: + {{- if .Values.env }} + {{- range $key, $val := .Values.env }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end }} + {{- end }} - name: ALS_DATABASE__PASSWORD {{- if .Values.config.db_secret }} valueFrom: diff --git a/account-lookup-service/chart-admin/values.yaml b/account-lookup-service/chart-admin/values.yaml index 67794ec6e..04695d85c 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.4.0-snapshot.29 + tag: v15.5.0-snapshot.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 @@ -251,7 +251,7 @@ config: cluster: - host: proxy-cache-redis port: 6379 - + ## Handlers configuration handlers: DISABLED: true @@ -262,6 +262,10 @@ config: TIMEZONE: "UTC" BATCH_SIZE: 100 +## To pass arbitrary environment variables to the deployment +#env: +# KEY: value + ## @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: diff --git a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml index 9bca1015c..77bfb9e9a 100644 --- a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml +++ b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml @@ -68,6 +68,14 @@ spec: args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} {{- end }} env: + {{- if .Values.env }} + {{- range $key, $val := .Values.env }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end }} + {{- end }} + - name: API_TYPE + value: {{ .Values.config.api_type }} - name: ALS_DATABASE__PASSWORD {{- if .Values.config.db_secret }} valueFrom: diff --git a/account-lookup-service/chart-handler-timeout/values.yaml b/account-lookup-service/chart-handler-timeout/values.yaml index 73b657621..10234d30b 100644 --- a/account-lookup-service/chart-handler-timeout/values.yaml +++ b/account-lookup-service/chart-handler-timeout/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.33 + tag: v15.5.0-snapshot.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 @@ -124,6 +124,8 @@ metrics: serviceName: account-lookup-service-handler-timeout config: + ## fspiop or iso20022 + api_type: fspiop hub_participant: id: 1 name: Hub @@ -264,6 +266,10 @@ config: TIMEZONE: "UTC" BATCH_SIZE: 100 +## To pass arbitrary environment variables to the deployment +#env: +# KEY: value + ## @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: diff --git a/account-lookup-service/chart-service/templates/deployment.yaml b/account-lookup-service/chart-service/templates/deployment.yaml index 45257a458..038b548a0 100644 --- a/account-lookup-service/chart-service/templates/deployment.yaml +++ b/account-lookup-service/chart-service/templates/deployment.yaml @@ -68,6 +68,14 @@ spec: args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} {{- end }} env: + {{- if .Values.env }} + {{- range $key, $val := .Values.env }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end }} + {{- end }} + - name: API_TYPE + value: {{ .Values.config.api_type }} - name: ALS_DATABASE__PASSWORD {{- if .Values.config.db_secret }} valueFrom: diff --git a/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 44877b659..52161e04a 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.4.0-snapshot.29 + tag: v15.5.0-snapshot.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 @@ -124,6 +124,8 @@ metrics: serviceName: account-lookup-service config: + ## fspiop or iso20022 + api_type: fspiop hub_participant: id: 1 name: Hub @@ -253,7 +255,7 @@ config: cluster: - host: proxy-cache-redis port: 6379 - + ## Handlers configuration handlers: DISABLED: true @@ -264,6 +266,10 @@ config: TIMEZONE: "UTC" BATCH_SIZE: 100 +## To pass arbitrary environment variables to the deployment +#env: +# KEY: value + ## @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: diff --git a/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index 369e26c55..db5986486 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.4.0-snapshot.29 + tag: v15.5.0-snapshot.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 @@ -344,7 +344,7 @@ account-lookup-service-admin: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.29 + tag: v15.5.0-snapshot.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 @@ -704,7 +704,7 @@ account-lookup-service-handler-timeout: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.33 + tag: v15.5.0-snapshot.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 @@ -871,7 +871,7 @@ account-lookup-service-handler-timeout: cluster: - host: proxy-cache-redis port: 6379 - + handlers: DISABLED: true MONITORING_PORT: 4003 @@ -1032,7 +1032,7 @@ account-lookup-service-handler-timeout: # hosts: # - chart-example.local resources: {} - + als-oracle-pathfinder: enabled: false diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index a59a4be2a..039366fc1 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -15,7 +15,7 @@ maintainers: email: steven.oderayi@infitx.com dependencies: - name: account-lookup-service - version: ">= 15.4.0" + version: ">= 15.5.0" repository: "file://../account-lookup-service" condition: account-lookup-service.enabled - name: quoting-service From 394a73c7e3876e422774dcbec8cb80a6897bd335 Mon Sep 17 00:00:00 2001 From: Vijay Date: Tue, 15 Oct 2024 21:49:19 +0530 Subject: [PATCH 02/21] feat: ttk bump --- ml-testing-toolkit/Chart.yaml | 8 ++++---- ml-testing-toolkit/chart-backend/Chart.yaml | 4 ++-- ml-testing-toolkit/chart-backend/values.yaml | 8 +++++++- ml-testing-toolkit/chart-frontend/Chart.yaml | 4 ++-- ml-testing-toolkit/chart-frontend/values.yaml | 2 +- mojaloop-ttk-simulators/chart-sim1/Chart.yaml | 2 +- mojaloop-ttk-simulators/chart-sim2/Chart.yaml | 2 +- mojaloop-ttk-simulators/chart-sim3/Chart.yaml | 2 +- mojaloop/Chart.yaml | 2 +- mojaloop/values.yaml | 5 +++++ 10 files changed, 25 insertions(+), 14 deletions(-) diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index 0c23d5152..e2d7c517f 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.5.0 -appVersion: "ml-testing-toolkit: v17.2.1; ml-testing-toolkit-ui: v15.4.2" +version: 18.0.0 +appVersion: "ml-testing-toolkit: v18.0.0; ml-testing-toolkit-ui: v16.0.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -21,11 +21,11 @@ maintainers: email: steven.oderayi@infitx.com dependencies: - name: ml-testing-toolkit-frontend - version: ">= 15.7.0" + version: ">= 16.0.0" repository: "file://./chart-frontend" condition: ml-testing-toolkit-frontend.enabled - name: ml-testing-toolkit-backend - version: ">= 16.3.0" + version: ">= 17.0.0" repository: "file://./chart-backend" condition: ml-testing-toolkit-backend.enabled - name: common diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index a07b345ff..f98f2a98d 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.4.0 -appVersion: v17.2.1 +version: 17.0.0 +appVersion: v18.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index df3511f9c..c8e596308 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.2.3 + tag: v18.0.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 @@ -279,6 +279,12 @@ config_files: "folderPath": "fspiop_2.0", "asynchronous": true }, + { + "type": "iso20022", + "version": "2.0", + "folderPath": "fspiop_2.0_iso20022", + "asynchronous": true + }, { "type": "settlements", "version": "1.0", diff --git a/ml-testing-toolkit/chart-frontend/Chart.yaml b/ml-testing-toolkit/chart-frontend/Chart.yaml index 2be4ede7d..fe2c489ac 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.7.0 -appVersion: v15.4.2 +version: 16.0.0 +appVersion: v16.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-frontend/values.yaml b/ml-testing-toolkit/chart-frontend/values.yaml index 2956d1e92..06bd8cfaf 100644 --- a/ml-testing-toolkit/chart-frontend/values.yaml +++ b/ml-testing-toolkit/chart-frontend/values.yaml @@ -3,7 +3,7 @@ # Declare variables to be passed into your templates. image: repository: mojaloop/ml-testing-toolkit-ui - tag: v15.5.0 + tag: v16.0.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/mojaloop-ttk-simulators/chart-sim1/Chart.yaml b/mojaloop-ttk-simulators/chart-sim1/Chart.yaml index 9f5b4b1aa..c6920f3a6 100644 --- a/mojaloop-ttk-simulators/chart-sim1/Chart.yaml +++ b/mojaloop-ttk-simulators/chart-sim1/Chart.yaml @@ -29,7 +29,7 @@ dependencies: repository: "file://../../ml-testing-toolkit" tags: - testing-toolkit - version: ">= 17.0.0" + version: ">= 18.0.0" condition: ml-testing-toolkit.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" diff --git a/mojaloop-ttk-simulators/chart-sim2/Chart.yaml b/mojaloop-ttk-simulators/chart-sim2/Chart.yaml index ed00f3c51..ac78a3176 100644 --- a/mojaloop-ttk-simulators/chart-sim2/Chart.yaml +++ b/mojaloop-ttk-simulators/chart-sim2/Chart.yaml @@ -29,7 +29,7 @@ dependencies: repository: "file://../../ml-testing-toolkit" tags: - testing-toolkit - version: ">= 17.0.0" + version: ">= 18.0.0" condition: ml-testing-toolkit.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" diff --git a/mojaloop-ttk-simulators/chart-sim3/Chart.yaml b/mojaloop-ttk-simulators/chart-sim3/Chart.yaml index 3d6763c75..7a0d67c20 100644 --- a/mojaloop-ttk-simulators/chart-sim3/Chart.yaml +++ b/mojaloop-ttk-simulators/chart-sim3/Chart.yaml @@ -29,7 +29,7 @@ dependencies: repository: "file://../../ml-testing-toolkit" tags: - testing-toolkit - version: ">= 17.0.0" + version: ">= 18.0.0" condition: ml-testing-toolkit.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index 039366fc1..fca6a347c 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -64,7 +64,7 @@ dependencies: tags: - moja-common - name: ml-testing-toolkit - version: ">= 17.4.0" + version: ">= 18.0.0" repository: "file://../ml-testing-toolkit" condition: ml-testing-toolkit.enabled - name: ml-testing-toolkit-cli diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index c49f95fc0..df843eaf6 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -13540,6 +13540,11 @@ ml-testing-toolkit: simNameTTKSim3: 'ttksim3' extraEnvironments: hub-k8s-default-environment.json: &ttkInputValues { + "options": { + "breakOnError": false, + "transformerName": "none", + "generateIDType": "ulid" + }, "inputValues": { "HUB_NAME": *HUB_NAME, "BASE_CENTRAL_LEDGER_ADMIN": "", From 53b1b8c3cc551e712b6213bab49072a5878629ef Mon Sep 17 00:00:00 2001 From: "geka.evk" Date: Wed, 16 Oct 2024 11:54:55 +0100 Subject: [PATCH 03/21] feat(csi-107): updated QS version --- .../chart-service/configs/default.json | 1 + .../chart-service/templates/deployment.yaml | 2 -- .../chart-service/values.yaml | 2 +- quoting-service/Chart.yaml | 2 +- quoting-service/chart-handler/Chart.yaml | 2 +- quoting-service/chart-service/Chart.yaml | 2 +- .../chart-service/configs/default.json | 3 +++ .../chart-service/templates/deployment.yaml | 6 ++++++ quoting-service/chart-service/values.yaml | 17 ++++++++++++++++- quoting-service/values.yaml | 13 ++++++++++++- 10 files changed, 42 insertions(+), 8 deletions(-) diff --git a/account-lookup-service/chart-service/configs/default.json b/account-lookup-service/chart-service/configs/default.json index e132a42b2..e6a31d489 100644 --- a/account-lookup-service/chart-service/configs/default.json +++ b/account-lookup-service/chart-service/configs/default.json @@ -6,6 +6,7 @@ }, "ADMIN_PORT": 4001, "API_PORT": {{ .Values.service.internalPort }}, + "API_TYPE": {{ .Values.config.api_type }}, "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }}, "DATABASE": { "DIALECT": "{{ .Values.config.db_driver }}", diff --git a/account-lookup-service/chart-service/templates/deployment.yaml b/account-lookup-service/chart-service/templates/deployment.yaml index 038b548a0..6b0ed4695 100644 --- a/account-lookup-service/chart-service/templates/deployment.yaml +++ b/account-lookup-service/chart-service/templates/deployment.yaml @@ -74,8 +74,6 @@ spec: value: {{ $val | quote }} {{- end }} {{- end }} - - name: API_TYPE - value: {{ .Values.config.api_type }} - name: ALS_DATABASE__PASSWORD {{- if .Values.config.db_secret }} valueFrom: diff --git a/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 52161e04a..8b43f4ec8 100644 --- a/account-lookup-service/chart-service/values.yaml +++ b/account-lookup-service/chart-service/values.yaml @@ -124,7 +124,7 @@ metrics: serviceName: account-lookup-service config: - ## fspiop or iso20022 + ## fspiop | iso20022 api_type: fspiop hub_participant: id: 1 diff --git a/quoting-service/Chart.yaml b/quoting-service/Chart.yaml index e7027ab1f..bd46d418f 100644 --- a/quoting-service/Chart.yaml +++ b/quoting-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Quoting-Service Helm chart for Kubernetes name: quoting-service version: 15.8.0 -appVersion: v15.8.0-snapshot.40 +appVersion: v15.8.0-snapshot.44 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-handler/Chart.yaml b/quoting-service/chart-handler/Chart.yaml index 4ebbac19f..128578336 100644 --- a/quoting-service/chart-handler/Chart.yaml +++ b/quoting-service/chart-handler/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Quoting-Service Handler Helm chart for Kubernetes name: quoting-service-handler version: 15.8.0 -appVersion: v15.8.0-snapshot.40 +appVersion: v15.8.0-snapshot.44 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-service/Chart.yaml b/quoting-service/chart-service/Chart.yaml index 3ba065d8d..1396434a9 100644 --- a/quoting-service/chart-service/Chart.yaml +++ b/quoting-service/chart-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Quoting-Service API Helm chart for Kubernetes name: quoting-service version: 15.8.0 -appVersion: v15.8.0-snapshot.40 +appVersion: v15.8.0-snapshot.44 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-service/configs/default.json b/quoting-service/chart-service/configs/default.json index de8ea7022..6d54a98a7 100644 --- a/quoting-service/chart-service/configs/default.json +++ b/quoting-service/chart-service/configs/default.json @@ -1,5 +1,8 @@ {{- $dbDeployHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }} { + "API_TYPE": {{ .Values.config.api_type }}, + "ORIGINAL_PAYLOAD_STORAGE": {{ .Values.config.original_payload_storage | quote }}, + "PAYLOAD_CACHE": {{ .Values.config.payload_cache | toPrettyJson | nindent 2}}, "HUB_PARTICIPANT": { "ID": {{ .Values.config.hub_participant.id }}, "NAME": {{ .Values.config.hub_participant.name | quote }} diff --git a/quoting-service/chart-service/templates/deployment.yaml b/quoting-service/chart-service/templates/deployment.yaml index 00097caba..24a04a81e 100644 --- a/quoting-service/chart-service/templates/deployment.yaml +++ b/quoting-service/chart-service/templates/deployment.yaml @@ -103,6 +103,12 @@ spec: periodSeconds: {{ .Values.livenessProbe.periodSeconds }} {{- end }} env: + {{- if .Values.env }} + {{- range $key, $val := .Values.env }} + - name: {{ $key }} + value: {{ $val | quote }} + {{- end }} + {{- end }} - name: QUOTE_DATABASE__PASSWORD {{- if .Values.config.db_secret }} valueFrom: diff --git a/quoting-service/chart-service/values.yaml b/quoting-service/chart-service/values.yaml index e402c8c50..de4d8bb24 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.8.0-snapshot.40 + tag: v15.8.0-snapshot.44 ## 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 @@ -122,6 +122,17 @@ metrics: serviceName: quoting-service-api config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub @@ -237,6 +248,10 @@ config: - host: proxy-cache-redis port: 6379 +## To pass arbitrary environment variables to the deployment +#env: +# KEY: value + rules: [] ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index 73417a47a..6f8735080 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.8.0-snapshot.36 + tag: v15.8.0-snapshot.44 ## 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 @@ -138,6 +138,17 @@ quoting-service: # API serviceName: quoting-service config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub From fccaddf02a92c33054666bc895e31edefd06f238 Mon Sep 17 00:00:00 2001 From: "geka.evk" Date: Wed, 16 Oct 2024 20:00:19 +0100 Subject: [PATCH 04/21] feat(csi-107): updated ALS and QS versions to use iso images --- account-lookup-service/Chart.yaml | 4 ++-- account-lookup-service/chart-admin/values.yaml | 2 +- account-lookup-service/chart-handler-timeout/values.yaml | 2 +- account-lookup-service/chart-service/values.yaml | 2 +- account-lookup-service/values.yaml | 6 +++--- mojaloop/Chart.yaml | 2 +- quoting-service/Chart.yaml | 4 ++-- quoting-service/chart-handler/Chart.yaml | 4 ++-- quoting-service/chart-service/Chart.yaml | 4 ++-- quoting-service/chart-service/values.yaml | 2 +- quoting-service/values.yaml | 2 +- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/account-lookup-service/Chart.yaml b/account-lookup-service/Chart.yaml index c99d414ef..5e027695c 100644 --- a/account-lookup-service/Chart.yaml +++ b/account-lookup-service/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 -version: 15.5.0 -appVersion: "account-lookup-service: v15.5.0; als-oracle-pathfinder: v12.1.0" +version: 15.6.0 +appVersion: "account-lookup-service: v15.6.0; als-oracle-pathfinder: v12.1.0" description: Account Lookup Service Helm Chart for Mojaloop name: account-lookup-service maintainers: diff --git a/account-lookup-service/chart-admin/values.yaml b/account-lookup-service/chart-admin/values.yaml index 04695d85c..8eb69a1cf 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.5.0-snapshot.2 + tag: v15.6.0-iso.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/account-lookup-service/chart-handler-timeout/values.yaml b/account-lookup-service/chart-handler-timeout/values.yaml index 10234d30b..ce48caba2 100644 --- a/account-lookup-service/chart-handler-timeout/values.yaml +++ b/account-lookup-service/chart-handler-timeout/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.5.0-snapshot.2 + tag: v15.6.0-iso.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/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 8b43f4ec8..914d20129 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.5.0-snapshot.2 + tag: v15.6.0-iso.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/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index db5986486..e20004b38 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.5.0-snapshot.2 + tag: v15.6.0-iso.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 @@ -344,7 +344,7 @@ account-lookup-service-admin: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.5.0-snapshot.2 + tag: v15.6.0-iso.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 @@ -704,7 +704,7 @@ account-lookup-service-handler-timeout: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.5.0-snapshot.2 + tag: v15.6.0-iso.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/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index fca6a347c..1587eb0ce 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Mojaloop Helm chart for Kubernetes name: mojaloop version: 16.2.1 -appVersion: "ml-api-adapter: v14.0.5; central-ledger: v17.6.0; account-lookup-service: v15.4.0; quoting-service: v15.8.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;" +appVersion: "ml-api-adapter: v14.0.5; central-ledger: v17.6.0; account-lookup-service: v15.6.0; quoting-service: v15.9.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: diff --git a/quoting-service/Chart.yaml b/quoting-service/Chart.yaml index bd46d418f..1b35048cf 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.8.0 -appVersion: v15.8.0-snapshot.44 +version: 15.9.0 +appVersion: v15.9.0-iso.2 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-handler/Chart.yaml b/quoting-service/chart-handler/Chart.yaml index 128578336..fdaa13ff2 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.8.0 -appVersion: v15.8.0-snapshot.44 +version: 15.9.0 +appVersion: v15.9.0-snapshot.44 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-service/Chart.yaml b/quoting-service/chart-service/Chart.yaml index 1396434a9..73b8f5582 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.8.0 -appVersion: v15.8.0-snapshot.44 +version: 15.9.0 +appVersion: v15.9.0-iso.2 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-service/values.yaml b/quoting-service/chart-service/values.yaml index de4d8bb24..c09e7f0f7 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.8.0-snapshot.44 + tag: v15.9.0-iso.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 diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index 6f8735080..cc5e02dad 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.8.0-snapshot.44 + tag: v15.9.0-iso.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 From 2906f37108cbce1f8138e371e0ff8dfb32301d5f Mon Sep 17 00:00:00 2001 From: vijayg10 <33152110+vijayg10@users.noreply.github.com> Date: Thu, 17 Oct 2024 22:20:44 +0530 Subject: [PATCH 05/21] chore: fx upstream merge (#664) * fix: reload on config-override change (#662) * feat: added script to rebuild images for arm * chore: update mysql version in initcontainers * chore: readme * chore: added doc * chore: doc * fix: ttk ulid * chore: changed helmfile * fix: versions * fix: version * fix: interscheme --------- Co-authored-by: Kalin Krustev --- .changelog/release-v16.0.0.md | 2 +- .../chart-admin/templates/deployment.yaml | 3 + .../chart-admin/values.yaml | 2 +- .../templates/deployment.yaml | 3 + .../chart-handler-timeout/values.yaml | 2 +- .../chart-service/templates/deployment.yaml | 3 + .../chart-service/values.yaml | 2 +- account-lookup-service/values.yaml | 10 +- als-oracle-pathfinder/values.yaml | 4 +- .../templates/deployment.yaml | 3 + .../chart-service/templates/deployment.yaml | 3 + bulk-centralledger/Chart.yaml | 2 +- .../Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- .../Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- .../Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- .../Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- bulk-centralledger/values.yaml | 16 +- centralledger/Chart.yaml | 2 +- .../chart-handler-admin-transfer/Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../chart-handler-admin-transfer/values.yaml | 4 +- .../chart-handler-timeout/Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../chart-handler-timeout/values.yaml | 4 +- .../chart-handler-transfer-fulfil/Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../chart-handler-transfer-fulfil/values.yaml | 4 +- .../chart-handler-transfer-get/Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../chart-handler-transfer-get/values.yaml | 4 +- .../Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- .../Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- .../chart-handler-transfer-prepare/Chart.yaml | 2 +- .../templates/deployment.yaml | 3 + .../values.yaml | 4 +- centralledger/chart-service/Chart.yaml | 2 +- .../chart-service/templates/deployment.yaml | 3 + centralledger/chart-service/values.yaml | 4 +- centralledger/values.yaml | 32 ++-- .../chart-service/templates/deployment.yaml | 3 + centralsettlement/chart-service/values.yaml | 2 +- centralsettlement/values.yaml | 8 +- .../docker_arm_rebuild/README.md | 115 ++++++++++++++ .../docker_arm_rebuild/rebuild.sh | 75 +++++++++ local-deployment-methods/helmfile/README.md | 30 +++- .../templates/deployment.yaml | 3 + .../chart-handler-notification/values.yaml | 2 +- .../chart-service/templates/deployment.yaml | 3 + ml-api-adapter/chart-service/values.yaml | 2 +- ml-api-adapter/values.yaml | 4 +- mojaloop-bulk/Chart.yaml | 2 +- mojaloop-bulk/values.yaml | 16 +- mojaloop-simulator/Chart.yaml | 2 +- mojaloop-simulator/values.yaml | 4 +- mojaloop/values.yaml | 150 +++++++++--------- .../chart-handler/templates/deployment.yaml | 3 + quoting-service/chart-handler/values.yaml | 4 +- .../chart-service/templates/deployment.yaml | 3 + quoting-service/values.yaml | 4 +- sdk-scheme-adapter/Chart.yaml | 2 +- sdk-scheme-adapter/chart-service/values.yaml | 2 +- sdk-scheme-adapter/values.yaml | 6 +- .../chart-auth-svc/example_dependencies.yaml | 2 +- thirdparty/chart-auth-svc/values.yaml | 2 +- .../example_dependencies.yaml | 2 +- thirdparty/chart-consent-oracle/values.yaml | 2 +- thirdparty/values.yaml | 8 +- .../templates/deployment.yaml | 3 + transaction-requests-service/values.yaml | 2 +- 81 files changed, 474 insertions(+), 189 deletions(-) create mode 100644 local-deployment-methods/docker_arm_rebuild/README.md create mode 100644 local-deployment-methods/docker_arm_rebuild/rebuild.sh diff --git a/.changelog/release-v16.0.0.md b/.changelog/release-v16.0.0.md index 1d6ad3804..55b626770 100644 --- a/.changelog/release-v16.0.0.md +++ b/.changelog/release-v16.0.0.md @@ -55,7 +55,7 @@ Enhancements and breaking changes to the [v15.2.0 Release](https://github.com/mo 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) +17. mojaloop-simulator: [v15.1.1](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) diff --git a/account-lookup-service/chart-admin/templates/deployment.yaml b/account-lookup-service/chart-admin/templates/deployment.yaml index 1a513a820..9338ba718 100644 --- a/account-lookup-service/chart-admin/templates/deployment.yaml +++ b/account-lookup-service/chart-admin/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} # Custom Pod annotations {{- if .Values.podAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $ ) | nindent 8 }} diff --git a/account-lookup-service/chart-admin/values.yaml b/account-lookup-service/chart-admin/values.yaml index 8eb69a1cf..abbf2f6f4 100644 --- a/account-lookup-service/chart-admin/values.yaml +++ b/account-lookup-service/chart-admin/values.yaml @@ -278,7 +278,7 @@ config: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml index 77bfb9e9a..b83b1b1ef 100644 --- a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml +++ b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret-jws: {{ include (print $.Template.BasePath "/secret-jws.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/account-lookup-service/chart-handler-timeout/values.yaml b/account-lookup-service/chart-handler-timeout/values.yaml index ce48caba2..b4939f1ff 100644 --- a/account-lookup-service/chart-handler-timeout/values.yaml +++ b/account-lookup-service/chart-handler-timeout/values.yaml @@ -282,7 +282,7 @@ config: initContainers: [] # initContainers: | # - name: wait-for-mysql -# image: mysql:5.7 +# image: mysql:9.0.1 # imagePullPolicy: IfNotPresent # command: # - sh diff --git a/account-lookup-service/chart-service/templates/deployment.yaml b/account-lookup-service/chart-service/templates/deployment.yaml index 6b0ed4695..a21327663 100644 --- a/account-lookup-service/chart-service/templates/deployment.yaml +++ b/account-lookup-service/chart-service/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret-jws: {{ include (print $.Template.BasePath "/secret-jws.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 914d20129..eb33729d1 100644 --- a/account-lookup-service/chart-service/values.yaml +++ b/account-lookup-service/chart-service/values.yaml @@ -282,7 +282,7 @@ config: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index e20004b38..a25f9b687 100644 --- a/account-lookup-service/values.yaml +++ b/account-lookup-service/values.yaml @@ -187,7 +187,7 @@ account-lookup-service: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -524,7 +524,7 @@ account-lookup-service-admin: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -894,7 +894,7 @@ account-lookup-service-handler-timeout: initContainers: [] # initContainers: | # - name: wait-for-mysql - # image: mysql:5.7 + # image: mysql:9.0.1 # imagePullPolicy: IfNotPresent # command: # - sh @@ -1254,7 +1254,7 @@ als-oracle-pathfinder: # initContainers: [] initContainers: | - name: wait-for-mysql-central-ledger - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1318,7 +1318,7 @@ als-oracle-pathfinder: - name: SERVICE_NAME value: '{{ include "als-oracle-pathfinder.name" . }}' - name: wait-for-mysql-account-lookup - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/als-oracle-pathfinder/values.yaml b/als-oracle-pathfinder/values.yaml index dbe520654..3230d483e 100644 --- a/als-oracle-pathfinder/values.yaml +++ b/als-oracle-pathfinder/values.yaml @@ -266,7 +266,7 @@ config: # initContainers: [] initContainers: | - name: wait-for-mysql-central-ledger - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -330,7 +330,7 @@ initContainers: | - name: SERVICE_NAME value: '{{ include "als-oracle-pathfinder.name" . }}' - name: wait-for-mysql-account-lookup - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml index 491661c14..a9874a6c8 100644 --- a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} {{- if .Values.config.endpointSecurity.jwsSign }} checksum/secret-jws: {{ include (print $.Template.BasePath "/secret-jws.yaml") . | sha256sum }} {{- end }} diff --git a/bulk-api-adapter/chart-service/templates/deployment.yaml b/bulk-api-adapter/chart-service/templates/deployment.yaml index c9dfbeb76..04ec5b238 100644 --- a/bulk-api-adapter/chart-service/templates/deployment.yaml +++ b/bulk-api-adapter/chart-service/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} {{- if .Values.metrics.enabled }} prometheus.io/port: "{{ .Values.service.internalPort }}" prometheus.io/scrape: "true" diff --git a/bulk-centralledger/Chart.yaml b/bulk-centralledger/Chart.yaml index f02416a3b..da1a3676b 100644 --- a/bulk-centralledger/Chart.yaml +++ b/bulk-centralledger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Bulk Services Helm chart for Kubernetes name: bulk-centralledger version: 14.8.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml index e9fdab560..2f3441f64 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Bulk Transfer Fulfil Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-fulfil version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/deployment.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/deployment.yaml index 433f4b298..d1005478d 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- if .Values.metrics.enabled }} prometheus.io/port: "{{ .Values.service.internalPort }}" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml index 8d7edc6fa..572b5d0a3 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -201,7 +201,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml index 4f1a61c2c..e68aaf996 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Bulk Transfer Get Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-get version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml index bfb92be75..19d135ab8 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- if .Values.metrics.enabled }} prometheus.io/port: "{{ .Values.service.internalPort }}" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml index a744bd5f9..f7c6c505e 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -201,7 +201,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml index d48bb66d4..4b66cfce6 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Bulk Transfer Prepare Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-prepare version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/deployment.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/deployment.yaml index fbb986291..1e297f33d 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- if .Values.metrics.enabled }} prometheus.io/port: "{{ .Values.service.internalPort }}" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml index c9d737862..154a16fc7 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -204,7 +204,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml index 03b1db228..a1c02790c 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Bulk Transfer Processing Handler Helm chart for Kubernetes name: cl-handler-bulk-transfer-processing version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/deployment.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/deployment.yaml index 7bceab60c..f2618a31c 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} {{- if .Values.metrics.enabled }} prometheus.io/port: "{{ .Values.service.internalPort }}" diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml index bca8eeb16..81187c31c 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -201,7 +201,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/bulk-centralledger/values.yaml b/bulk-centralledger/values.yaml index 81b2597b7..a4738968e 100644 --- a/bulk-centralledger/values.yaml +++ b/bulk-centralledger/values.yaml @@ -13,7 +13,7 @@ cl-handler-bulk-transfer-prepare: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -208,7 +208,7 @@ cl-handler-bulk-transfer-prepare: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -396,7 +396,7 @@ cl-handler-bulk-transfer-fulfil: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -579,7 +579,7 @@ cl-handler-bulk-transfer-fulfil: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -767,7 +767,7 @@ cl-handler-bulk-transfer-processing: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -959,7 +959,7 @@ cl-handler-bulk-transfer-processing: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1147,7 +1147,7 @@ cl-handler-bulk-transfer-get: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -1339,7 +1339,7 @@ cl-handler-bulk-transfer-get: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/Chart.yaml b/centralledger/Chart.yaml index 6234d2a6d..33b0ce216 100644 --- a/centralledger/Chart.yaml +++ b/centralledger/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Helm chart for Kubernetes name: centralledger version: 14.16.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-admin-transfer/Chart.yaml b/centralledger/chart-handler-admin-transfer/Chart.yaml index cd7df3c3b..992c957e6 100644 --- a/centralledger/chart-handler-admin-transfer/Chart.yaml +++ b/centralledger/chart-handler-admin-transfer/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes name: centralledger-handler-admin-transfer version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-admin-transfer/templates/deployment.yaml b/centralledger/chart-handler-admin-transfer/templates/deployment.yaml index a1834187f..573e44240 100644 --- a/centralledger/chart-handler-admin-transfer/templates/deployment.yaml +++ b/centralledger/chart-handler-admin-transfer/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-admin-transfer/values.yaml b/centralledger/chart-handler-admin-transfer/values.yaml index 2c5df38d2..0bea111bc 100644 --- a/centralledger/chart-handler-admin-transfer/values.yaml +++ b/centralledger/chart-handler-admin-transfer/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -255,7 +255,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-handler-timeout/Chart.yaml b/centralledger/chart-handler-timeout/Chart.yaml index a603e7eb5..d99c95ab5 100644 --- a/centralledger/chart-handler-timeout/Chart.yaml +++ b/centralledger/chart-handler-timeout/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Timeout Handler Helm chart for Kubernetes name: centralledger-handler-timeout version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-timeout/templates/deployment.yaml b/centralledger/chart-handler-timeout/templates/deployment.yaml index 319d4945e..0801cc5f7 100644 --- a/centralledger/chart-handler-timeout/templates/deployment.yaml +++ b/centralledger/chart-handler-timeout/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-timeout/values.yaml b/centralledger/chart-handler-timeout/values.yaml index 4525b4d2a..583c0e643 100644 --- a/centralledger/chart-handler-timeout/values.yaml +++ b/centralledger/chart-handler-timeout/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -263,7 +263,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-handler-transfer-fulfil/Chart.yaml b/centralledger/chart-handler-transfer-fulfil/Chart.yaml index f87ce4fd4..3e8ac8370 100644 --- a/centralledger/chart-handler-transfer-fulfil/Chart.yaml +++ b/centralledger/chart-handler-transfer-fulfil/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Transfer Fulfil Handler Helm chart for Kubernetes name: centralledger-handler-transfer-fulfil version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml b/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml index 1dbbb4448..64e72003b 100644 --- a/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-transfer-fulfil/values.yaml b/centralledger/chart-handler-transfer-fulfil/values.yaml index 53c2e1e3f..c10614561 100644 --- a/centralledger/chart-handler-transfer-fulfil/values.yaml +++ b/centralledger/chart-handler-transfer-fulfil/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -258,7 +258,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-handler-transfer-get/Chart.yaml b/centralledger/chart-handler-transfer-get/Chart.yaml index 9279e13a5..5636b0df4 100644 --- a/centralledger/chart-handler-transfer-get/Chart.yaml +++ b/centralledger/chart-handler-transfer-get/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Get Transfer Handler Helm chart for Kubernetes name: centralledger-handler-transfer-get version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-get/templates/deployment.yaml b/centralledger/chart-handler-transfer-get/templates/deployment.yaml index 8a0680dca..a47b1c6cf 100644 --- a/centralledger/chart-handler-transfer-get/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-get/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-transfer-get/values.yaml b/centralledger/chart-handler-transfer-get/values.yaml index 8b101a784..2433ca42b 100644 --- a/centralledger/chart-handler-transfer-get/values.yaml +++ b/centralledger/chart-handler-transfer-get/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -255,7 +255,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-handler-transfer-position-batch/Chart.yaml b/centralledger/chart-handler-transfer-position-batch/Chart.yaml index eb7ae82e8..dbee63ad2 100644 --- a/centralledger/chart-handler-transfer-position-batch/Chart.yaml +++ b/centralledger/chart-handler-transfer-position-batch/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: "Central-Ledger Transfer Position Batch Handler Helm chart for Kubernetes." name: centralledger-handler-transfer-position-batch version: 15.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml b/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml index 2b1ca435d..f78f5cbb1 100644 --- a/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-transfer-position-batch/values.yaml b/centralledger/chart-handler-transfer-position-batch/values.yaml index 59646b34f..3dcb50fec 100644 --- a/centralledger/chart-handler-transfer-position-batch/values.yaml +++ b/centralledger/chart-handler-transfer-position-batch/values.yaml @@ -11,7 +11,7 @@ nameOverride: "handler-pos-batch" image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -263,7 +263,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-handler-transfer-position/Chart.yaml b/centralledger/chart-handler-transfer-position/Chart.yaml index a6e31bfa7..f400a2c8d 100644 --- a/centralledger/chart-handler-transfer-position/Chart.yaml +++ b/centralledger/chart-handler-transfer-position/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Transfer Position Handler Helm chart for Kubernetes name: centralledger-handler-transfer-position version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-position/templates/deployment.yaml b/centralledger/chart-handler-transfer-position/templates/deployment.yaml index 904da817b..e49536cf1 100644 --- a/centralledger/chart-handler-transfer-position/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-position/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-transfer-position/values.yaml b/centralledger/chart-handler-transfer-position/values.yaml index 633707f31..516aceee5 100644 --- a/centralledger/chart-handler-transfer-position/values.yaml +++ b/centralledger/chart-handler-transfer-position/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -255,7 +255,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-handler-transfer-prepare/Chart.yaml b/centralledger/chart-handler-transfer-prepare/Chart.yaml index 487d8c8ac..fdc8f26b7 100644 --- a/centralledger/chart-handler-transfer-prepare/Chart.yaml +++ b/centralledger/chart-handler-transfer-prepare/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Transfer Prepare Handler Helm chart for Kubernetes name: centralledger-handler-transfer-prepare version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml b/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml index 937e4ff24..3e8397b9e 100644 --- a/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml @@ -28,6 +28,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-handler-transfer-prepare/values.yaml b/centralledger/chart-handler-transfer-prepare/values.yaml index 1596dfe46..908975330 100644 --- a/centralledger/chart-handler-transfer-prepare/values.yaml +++ b/centralledger/chart-handler-transfer-prepare/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -261,7 +261,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/chart-service/Chart.yaml b/centralledger/chart-service/Chart.yaml index 9703bfb96..0a21ab984 100644 --- a/centralledger/chart-service/Chart.yaml +++ b/centralledger/chart-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Central-Ledger Service Helm chart for Kubernetes name: centralledger-service version: 14.5.0 -appVersion: v17.8.0-snapshot.33 +appVersion: v17.8.0-snapshot.34 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/centralledger/chart-service/templates/deployment.yaml b/centralledger/chart-service/templates/deployment.yaml index 18ed33bca..a53f5beee 100644 --- a/centralledger/chart-service/templates/deployment.yaml +++ b/centralledger/chart-service/templates/deployment.yaml @@ -28,6 +28,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralledger/chart-service/values.yaml b/centralledger/chart-service/values.yaml index 5b4e6112f..9ca5f673e 100644 --- a/centralledger/chart-service/values.yaml +++ b/centralledger/chart-service/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -236,7 +236,7 @@ config: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralledger/values.yaml b/centralledger/values.yaml index 9eed22080..c9bba36a8 100644 --- a/centralledger/values.yaml +++ b/centralledger/values.yaml @@ -16,7 +16,7 @@ centralledger-service: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -253,7 +253,7 @@ centralledger-service: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -431,7 +431,7 @@ centralledger-handler-transfer-prepare: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -693,7 +693,7 @@ centralledger-handler-transfer-prepare: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -849,7 +849,7 @@ centralledger-handler-transfer-position: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -1105,7 +1105,7 @@ centralledger-handler-transfer-position: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1261,7 +1261,7 @@ centralledger-handler-transfer-position-batch: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -1523,7 +1523,7 @@ centralledger-handler-transfer-position-batch: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1679,7 +1679,7 @@ centralledger-handler-transfer-get: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -1935,7 +1935,7 @@ centralledger-handler-transfer-get: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -2091,7 +2091,7 @@ centralledger-handler-transfer-fulfil: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -2350,7 +2350,7 @@ centralledger-handler-transfer-fulfil: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -2506,7 +2506,7 @@ centralledger-handler-timeout: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -2770,7 +2770,7 @@ centralledger-handler-timeout: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -2926,7 +2926,7 @@ centralledger-handler-admin-transfer: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -3182,7 +3182,7 @@ centralledger-handler-admin-transfer: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralsettlement/chart-service/templates/deployment.yaml b/centralsettlement/chart-service/templates/deployment.yaml index 036ef57ee..3b882c75d 100644 --- a/centralsettlement/chart-service/templates/deployment.yaml +++ b/centralsettlement/chart-service/templates/deployment.yaml @@ -30,6 +30,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/centralsettlement/chart-service/values.yaml b/centralsettlement/chart-service/values.yaml index 29a7af50b..ac380ce7d 100644 --- a/centralsettlement/chart-service/values.yaml +++ b/centralsettlement/chart-service/values.yaml @@ -357,7 +357,7 @@ initContainers: | - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/centralsettlement/values.yaml b/centralsettlement/values.yaml index cdd2bca72..5b05a0d93 100644 --- a/centralsettlement/values.yaml +++ b/centralsettlement/values.yaml @@ -298,7 +298,7 @@ centralsettlement-service: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -740,7 +740,7 @@ centralsettlement-handler-deferredsettlement: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1183,7 +1183,7 @@ centralsettlement-handler-grosssettlement: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1716,7 +1716,7 @@ centralsettlement-handler-rules: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/local-deployment-methods/docker_arm_rebuild/README.md b/local-deployment-methods/docker_arm_rebuild/README.md new file mode 100644 index 000000000..4b636f4fa --- /dev/null +++ b/local-deployment-methods/docker_arm_rebuild/README.md @@ -0,0 +1,115 @@ +# Docker Image Re-Builder from Helm Charts + +## Overview + +The official **Mojaloop Docker images** are currently only available for the **AMD64** platform. When deploying Mojaloop Helm charts on an **ARM-based macOS**, these images run in **emulation mode**, which significantly slows down performance compared to native applications. + +This script aims to address that issue by: + +1. Extracting Mojaloop Docker image references from the Helm chart. +2. Cloning the respective repositories from GitHub. +3. Checking out the appropriate tags. +4. Rebuilding the Docker images for **ARM64** architecture. + +By building native ARM64 images, the goal is to improve the performance during local testing and development. **In the future**, it is hoped that Mojaloop’s official Docker images will natively support ARM architecture, eliminating the need for such custom builds. + + +--- + +## Prerequisites + +- **Git**: Ensure `git` is installed on your system. +- **Docker**: Docker daemon must be running and accessible. +- **Helm**: Helm must be installed and the charts should be accessible from the specified path. + +--- + +## Usage + +Make the script executable and run it from your terminal: + +```bash +cd local-deployment-methods/docker_arm_rebuild +chmod +x rebuild.sh +./rebuild.sh +``` + +## Script Parameters and Components + +### Variables: + +- HELM_RELEASE: + The name used for the Helm release. Example: moja. + +- HELM_CHART: + Path to the Helm chart folder to extract the templates. Example: ../../mojaloop/ or + +## Example Output +``` +Building Docker image from repo https://github.com/mojaloop/account-lookup-service.git with tag v15.4.0-snapshot.33 +Skipping duplicate image: mojaloop/central-ledger:v15.3.1 +Skipping non-mojaloop image: some-other-service:latest +``` + +## Limitations +- Helm Chart Assumptions: + The script assumes all Helm chart image references follow the format mojaloop/repo-name:tag. + +- ARM64 Architecture: + The script builds Docker images for ARM64 only. Adjust the docker build command if other architectures are needed. + +--- + +# Deploying Mojaloop on macOS using Docker Desktop + +## Prerequisites + +Before deploying Mojaloop, ensure the following tools are installed and configured on your macOS machine: + +- **Docker Desktop for macOS**: Ensure Kubernetes is enabled in Docker Desktop. +- **Helm**: Install Helm for managing your Kubernetes deployments. +- **Helmfile**: Install Helmfile to manage multiple Helm charts effectively. + +--- + +## Step-by-Step Deployment + +### 1. Adjust Resource Limits in Docker Desktop + +To run Mojaloop smoothly, adjust the CPU and memory allocations in Docker Desktop: + +1. Open **Docker Desktop**. +2. Navigate to **Settings** (⚙️) → **Resources**. +3. Set: + - **CPUs**: 8 cores + - **Memory**: 16 GB RAM +4. Click **Apply & Restart** to save the changes. + +### 2. Install Ingress NGINX Controller + +Mojaloop requires an Ingress controller to route external traffic to the services. Use the following Helm command to install. + +**Ingress NGINX**: + +```bash +helm upgrade --install ingress-nginx ingress-nginx \ + --repo https://kubernetes.github.io/ingress-nginx \ + --namespace ingress-nginx --create-namespace +``` + +### 3. Prepare Helm Chart Dependencies + +Navigate to the root directory of the project and run the update-charts-dep.sh script to update the chart dependencies: + +``` +sh update-charts-dep.sh +``` + +### 4. Deploy Mojaloop Using Helmfile + +Change to the local-deployment-methods/helmfile directory, where the Helmfile configuration is located. Then, run the following commands to deploy Mojaloop: + +``` +cd local-deployment-methods/helmfile +helmfile apply +``` diff --git a/local-deployment-methods/docker_arm_rebuild/rebuild.sh b/local-deployment-methods/docker_arm_rebuild/rebuild.sh new file mode 100644 index 000000000..8d116f37c --- /dev/null +++ b/local-deployment-methods/docker_arm_rebuild/rebuild.sh @@ -0,0 +1,75 @@ +#!/bin/bash + +HELM_CHART="../../mojaloop/" +HELM_RELEASE="moja" + +# Function to clone repo, checkout specific tag, and build docker image +build_docker_image_from_repo() { + IMAGE=$1 + REPO=$2 + TAG=$3 + + # Extract repo name for tagging image + REPO_NAME=$(basename "$REPO" .git) + + echo "Building Docker image from repo $REPO with tag $TAG" + + # Clone the repo + git clone "$REPO" + cd "$REPO_NAME" || exit + + # Checkout the specified tag + git checkout "$TAG" + + # Build the Docker image for ARM64 + docker build -t "$IMAGE" . + + # Cleanup and go back to parent directory + cd .. || exit + rm -rf "$REPO_NAME" +} + +# 1. Render the Helm chart template and extract image lines + +IMAGES=$(helm template "$HELM_RELEASE" "$HELM_CHART" | grep "image:" | awk '{print $2}') + +# 2. Create a temporary file to track unique image repo + tag combinations +touch processed_images.txt + +for IMAGE in $IMAGES +do + # Remove any quotes around the image string + IMAGE=$(echo $IMAGE | sed 's/^"//;s/"$//') + + # Check if the image starts with "mojaloop/" + if [[ $IMAGE == mojaloop/* ]]; then + # Extract the image repo name (mojaloop/account-lookup-service) and tag (v15.4.0-snapshot.33) + REPO_NAME=$(echo "$IMAGE" | cut -d ':' -f 1 | sed 's#mojaloop/##') # account-lookup-service + TAG=$(echo "$IMAGE" | cut -d ':' -f 2) # v15.4.0-snapshot.33 + + # Construct the Git repository URL based on the repo name + GIT_REPO="https://github.com/mojaloop/$REPO_NAME" + + # Create a unique key combining the repo and tag (to handle duplicates) + UNIQUE_KEY="$REPO_NAME:$TAG" + + # Check if this unique key has already been processed + if ! grep -q "$UNIQUE_KEY" processed_images.txt; then + # Mark this image as processed by writing it to the temporary file + echo "$UNIQUE_KEY" >> processed_images.txt + + # Run the build function in the background + build_docker_image_from_repo "$IMAGE" "$GIT_REPO" "$TAG" & + else + echo "Skipping duplicate image: $IMAGE" + fi + else + echo "Skipping non-mojaloop image: $IMAGE" + fi +done + +# Wait for all background jobs to finish +wait + +# Clean up the temporary file +rm processed_images.txt \ No newline at end of file diff --git a/local-deployment-methods/helmfile/README.md b/local-deployment-methods/helmfile/README.md index f26490b38..6a9e660cb 100644 --- a/local-deployment-methods/helmfile/README.md +++ b/local-deployment-methods/helmfile/README.md @@ -1,7 +1,31 @@ -https://github.com/helmfile/helmfile#installation + +# Helmfile-based Mojaloop Installation + +This guide covers the steps to install and manage Mojaloop using **Helmfile**. Helmfile simplifies deploying and managing Helm charts, especially in complex environments with multiple services like Mojaloop. + +--- + +## Prerequisites + +- **Kubernetes cluster** (local or cloud-based) +- **Helm** (v3+): [Install Helm](https://helm.sh/docs/intro/install/) +- **kubectl**: [Install kubectl](https://kubernetes.io/docs/tasks/tools/) +- **Docker**: Required for building and managing images +- **Helmfile**: Installation instructions below + + +## Mojaloop Deployment with Helmfile + +Follow the below steps assume that you have a Kubernetes cluster up and running. ``` sh update-charts-dep.sh -helmfile init +cd local-deployment-methods/helmfile helmfile apply -``` \ No newline at end of file +``` + +## Uninstalling Mojaloop +To remove the Mojaloop deployment, use: +``` +helmfile delete +``` diff --git a/ml-api-adapter/chart-handler-notification/templates/deployment.yaml b/ml-api-adapter/chart-handler-notification/templates/deployment.yaml index b3c5f250d..3b7518cdf 100644 --- a/ml-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/ml-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -34,6 +34,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret-jws: {{ include (print $.Template.BasePath "/secret-jws.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 798e24198..91667a5b8 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0.643-snapshot.0 + tag: v14.1.0-snapshot.25 ## 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-api-adapter/chart-service/templates/deployment.yaml b/ml-api-adapter/chart-service/templates/deployment.yaml index 095d34f35..ff2a2d396 100644 --- a/ml-api-adapter/chart-service/templates/deployment.yaml +++ b/ml-api-adapter/chart-service/templates/deployment.yaml @@ -34,6 +34,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} # Custom Pod annotations {{- if .Values.podAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $ ) | nindent 8 }} diff --git a/ml-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index 6c3ab5d38..0542daa74 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0.643-snapshot.0 + tag: v14.1.0-snapshot.25 ## 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-api-adapter/values.yaml b/ml-api-adapter/values.yaml index bdc8f0b83..4b0a583fd 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -14,7 +14,7 @@ ml-api-adapter-service: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0.643-snapshot.0 + tag: v14.1.0-snapshot.25 ## 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 @@ -340,7 +340,7 @@ ml-api-adapter-handler-notification: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0.643-snapshot.0 + tag: v14.1.0-snapshot.25 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/mojaloop-bulk/Chart.yaml b/mojaloop-bulk/Chart.yaml index 64584dd89..02b0bacbe 100644 --- a/mojaloop-bulk/Chart.yaml +++ b/mojaloop-bulk/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Mojaloop Bulk Helm chart for Kubernetes name: mojaloop-bulk version: 16.7.0 -appVersion: "bulk-api-adapter: v17.0.0; central-ledger: v17.8.0-snapshot.33" +appVersion: "bulk-api-adapter: v17.0.0; central-ledger: v17.8.0-snapshot.34" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/mojaloop-bulk/values.yaml b/mojaloop-bulk/values.yaml index 5712c7982..4071cbf18 100644 --- a/mojaloop-bulk/values.yaml +++ b/mojaloop-bulk/values.yaml @@ -710,7 +710,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -915,7 +915,7 @@ bulk-centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1103,7 +1103,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -1296,7 +1296,7 @@ bulk-centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1484,7 +1484,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -1686,7 +1686,7 @@ bulk-centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1874,7 +1874,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -2076,7 +2076,7 @@ bulk-centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/mojaloop-simulator/Chart.yaml b/mojaloop-simulator/Chart.yaml index 7f6a32d59..dc9f7aa63 100644 --- a/mojaloop-simulator/Chart.yaml +++ b/mojaloop-simulator/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: "Helm Chart for the Mojaloop (SDK-based) Simulator" name: mojaloop-simulator version: 15.2.1 -appVersion: "sdk-scheme-adapter: v23.4.0; mojaloop-simulator: v15.0.0; thirdparty-sdk: v15.1.1" +appVersion: "sdk-scheme-adapter: v23.4.0; mojaloop-simulator: v15.1.1; thirdparty-sdk: v15.1.1" dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" diff --git a/mojaloop-simulator/values.yaml b/mojaloop-simulator/values.yaml index 90b2b6cc0..139415edc 100644 --- a/mojaloop-simulator/values.yaml +++ b/mojaloop-simulator/values.yaml @@ -292,7 +292,7 @@ defaults: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -464,7 +464,7 @@ defaults: backend: image: repository: mojaloop/mojaloop-simulator - tag: v15.0.0 + tag: v15.1.1 pullPolicy: IfNotPresent <<: *defaultProbes diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index df843eaf6..e3f56364d 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -325,7 +325,7 @@ account-lookup-service: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -491,7 +491,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.33 + tag: v15.3.4 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -685,7 +685,7 @@ account-lookup-service: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1093,7 +1093,7 @@ account-lookup-service: initContainers: [] # initContainers: | # - name: wait-for-mysql - # image: mysql:5.7 + # image: mysql:9.0.1 # imagePullPolicy: IfNotPresent # command: # - sh @@ -1471,7 +1471,7 @@ account-lookup-service: # initContainers: [] initContainers: | - name: wait-for-mysql-central-ledger - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1535,7 +1535,7 @@ account-lookup-service: - name: SERVICE_NAME value: '{{ include "als-oracle-pathfinder.name" . }}' - name: wait-for-mysql-account-lookup - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -1681,7 +1681,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.42 + tag: v15.8.0-snapshot.43 config: hub_participant: *HUB_PARTICIPANT @@ -1808,7 +1808,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.42 + tag: v15.8.0-snapshot.43 config: hub_participant: *HUB_PARTICIPANT @@ -1973,7 +1973,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0.643-snapshot.0 + tag: v14.1.0-snapshot.25 ## 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 @@ -2259,7 +2259,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0.643-snapshot.0 + tag: v14.1.0-snapshot.25 ## 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 @@ -2612,7 +2612,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -2775,7 +2775,7 @@ centralledger: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -2952,7 +2952,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -3142,7 +3142,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -3297,7 +3297,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -3481,7 +3481,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -3637,7 +3637,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -3827,7 +3827,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -3982,7 +3982,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -4166,7 +4166,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -4321,7 +4321,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -4508,7 +4508,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -4663,7 +4663,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -4855,7 +4855,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -5010,7 +5010,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -5194,7 +5194,7 @@ centralledger: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -5625,7 +5625,7 @@ centralsettlement: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -6055,7 +6055,7 @@ centralsettlement: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -6487,7 +6487,7 @@ centralsettlement: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -7009,7 +7009,7 @@ centralsettlement: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -7161,7 +7161,7 @@ transaction-requests-service: image: registry: docker.io repository: mojaloop/transaction-requests-service - tag: v14.2.0-snapshot.0 + tag: v14.3.1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -7644,7 +7644,7 @@ thirdparty: - name: REDIS_PORT value: {{ .Values.config.redis_port | quote }} - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -9280,7 +9280,7 @@ thirdparty: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -9432,7 +9432,7 @@ thirdparty: backend: image: repository: mojaloop/mojaloop-simulator - tag: v15.0.0 + tag: v15.1.1 pullPolicy: IfNotPresent <<: *defaultProbes @@ -10404,7 +10404,7 @@ mojaloop-simulator: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -10555,7 +10555,7 @@ mojaloop-simulator: backend: image: repository: mojaloop/mojaloop-simulator - tag: v15.0.0 + tag: v15.1.1 pullPolicy: IfNotPresent <<: *defaultProbes @@ -10989,11 +10989,11 @@ mojaloop-ttk-simulators: key: *TTK_MONGO_SECRET_KEY database: *TTK_MONGO_DATABASE config_files: - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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_NAME": *HUB_NAME, "TTKSIM1_FSPID": "ttksim1", "TTKSIM1_MSISDN_1": "16135551212", "TTKSIM1_MSISDN_1_FIRST_NAME": "ReceiverFirst", "TTKSIM1_MSISDN_1_LAST_NAME": "ReceiverLast", "TTKSIM1_CURRENCY": "XTS", "TTKSIM2_FSPID": "ttksim2", "TTKSIM2_MSISDN_1": "4561000001", "TTKSIM2_MSISDN_1_FIRST_NAME": "ReceiverFirst", "TTKSIM2_MSISDN_1_LAST_NAME": "ReceiverLast", "TTKSIM2_MSISDN_2": "4561000002", "TTKSIM2_MSISDN_2_FIRST_NAME": "ReceiverFirst", "TTKSIM2_MSISDN_2_LAST_NAME": "ReceiverLast", "TTKSIM2_PARTY_NOT_FOUND": "partynotfound", "TTKSIM2_PARTY_TIMES_OUT": "partytimesout", "TTKSIM2_CURRENCY": "XTS", "TTKSIM3_FSPID": "ttksim3", "TTKSIM3_MSISDN_1": "5671000001", "TTKSIM3_MSISDN_1_FIRST_NAME": "ReceiverFirst", "TTKSIM3_MSISDN_1_LAST_NAME": "ReceiverLast", "TTKSIM3_MSISDN_2": "5671000002", "TTKSIM3_MSISDN_2_FIRST_NAME": "ReceiverFirst", "TTKSIM3_MSISDN_2_LAST_NAME": "ReceiverLast", "TTKSIM3_CURRENCY": "XTS", "TTKSIM2_MSISDN_PREFIX": "4561", "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: @@ -11166,11 +11166,11 @@ mojaloop-ttk-simulators: host: 'ttksim2.local' config_files: - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/test/func/config/ttk-ttksim2/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ml-testing-toolkit-frontend: ingress: @@ -11343,11 +11343,11 @@ mojaloop-ttk-simulators: host: 'ttksim3.local' config_files: - rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.15/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/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.6.0-snapshot.16/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ml-testing-toolkit-frontend: ingress: @@ -11970,7 +11970,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -12152,7 +12152,7 @@ mojaloop-bulk: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -12339,7 +12339,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -12518,7 +12518,7 @@ mojaloop-bulk: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -12705,7 +12705,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -12884,7 +12884,7 @@ mojaloop-bulk: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -13071,7 +13071,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.33 + tag: v17.8.0-snapshot.34 ## 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 @@ -13250,7 +13250,7 @@ mojaloop-bulk: - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -13522,9 +13522,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/v16.1.0-fx-snapshot.42/rules/hub/rules_callback/default.json" - rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.42/rules/hub/rules_response/default.json" - rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.42/rules/hub/rules_validation/default.json" + rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.45/rules/hub/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.45/rules/hub/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.45/rules/hub/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 @@ -13546,6 +13546,7 @@ ml-testing-toolkit: "generateIDType": "ulid" }, "inputValues": { + "generateID": "ulid", "HUB_NAME": *HUB_NAME, "BASE_CENTRAL_LEDGER_ADMIN": "", "CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-ml-testing-toolkit-backend:4040", @@ -13807,6 +13808,7 @@ ml-testing-toolkit: "FX_SOURCE_AMOUNT": "10", "FX_SOURCE_AMOUNT_ERROR_GENERIC": "13", "FX_TARGET_CURRENCY": "XTS", + "FX_TARGET_AMOUNT": "15", "FX_EXPIRATION": "2024-08-22T12:33:23.819Z", "acceptFxQuotes": "application/vnd.interoperability.fxQuotes+json;version=2.0", "acceptFxTransfers": "application/vnd.interoperability.fxTransfers+json;version=2.0", @@ -13903,8 +13905,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/v16.1.0-fx-snapshot.42.zip - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-16.1.0-fx-snapshot.42/collections/hub/provisioning/for_golden_path + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v16.1.0-fx-snapshot.45.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_golden_path ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13917,7 +13919,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-16.1.0-fx-snapshot.42/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14018,7 +14020,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-16.1.0-fx-snapshot.42/collections/hub/cleanup + testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/cleanup # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14126,7 +14128,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-16.1.0-fx-snapshot.42/collections/hub/other_tests/bulk_transfers + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/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 @@ -14171,7 +14173,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-16.1.0-fx-snapshot.42/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_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 @@ -14216,7 +14218,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-16.1.0-fx-snapshot.42/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -14258,7 +14260,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-16.1.0-fx-snapshot.42/collections/hub/provisioning/for_sdk_bulk + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_sdk_bulk ## 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 @@ -14303,7 +14305,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-16.1.0-fx-snapshot.42/collections/hub/sdk_scheme_adapter/bulk/basic + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/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 @@ -14348,7 +14350,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-16.1.0-fx-snapshot.42/collections/hub/sdk_scheme_adapter/request-to-pay/basic + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/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 @@ -14393,7 +14395,7 @@ ml-ttk-test-setup-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.42/collections/hub/provisioning/for_inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_inter_scheme ## 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 @@ -14418,7 +14420,7 @@ ml-ttk-test-val-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.42/collections/hub/inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/inter_scheme ## 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 diff --git a/quoting-service/chart-handler/templates/deployment.yaml b/quoting-service/chart-handler/templates/deployment.yaml index a1fac0ca7..2b7420f3f 100644 --- a/quoting-service/chart-handler/templates/deployment.yaml +++ b/quoting-service/chart-handler/templates/deployment.yaml @@ -36,6 +36,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} checksum/secret-jws: {{ include (print $.Template.BasePath "/secret-jws.yaml") . | sha256sum }} # Custom Pod annotations diff --git a/quoting-service/chart-handler/values.yaml b/quoting-service/chart-handler/values.yaml index 9516fd13d..03a0377dc 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.8.0-snapshot.40 + tag: v15.8.0-snapshot.43 ## 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 @@ -256,7 +256,7 @@ rules: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/quoting-service/chart-service/templates/deployment.yaml b/quoting-service/chart-service/templates/deployment.yaml index 24a04a81e..57d3fceab 100644 --- a/quoting-service/chart-service/templates/deployment.yaml +++ b/quoting-service/chart-service/templates/deployment.yaml @@ -36,6 +36,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} checksum/secret-jws: {{ include (print $.Template.BasePath "/secret-jws.yaml") . | sha256sum }} # Custom Pod annotations diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index cc5e02dad..569c026f9 100644 --- a/quoting-service/values.yaml +++ b/quoting-service/values.yaml @@ -405,7 +405,7 @@ quoting-service-handler: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.36 + tag: v15.8.0-snapshot.43 ## 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 @@ -666,7 +666,7 @@ quoting-service-handler: value: '{{ .Values.config.kafka_port }}' - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/sdk-scheme-adapter/Chart.yaml b/sdk-scheme-adapter/Chart.yaml index ab4a8a401..67c75a55c 100644 --- a/sdk-scheme-adapter/Chart.yaml +++ b/sdk-scheme-adapter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: sdk-scheme-adapter Helm chart for Kubernetes name: sdk-scheme-adapter version: 1.9.0 -appVersion: v23.6.0-snapshot.15 +appVersion: v23.6.0-snapshot.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/sdk-scheme-adapter/chart-service/values.yaml b/sdk-scheme-adapter/chart-service/values.yaml index 679011e92..296320c73 100644 --- a/sdk-scheme-adapter/chart-service/values.yaml +++ b/sdk-scheme-adapter/chart-service/values.yaml @@ -316,7 +316,7 @@ containerSecurityContext: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 ## 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 661097a8c..105acd718 100644 --- a/sdk-scheme-adapter/values.yaml +++ b/sdk-scheme-adapter/values.yaml @@ -297,7 +297,7 @@ sdk-scheme-adapter-api-svc: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 ## 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 @@ -717,7 +717,7 @@ sdk-scheme-adapter-dom-evt-handler: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 ## 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 @@ -1140,7 +1140,7 @@ sdk-scheme-adapter-cmd-evt-handler: image: registry: docker.io repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 ## 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/thirdparty/chart-auth-svc/example_dependencies.yaml b/thirdparty/chart-auth-svc/example_dependencies.yaml index f6853fa1f..1a0b89681 100644 --- a/thirdparty/chart-auth-svc/example_dependencies.yaml +++ b/thirdparty/chart-auth-svc/example_dependencies.yaml @@ -44,7 +44,7 @@ spec: app: mysql-auth-svc spec: containers: - - image: mysql:5.7 + - image: mysql:9.0.1 name: mysql-auth-svc # command: [ '/bin/sh' ] # args: ['-c', 'tail -f /dev/null'] diff --git a/thirdparty/chart-auth-svc/values.yaml b/thirdparty/chart-auth-svc/values.yaml index 368ac0f8d..45802071d 100644 --- a/thirdparty/chart-auth-svc/values.yaml +++ b/thirdparty/chart-auth-svc/values.yaml @@ -221,7 +221,7 @@ initContainers: | - name: REDIS_PORT value: {{ .Values.config.redis_port | quote }} - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/thirdparty/chart-consent-oracle/example_dependencies.yaml b/thirdparty/chart-consent-oracle/example_dependencies.yaml index 4b787523b..6290ad28c 100644 --- a/thirdparty/chart-consent-oracle/example_dependencies.yaml +++ b/thirdparty/chart-consent-oracle/example_dependencies.yaml @@ -44,7 +44,7 @@ spec: app: mysql-consent-oracle spec: containers: - - image: mysql:5.7 + - image: mysql:9.0.1 name: mysql-consent-oracle # command: [ '/bin/sh' ] # args: ['-c', 'tail -f /dev/null'] diff --git a/thirdparty/chart-consent-oracle/values.yaml b/thirdparty/chart-consent-oracle/values.yaml index 56427b13a..15864468b 100644 --- a/thirdparty/chart-consent-oracle/values.yaml +++ b/thirdparty/chart-consent-oracle/values.yaml @@ -146,7 +146,7 @@ config_files: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh diff --git a/thirdparty/values.yaml b/thirdparty/values.yaml index aef9f188b..2f8bdfa44 100644 --- a/thirdparty/values.yaml +++ b/thirdparty/values.yaml @@ -222,7 +222,7 @@ auth-svc: - name: REDIS_PORT value: {{ .Values.config.redis_port | quote }} - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -563,7 +563,7 @@ consent-oracle: # initContainers: [] initContainers: | - name: wait-for-mysql - image: mysql:5.7 + image: mysql:9.0.1 imagePullPolicy: IfNotPresent command: - sh @@ -2070,7 +2070,7 @@ thirdparty-simulator: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.15 + tag: v23.6.0-snapshot.16 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -2222,7 +2222,7 @@ thirdparty-simulator: backend: image: repository: mojaloop/mojaloop-simulator - tag: v15.0.0 + tag: v15.1.1 pullPolicy: IfNotPresent <<: *defaultProbes diff --git a/transaction-requests-service/templates/deployment.yaml b/transaction-requests-service/templates/deployment.yaml index 91497afb7..16573e005 100644 --- a/transaction-requests-service/templates/deployment.yaml +++ b/transaction-requests-service/templates/deployment.yaml @@ -33,6 +33,9 @@ spec: {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} + {{- if .Values.configOverride }} + checksum/config-override: {{ include (print $.Template.BasePath "/config-override.yaml") . | sha256sum }} + {{- end }} checksum/secret: {{ include (print $.Template.BasePath "/secret.yaml") . | sha256sum }} # Custom Pod annotations {{- if .Values.podAnnotations }} diff --git a/transaction-requests-service/values.yaml b/transaction-requests-service/values.yaml index 2a90cc78f..b93f9c3d2 100644 --- a/transaction-requests-service/values.yaml +++ b/transaction-requests-service/values.yaml @@ -9,7 +9,7 @@ global: {} image: registry: docker.io repository: mojaloop/transaction-requests-service - tag: v14.1.2 + tag: v14.3.1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images From 022321f51da9ce36ee48972cccd981e599296430 Mon Sep 17 00:00:00 2001 From: Vijay Date: Thu, 17 Oct 2024 22:37:28 +0530 Subject: [PATCH 06/21] chore: cleanup --- mojaloop/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index e3f56364d..806d9a9a8 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -13546,7 +13546,6 @@ ml-testing-toolkit: "generateIDType": "ulid" }, "inputValues": { - "generateID": "ulid", "HUB_NAME": *HUB_NAME, "BASE_CENTRAL_LEDGER_ADMIN": "", "CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-ml-testing-toolkit-backend:4040", From a088e36ac27412f0e93d9ef0eecb2ddef62b3045 Mon Sep 17 00:00:00 2001 From: Vijay Date: Thu, 17 Oct 2024 22:53:57 +0530 Subject: [PATCH 07/21] fix: json --- .../chart-handler-timeout/configs/default.json | 1 + .../chart-handler-timeout/templates/deployment.yaml | 2 -- account-lookup-service/chart-service/configs/default.json | 2 +- local-deployment-methods/helmfile/helmfile.yaml | 6 +++--- quoting-service/chart-service/configs/default.json | 2 +- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/account-lookup-service/chart-handler-timeout/configs/default.json b/account-lookup-service/chart-handler-timeout/configs/default.json index e132a42b2..593e011d9 100644 --- a/account-lookup-service/chart-handler-timeout/configs/default.json +++ b/account-lookup-service/chart-handler-timeout/configs/default.json @@ -6,6 +6,7 @@ }, "ADMIN_PORT": 4001, "API_PORT": {{ .Values.service.internalPort }}, + "API_TYPE": {{ .Values.config.api_type | quote }}, "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }}, "DATABASE": { "DIALECT": "{{ .Values.config.db_driver }}", diff --git a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml index b83b1b1ef..6668045fe 100644 --- a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml +++ b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml @@ -77,8 +77,6 @@ spec: value: {{ $val | quote }} {{- end }} {{- end }} - - name: API_TYPE - value: {{ .Values.config.api_type }} - name: ALS_DATABASE__PASSWORD {{- if .Values.config.db_secret }} valueFrom: diff --git a/account-lookup-service/chart-service/configs/default.json b/account-lookup-service/chart-service/configs/default.json index e6a31d489..593e011d9 100644 --- a/account-lookup-service/chart-service/configs/default.json +++ b/account-lookup-service/chart-service/configs/default.json @@ -6,7 +6,7 @@ }, "ADMIN_PORT": 4001, "API_PORT": {{ .Values.service.internalPort }}, - "API_TYPE": {{ .Values.config.api_type }}, + "API_TYPE": {{ .Values.config.api_type | quote }}, "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }}, "DATABASE": { "DIALECT": "{{ .Values.config.db_driver }}", diff --git a/local-deployment-methods/helmfile/helmfile.yaml b/local-deployment-methods/helmfile/helmfile.yaml index 7529eb479..f7aa78ad7 100644 --- a/local-deployment-methods/helmfile/helmfile.yaml +++ b/local-deployment-methods/helmfile/helmfile.yaml @@ -24,7 +24,7 @@ repositories: releases: - name: backend - namespace: demo + namespace: moja4 chart: ../../example-mojaloop-backend # chart: mojaloop/example-mojaloop-backend # version: 15.7.0 @@ -35,7 +35,7 @@ releases: - name: 'kafka.kraft.clusterId' value: 'w1pu1g7pjnZDr0i4Fo66PD' - name: moja - namespace: demo + namespace: moja4 chart: ../../mojaloop # chart: mojaloop/mojaloop # version: 16.2.1 @@ -43,7 +43,7 @@ releases: - values-mojaloop.yaml # - values-mojaloop-min.yaml - name: kafka-console - namespace: demo + namespace: moja4 chart: redpanda/console version: 0.7.29 values: diff --git a/quoting-service/chart-service/configs/default.json b/quoting-service/chart-service/configs/default.json index 6d54a98a7..468b785bd 100644 --- a/quoting-service/chart-service/configs/default.json +++ b/quoting-service/chart-service/configs/default.json @@ -1,6 +1,6 @@ {{- $dbDeployHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }} { - "API_TYPE": {{ .Values.config.api_type }}, + "API_TYPE": {{ .Values.config.api_type | quote }}, "ORIGINAL_PAYLOAD_STORAGE": {{ .Values.config.original_payload_storage | quote }}, "PAYLOAD_CACHE": {{ .Values.config.payload_cache | toPrettyJson | nindent 2}}, "HUB_PARTICIPANT": { From d0fbe98cb5bfe0fb521b02c6a30cf5bcfce13b52 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 18 Oct 2024 13:16:37 +0530 Subject: [PATCH 08/21] fix: ttk testcase --- mojaloop/values.yaml | 67 +++++++++++++------ .../chart-handler/configs/default.json | 3 + quoting-service/chart-handler/values.yaml | 13 +++- quoting-service/values.yaml | 13 +++- 4 files changed, 74 insertions(+), 22 deletions(-) diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 806d9a9a8..7815c4873 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -94,6 +94,20 @@ CONFIG: - host: proxy-cache-redis port: 6379 + ## ISO20022 + api_type: &API_TYPE "fspiop" + ttk_transformer_name: &TTK_TRANSFORMER_NAME "none" + # api_type: &API_TYPE "iso20022" + # ttk_transformer_name: &TTK_TRANSFORMER_NAME "fspiopToISO20022" + ## kafka | redis + original_payload_storage: &ORIGINAL_PAYLOAD_STORAGE "kafka" + payload_cache: &PAYLOAD_CACHE + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 # Default values for central. # This is a YAML-formatted file. # Declare global configurations @@ -113,7 +127,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.33 + tag: v15.6.0-iso.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 @@ -313,6 +327,9 @@ account-lookup-service: ## Proxy cache configuration proxy_cache: *PROXY_CACHE + ## ISO20022 configuration + api_type: *API_TYPE + # @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: @@ -491,7 +508,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.3.4 + tag: v15.6.0-iso.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 @@ -1681,7 +1698,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.43 + tag: v15.9.0-iso.2 config: hub_participant: *HUB_PARTICIPANT @@ -1754,6 +1771,11 @@ quoting-service: ## Proxy cache configuration proxy_cache: *PROXY_CACHE + ## ISO20022 configuration + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + error_handling: include_cause_extension: false truncate_extensions: true @@ -1808,7 +1830,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.43 + tag: v15.9.0-iso.2 config: hub_participant: *HUB_PARTICIPANT @@ -1879,6 +1901,11 @@ quoting-service: ## Proxy cache configuration proxy_cache: *PROXY_CACHE + ## ISO20022 configuration + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + error_handling: include_cause_extension: false truncate_extensions: true @@ -13522,9 +13549,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/v16.1.0-fx-snapshot.45/rules/hub/rules_callback/default.json" - rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.45/rules/hub/rules_response/default.json" - rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v16.1.0-fx-snapshot.45/rules/hub/rules_validation/default.json" + rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.1/rules/hub/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.1/rules/hub/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.1/rules/hub/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 @@ -13542,7 +13569,7 @@ ml-testing-toolkit: hub-k8s-default-environment.json: &ttkInputValues { "options": { "breakOnError": false, - "transformerName": "none", + "transformerName": *TTK_TRANSFORMER_NAME, "generateIDType": "ulid" }, "inputValues": { @@ -13904,8 +13931,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/v16.1.0-fx-snapshot.45.zip - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_golden_path + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v17.0.0-iso.1.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_golden_path ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13918,7 +13945,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-16.1.0-fx-snapshot.45/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14019,7 +14046,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-16.1.0-fx-snapshot.45/collections/hub/cleanup + testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/cleanup # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14127,7 +14154,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-16.1.0-fx-snapshot.45/collections/hub/other_tests/bulk_transfers + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/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 @@ -14172,7 +14199,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-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_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 @@ -14217,7 +14244,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-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -14259,7 +14286,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-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_sdk_bulk + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_sdk_bulk ## 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 @@ -14304,7 +14331,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-16.1.0-fx-snapshot.45/collections/hub/sdk_scheme_adapter/bulk/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/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 @@ -14349,7 +14376,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-16.1.0-fx-snapshot.45/collections/hub/sdk_scheme_adapter/request-to-pay/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/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 @@ -14394,7 +14421,7 @@ ml-ttk-test-setup-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/provisioning/for_inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_inter_scheme ## 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 @@ -14419,7 +14446,7 @@ ml-ttk-test-val-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-16.1.0-fx-snapshot.45/collections/hub/inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/inter_scheme ## 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 diff --git a/quoting-service/chart-handler/configs/default.json b/quoting-service/chart-handler/configs/default.json index 9f10d9d99..d7e716433 100644 --- a/quoting-service/chart-handler/configs/default.json +++ b/quoting-service/chart-handler/configs/default.json @@ -1,5 +1,8 @@ {{- $dbDeployHost := (.Values.config.db_host | replace "$release_name" .Release.Name) }} { + "API_TYPE": {{ .Values.config.api_type | quote }}, + "ORIGINAL_PAYLOAD_STORAGE": {{ .Values.config.original_payload_storage | quote }}, + "PAYLOAD_CACHE": {{ .Values.config.payload_cache | toPrettyJson | nindent 2}}, "HUB_PARTICIPANT": { "ID": {{ .Values.config.hub_participant.id }}, "NAME": {{ .Values.config.hub_participant.name | quote }} diff --git a/quoting-service/chart-handler/values.yaml b/quoting-service/chart-handler/values.yaml index 03a0377dc..ded81b3b2 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.8.0-snapshot.43 + tag: v15.9.0-iso.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 @@ -123,6 +123,17 @@ metrics: serviceName: quoting-service-handler config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index 569c026f9..e3f145b49 100644 --- a/quoting-service/values.yaml +++ b/quoting-service/values.yaml @@ -405,7 +405,7 @@ quoting-service-handler: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.43 + tag: v15.9.0-iso.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 @@ -530,6 +530,17 @@ quoting-service-handler: serviceName: quoting-service-handler config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub From 47a3e850912644095a849c99d33222a09627ec3d Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 18 Oct 2024 13:28:12 +0530 Subject: [PATCH 09/21] feat: enabled iso config for ml-api-adapter --- .../configs/default.json | 3 +++ .../chart-handler-notification/values.yaml | 11 ++++++++++ .../chart-service/configs/default.json | 3 +++ ml-api-adapter/chart-service/values.yaml | 11 ++++++++++ ml-api-adapter/values.yaml | 22 +++++++++++++++++++ mojaloop/values.yaml | 10 +++++++++ 6 files changed, 60 insertions(+) diff --git a/ml-api-adapter/chart-handler-notification/configs/default.json b/ml-api-adapter/chart-handler-notification/configs/default.json index efb30ab4e..b7c90b2f3 100644 --- a/ml-api-adapter/chart-handler-notification/configs/default.json +++ b/ml-api-adapter/chart-handler-notification/configs/default.json @@ -1,6 +1,9 @@ {{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}} {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}} { + "API_TYPE": {{ .Values.config.api_type | quote }}, + "ORIGINAL_PAYLOAD_STORAGE": {{ .Values.config.original_payload_storage | quote }}, + "PAYLOAD_CACHE": {{ .Values.config.payload_cache | toPrettyJson | nindent 2}}, "HUB_PARTICIPANT": { "ID": {{ .Values.config.hub_participant.id }}, "NAME": {{ .Values.config.hub_participant.name | quote }} diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 91667a5b8..52d032a57 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -145,6 +145,17 @@ metrics: serviceName: ml-handler-notification config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub diff --git a/ml-api-adapter/chart-service/configs/default.json b/ml-api-adapter/chart-service/configs/default.json index 568d9abdb..c09163261 100644 --- a/ml-api-adapter/chart-service/configs/default.json +++ b/ml-api-adapter/chart-service/configs/default.json @@ -1,6 +1,9 @@ {{- $kafkaHost := ( .Values.config.kafka_host | replace "$release_name" .Release.Name ) -}} {{- $centralServicesHost := ( .Values.config.central_services_host | replace "$release_name" .Release.Name ) -}} { + "API_TYPE": {{ .Values.config.api_type | quote }}, + "ORIGINAL_PAYLOAD_STORAGE": {{ .Values.config.original_payload_storage | quote }}, + "PAYLOAD_CACHE": {{ .Values.config.payload_cache | toPrettyJson | nindent 2}}, "HUB_PARTICIPANT": { "ID": {{ .Values.config.hub_participant.id }}, "NAME": {{ .Values.config.hub_participant.name | quote }} diff --git a/ml-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index 0542daa74..e29a95c54 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -151,6 +151,17 @@ metrics: serviceName: ml-service config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub diff --git a/ml-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 4b0a583fd..35887da9a 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -145,6 +145,17 @@ ml-api-adapter-service: enabled: true config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub @@ -475,6 +486,17 @@ ml-api-adapter-handler-notification: enabled: true config: + ## fspiop | iso20022 + api_type: fspiop + ## kafka | redis | "" + original_payload_storage: "" + payload_cache: + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 hub_participant: id: 1 name: Hub diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 7815c4873..57990d18a 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -2160,6 +2160,11 @@ ml-api-adapter: ## Proxy cache configuration proxy_cache: *PROXY_CACHE + ## ISO20022 configuration + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + ## Error handling Configuration error_handling: include_cause_extension: false @@ -2506,6 +2511,11 @@ ml-api-adapter: ## Proxy cache configuration proxy_cache: *PROXY_CACHE + ## ISO20022 configuration + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + ## Error handling Configuration error_handling: include_cause_extension: false From 51cf839bf23cef57cf60ec2e286bfb53e1b63cb9 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 18 Oct 2024 13:28:25 +0530 Subject: [PATCH 10/21] fix: ns --- local-deployment-methods/helmfile/helmfile.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/local-deployment-methods/helmfile/helmfile.yaml b/local-deployment-methods/helmfile/helmfile.yaml index f7aa78ad7..7529eb479 100644 --- a/local-deployment-methods/helmfile/helmfile.yaml +++ b/local-deployment-methods/helmfile/helmfile.yaml @@ -24,7 +24,7 @@ repositories: releases: - name: backend - namespace: moja4 + namespace: demo chart: ../../example-mojaloop-backend # chart: mojaloop/example-mojaloop-backend # version: 15.7.0 @@ -35,7 +35,7 @@ releases: - name: 'kafka.kraft.clusterId' value: 'w1pu1g7pjnZDr0i4Fo66PD' - name: moja - namespace: moja4 + namespace: demo chart: ../../mojaloop # chart: mojaloop/mojaloop # version: 16.2.1 @@ -43,7 +43,7 @@ releases: - values-mojaloop.yaml # - values-mojaloop-min.yaml - name: kafka-console - namespace: moja4 + namespace: demo chart: redpanda/console version: 0.7.29 values: From bc8595b761f0015f8430637bcaa35ee022d32c86 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 18 Oct 2024 13:55:43 +0530 Subject: [PATCH 11/21] feat: added helmfile for iso --- .../helmfile/values-mojaloop-iso20022.yaml | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml diff --git a/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml new file mode 100644 index 000000000..1f2f970e5 --- /dev/null +++ b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml @@ -0,0 +1,49 @@ +CONFIG: + ## ISO20022 + api_type: &API_TYPE "iso20022" + ttk_transformer_name: &TTK_TRANSFORMER_NAME "fspiopToISO20022" + original_payload_storage: &ORIGINAL_PAYLOAD_STORAGE "kafka" + payload_cache: &PAYLOAD_CACHE + enabled: false + type: redis-cluster + connectionConfig: + cluster: + - host: proxy-cache-redis + port: 6379 + +account-lookup-service: + account-lookup-service: + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE +quoting-service: + quoting-service: + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + quoting-handler: + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + +ml-api-adapter: + ml-api-adapter-service: + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + ml-api-adapter-handler-notification: + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + +ml-testing-toolkit: + ml-testing-toolkit-backend: + extraEnvironments: + hub-k8s-default-environment.json: + options: + transformerName: *TTK_TRANSFORMER_NAME From 1f00753bde7714bc6e9b0c28b8709b3be7158187 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 18 Oct 2024 16:49:16 +0530 Subject: [PATCH 12/21] fix: header issues --- .../helmfile/values-mojaloop-iso20022.yaml | 2 +- .../chart-handler-notification/values.yaml | 2 +- ml-api-adapter/chart-service/values.yaml | 2 +- ml-api-adapter/values.yaml | 4 +-- ml-testing-toolkit/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/values.yaml | 2 +- mojaloop/values.yaml | 34 +++++++++---------- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml index 1f2f970e5..e73253c97 100644 --- a/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml +++ b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml @@ -23,7 +23,7 @@ quoting-service: api_type: *API_TYPE original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE payload_cache: *PAYLOAD_CACHE - quoting-handler: + quoting-service-handler: config: api_type: *API_TYPE original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 52d032a57..1fa7cebb0 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v14.1.0-snapshot.27 ## 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-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index e29a95c54..a4c6c0e58 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v14.1.0-snapshot.27 ## 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-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 35887da9a..6a56babda 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -14,7 +14,7 @@ ml-api-adapter-service: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v14.1.0-snapshot.27 ## 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 @@ -351,7 +351,7 @@ ml-api-adapter-handler-notification: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v14.1.0-snapshot.27 ## 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.yaml b/ml-testing-toolkit/Chart.yaml index e2d7c517f..743df262a 100644 --- a/ml-testing-toolkit/Chart.yaml +++ b/ml-testing-toolkit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit Helm chart for Kubernetes name: ml-testing-toolkit version: 18.0.0 -appVersion: "ml-testing-toolkit: v18.0.0; ml-testing-toolkit-ui: v16.0.0" +appVersion: "ml-testing-toolkit: v18.0.1-snapshot.0; ml-testing-toolkit-ui: v16.0.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index f98f2a98d..ed4bdf3a9 100644 --- a/ml-testing-toolkit/chart-backend/Chart.yaml +++ b/ml-testing-toolkit/chart-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit-backend Helm chart for Kubernetes name: ml-testing-toolkit-backend version: 17.0.0 -appVersion: v18.0.0 +appVersion: v18.0.1-snapshot.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index c8e596308..6dcf27e19 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: v18.0.0 + tag: v18.0.1-snapshot.0 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 57990d18a..a6c78b7a8 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -2000,7 +2000,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v14.1.0-snapshot.27 ## 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 @@ -2291,7 +2291,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v14.1.0-snapshot.27 ## 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 @@ -13559,9 +13559,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/v17.0.0-iso.1/rules/hub/rules_callback/default.json" - rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.1/rules/hub/rules_response/default.json" - rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.1/rules/hub/rules_validation/default.json" + rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.2/rules/hub/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.2/rules/hub/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.2/rules/hub/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 @@ -13941,8 +13941,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/v17.0.0-iso.1.zip - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_golden_path + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v17.0.0-iso.2.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_golden_path ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13955,7 +13955,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-17.0.0-iso.1/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14056,7 +14056,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-17.0.0-iso.1/collections/hub/cleanup + testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/cleanup # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14164,7 +14164,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-17.0.0-iso.1/collections/hub/other_tests/bulk_transfers + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/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 @@ -14209,7 +14209,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-17.0.0-iso.1/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_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 @@ -14254,7 +14254,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-17.0.0-iso.1/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -14296,7 +14296,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-17.0.0-iso.1/collections/hub/provisioning/for_sdk_bulk + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_sdk_bulk ## 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 @@ -14341,7 +14341,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-17.0.0-iso.1/collections/hub/sdk_scheme_adapter/bulk/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/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 @@ -14386,7 +14386,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-17.0.0-iso.1/collections/hub/sdk_scheme_adapter/request-to-pay/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/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 @@ -14431,7 +14431,7 @@ ml-ttk-test-setup-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/provisioning/for_inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_inter_scheme ## 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 @@ -14456,7 +14456,7 @@ ml-ttk-test-val-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.1/collections/hub/inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/inter_scheme ## 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 From 817c03fc835ecd263dd7f3910bc4ed9921c39af4 Mon Sep 17 00:00:00 2001 From: Vijay Date: Fri, 18 Oct 2024 18:18:04 +0530 Subject: [PATCH 13/21] chore: bump --- ml-testing-toolkit/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/values.yaml | 2 +- mojaloop/values.yaml | 4 ++-- quoting-service/Chart.yaml | 2 +- quoting-service/chart-handler/values.yaml | 2 +- quoting-service/chart-service/Chart.yaml | 2 +- quoting-service/chart-service/values.yaml | 2 +- quoting-service/values.yaml | 4 ++-- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index 743df262a..0a4b19db8 100644 --- a/ml-testing-toolkit/Chart.yaml +++ b/ml-testing-toolkit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit Helm chart for Kubernetes name: ml-testing-toolkit version: 18.0.0 -appVersion: "ml-testing-toolkit: v18.0.1-snapshot.0; ml-testing-toolkit-ui: v16.0.0" +appVersion: "ml-testing-toolkit: v18.0.1-snapshot.1; ml-testing-toolkit-ui: v16.0.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index ed4bdf3a9..bdb1fe8a6 100644 --- a/ml-testing-toolkit/chart-backend/Chart.yaml +++ b/ml-testing-toolkit/chart-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit-backend Helm chart for Kubernetes name: ml-testing-toolkit-backend version: 17.0.0 -appVersion: v18.0.1-snapshot.0 +appVersion: v18.0.1-snapshot.1 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index 6dcf27e19..0814bd361 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: v18.0.1-snapshot.0 + tag: v18.0.1-snapshot.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/mojaloop/values.yaml b/mojaloop/values.yaml index a6c78b7a8..1c65775e9 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -1698,7 +1698,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.9.0-iso.2 + tag: v15.9.0-iso.3 config: hub_participant: *HUB_PARTICIPANT @@ -1830,7 +1830,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.9.0-iso.2 + tag: v15.9.0-iso.3 config: hub_participant: *HUB_PARTICIPANT diff --git a/quoting-service/Chart.yaml b/quoting-service/Chart.yaml index 1b35048cf..ec7f721f8 100644 --- a/quoting-service/Chart.yaml +++ b/quoting-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Quoting-Service Helm chart for Kubernetes name: quoting-service version: 15.9.0 -appVersion: v15.9.0-iso.2 +appVersion: v15.9.0-iso.3 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-handler/values.yaml b/quoting-service/chart-handler/values.yaml index ded81b3b2..41946817e 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.9.0-iso.2 + tag: v15.9.0-iso.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/quoting-service/chart-service/Chart.yaml b/quoting-service/chart-service/Chart.yaml index 73b8f5582..17c7b6458 100644 --- a/quoting-service/chart-service/Chart.yaml +++ b/quoting-service/chart-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: Quoting-Service API Helm chart for Kubernetes name: quoting-service version: 15.9.0 -appVersion: v15.9.0-iso.2 +appVersion: v15.9.0-iso.3 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/quoting-service/chart-service/values.yaml b/quoting-service/chart-service/values.yaml index 8913b03ef..feb1f6d6c 100644 --- a/quoting-service/chart-service/values.yaml +++ b/quoting-service/chart-service/values.yaml @@ -8,7 +8,7 @@ global: {} image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.9.0-iso.2 + tag: v15.9.0-iso.3 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index e3f145b49..b6b19f5d9 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.9.0-iso.2 + tag: v15.9.0-iso.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 @@ -405,7 +405,7 @@ quoting-service-handler: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.9.0-iso.2 + tag: v15.9.0-iso.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 From f327c04fdeeedf0d4131b7e9905cba147269fc14 Mon Sep 17 00:00:00 2001 From: Vijay Date: Mon, 21 Oct 2024 19:32:50 +0530 Subject: [PATCH 14/21] chore: ttk bump --- ml-testing-toolkit/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index 0a4b19db8..98da98403 100644 --- a/ml-testing-toolkit/Chart.yaml +++ b/ml-testing-toolkit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit Helm chart for Kubernetes name: ml-testing-toolkit version: 18.0.0 -appVersion: "ml-testing-toolkit: v18.0.1-snapshot.1; ml-testing-toolkit-ui: v16.0.0" +appVersion: "ml-testing-toolkit: v18.0.1-snapshot.2; ml-testing-toolkit-ui: v16.0.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index bdb1fe8a6..5a578790a 100644 --- a/ml-testing-toolkit/chart-backend/Chart.yaml +++ b/ml-testing-toolkit/chart-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit-backend Helm chart for Kubernetes name: ml-testing-toolkit-backend version: 17.0.0 -appVersion: v18.0.1-snapshot.1 +appVersion: v18.0.1-snapshot.2 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index 0814bd361..92538c3dd 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: v18.0.1-snapshot.1 + tag: v18.0.1-snapshot.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 From bec2a65ffcf184932d90cbc6ca8fc6743f7a1ce3 Mon Sep 17 00:00:00 2001 From: Vijay Date: Mon, 21 Oct 2024 19:39:27 +0530 Subject: [PATCH 15/21] chore: testcases tag --- mojaloop/values.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 1c65775e9..2c80a068f 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -13559,9 +13559,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/v17.0.0-iso.2/rules/hub/rules_callback/default.json" - rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.2/rules/hub/rules_response/default.json" - rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.2/rules/hub/rules_validation/default.json" + rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.3/rules/hub/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.3/rules/hub/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.3/rules/hub/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 @@ -13941,8 +13941,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/v17.0.0-iso.2.zip - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_golden_path + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v17.0.0-iso.3.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/provisioning/for_golden_path ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13955,7 +13955,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-17.0.0-iso.2/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14056,7 +14056,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-17.0.0-iso.2/collections/hub/cleanup + testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/cleanup # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14164,7 +14164,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-17.0.0-iso.2/collections/hub/other_tests/bulk_transfers + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/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 @@ -14209,7 +14209,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-17.0.0-iso.2/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/provisioning/for_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 @@ -14254,7 +14254,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-17.0.0-iso.2/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/provisioning/for_thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -14296,7 +14296,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-17.0.0-iso.2/collections/hub/provisioning/for_sdk_bulk + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/provisioning/for_sdk_bulk ## 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 @@ -14341,7 +14341,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-17.0.0-iso.2/collections/hub/sdk_scheme_adapter/bulk/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/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 @@ -14386,7 +14386,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-17.0.0-iso.2/collections/hub/sdk_scheme_adapter/request-to-pay/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/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 @@ -14431,7 +14431,7 @@ ml-ttk-test-setup-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/provisioning/for_inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/provisioning/for_inter_scheme ## 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 @@ -14456,7 +14456,7 @@ ml-ttk-test-val-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.2/collections/hub/inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.3/collections/hub/inter_scheme ## 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 From a555e715f13d3f9f1da47306c7a3dbbf3551051a Mon Sep 17 00:00:00 2001 From: Vijay Date: Tue, 22 Oct 2024 15:06:03 +0530 Subject: [PATCH 16/21] chore: ml-api bump --- ml-api-adapter/chart-handler-notification/values.yaml | 2 +- ml-api-adapter/chart-service/values.yaml | 2 +- ml-api-adapter/values.yaml | 4 ++-- mojaloop/values.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 1fa7cebb0..682af442c 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.27 + tag: v14.1.0-snapshot.28 ## 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-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index a4c6c0e58..b1b7ab494 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.27 + tag: v14.1.0-snapshot.28 ## 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-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 6a56babda..6bae6df7f 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -14,7 +14,7 @@ ml-api-adapter-service: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.27 + tag: v14.1.0-snapshot.28 ## 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 @@ -351,7 +351,7 @@ ml-api-adapter-handler-notification: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.27 + tag: v14.1.0-snapshot.28 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 2c80a068f..e26462ecd 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -2000,7 +2000,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.27 + tag: v14.1.0-snapshot.28 ## 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 @@ -2291,7 +2291,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.27 + tag: v14.1.0-snapshot.28 ## 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 From c3403ed12885b2a00e80bfe1b22f4999f836f604 Mon Sep 17 00:00:00 2001 From: "geka.evk" Date: Tue, 22 Oct 2024 11:26:41 +0100 Subject: [PATCH 17/21] fix(csi-809): updated ALS version --- account-lookup-service/chart-admin/values.yaml | 2 +- .../chart-handler-timeout/values.yaml | 2 +- account-lookup-service/chart-service/values.yaml | 2 +- account-lookup-service/values.yaml | 6 +++--- example-mojaloop-backend/Chart.yaml | 2 +- local-deployment-methods/helmfile/README.md | 1 + .../helmfile/values-mojaloop-iso20022.yaml | 14 ++++++++++++++ ml-testing-toolkit/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/Chart.yaml | 2 +- ml-testing-toolkit/chart-backend/values.yaml | 2 +- mojaloop/values.yaml | 6 +++--- 11 files changed, 28 insertions(+), 13 deletions(-) diff --git a/account-lookup-service/chart-admin/values.yaml b/account-lookup-service/chart-admin/values.yaml index abbf2f6f4..c946f01dc 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.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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/account-lookup-service/chart-handler-timeout/values.yaml b/account-lookup-service/chart-handler-timeout/values.yaml index b4939f1ff..f0fe6ae75 100644 --- a/account-lookup-service/chart-handler-timeout/values.yaml +++ b/account-lookup-service/chart-handler-timeout/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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/account-lookup-service/chart-service/values.yaml b/account-lookup-service/chart-service/values.yaml index eb33729d1..b20c2f347 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.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index a25f9b687..2834d28ee 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.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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 @@ -344,7 +344,7 @@ account-lookup-service-admin: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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 @@ -704,7 +704,7 @@ account-lookup-service-handler-timeout: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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/example-mojaloop-backend/Chart.yaml b/example-mojaloop-backend/Chart.yaml index 5325fbe32..9a58e6bb2 100644 --- a/example-mojaloop-backend/Chart.yaml +++ b/example-mojaloop-backend/Chart.yaml @@ -25,7 +25,7 @@ dependencies: - dependency - backend - kafka - version: 29.3.9 + version: 29.3.14 ## mysql database - name: mysql alias: mysql diff --git a/local-deployment-methods/helmfile/README.md b/local-deployment-methods/helmfile/README.md index 6a9e660cb..c04fc4635 100644 --- a/local-deployment-methods/helmfile/README.md +++ b/local-deployment-methods/helmfile/README.md @@ -12,6 +12,7 @@ This guide covers the steps to install and manage Mojaloop using **Helmfile**. H - **kubectl**: [Install kubectl](https://kubernetes.io/docs/tasks/tools/) - **Docker**: Required for building and managing images - **Helmfile**: Installation instructions below +- **helm-diff** plugin: [Install helm-diff](https://github.com/databus23/helm-diff?tab=readme-ov-file#using-helm-plugin-manager--23x) ## Mojaloop Deployment with Helmfile diff --git a/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml index e73253c97..98a0487da 100644 --- a/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml +++ b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml @@ -11,23 +11,37 @@ CONFIG: - host: proxy-cache-redis port: 6379 +x-disable-probes: &DISABLE_PROBES + metrics: + enabled: false + readinessProbe: + enabled: false + livenessProbe: + enabled: false + account-lookup-service: account-lookup-service: + <<: *DISABLE_PROBES config: api_type: *API_TYPE original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE payload_cache: *PAYLOAD_CACHE + log_level: debug quoting-service: quoting-service: + <<: *DISABLE_PROBES config: api_type: *API_TYPE original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE payload_cache: *PAYLOAD_CACHE + log_level: debug quoting-service-handler: + <<: *DISABLE_PROBES config: api_type: *API_TYPE original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE payload_cache: *PAYLOAD_CACHE + log_level: debug ml-api-adapter: ml-api-adapter-service: diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index 743df262a..98da98403 100644 --- a/ml-testing-toolkit/Chart.yaml +++ b/ml-testing-toolkit/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit Helm chart for Kubernetes name: ml-testing-toolkit version: 18.0.0 -appVersion: "ml-testing-toolkit: v18.0.1-snapshot.0; ml-testing-toolkit-ui: v16.0.0" +appVersion: "ml-testing-toolkit: v18.0.1-snapshot.2; ml-testing-toolkit-ui: v16.0.0" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/Chart.yaml b/ml-testing-toolkit/chart-backend/Chart.yaml index ed4bdf3a9..5a578790a 100644 --- a/ml-testing-toolkit/chart-backend/Chart.yaml +++ b/ml-testing-toolkit/chart-backend/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-testing-toolkit-backend Helm chart for Kubernetes name: ml-testing-toolkit-backend version: 17.0.0 -appVersion: v18.0.1-snapshot.0 +appVersion: v18.0.1-snapshot.2 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index 6dcf27e19..92538c3dd 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: v18.0.1-snapshot.0 + tag: v18.0.1-snapshot.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 diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index a6c78b7a8..e11fec92b 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -83,7 +83,7 @@ CONFIG: batch_processing_enabled: &CL_BATCH_PROCESSING_ENABLED true ## INTERSCHEME: To enable interscheme components and tests set following to true - interscheme_enabled: &INTERSCHEME_ENABLED true + interscheme_enabled: &INTERSCHEME_ENABLED true ## PROXY CACHE proxy_cache: &PROXY_CACHE @@ -127,7 +127,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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 @@ -508,7 +508,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.6.0-iso.1 + tag: v15.6.0-iso.5 ## 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 From 71ff72ce0cd9f50140622742b9185d8100b0984a Mon Sep 17 00:00:00 2001 From: Vijay Date: Tue, 22 Oct 2024 18:19:13 +0530 Subject: [PATCH 18/21] chore: ml api bump --- ml-api-adapter/chart-handler-notification/values.yaml | 2 +- ml-api-adapter/chart-service/values.yaml | 2 +- ml-api-adapter/values.yaml | 4 ++-- mojaloop/values.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 682af442c..8d9bdac53 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.28 + tag: v14.1.0-snapshot.31 ## 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-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index b1b7ab494..9155f607e 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.28 + tag: v14.1.0-snapshot.31 ## 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-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 6bae6df7f..732667187 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -14,7 +14,7 @@ ml-api-adapter-service: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.28 + tag: v14.1.0-snapshot.31 ## 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 @@ -351,7 +351,7 @@ ml-api-adapter-handler-notification: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.28 + tag: v14.1.0-snapshot.31 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index e26462ecd..f22a76797 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -2000,7 +2000,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.28 + tag: v14.1.0-snapshot.31 ## 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 @@ -2291,7 +2291,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.28 + tag: v14.1.0-snapshot.31 ## 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 From 0e3f6eca2e9d1078a14553db789d4b8560119efd Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Wed, 23 Oct 2024 20:09:33 +0100 Subject: [PATCH 19/21] feat: bump ml-api-adapter --- local-deployment-methods/helmfile/README.md | 2 +- ml-api-adapter/chart-handler-notification/values.yaml | 2 +- ml-api-adapter/chart-service/values.yaml | 2 +- ml-api-adapter/values.yaml | 4 ++-- mojaloop/values.yaml | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/local-deployment-methods/helmfile/README.md b/local-deployment-methods/helmfile/README.md index c04fc4635..4dc634416 100644 --- a/local-deployment-methods/helmfile/README.md +++ b/local-deployment-methods/helmfile/README.md @@ -11,7 +11,7 @@ This guide covers the steps to install and manage Mojaloop using **Helmfile**. H - **Helm** (v3+): [Install Helm](https://helm.sh/docs/intro/install/) - **kubectl**: [Install kubectl](https://kubernetes.io/docs/tasks/tools/) - **Docker**: Required for building and managing images -- **Helmfile**: Installation instructions below +- **Helmfile**: [Install Helmfile](https://github.com/helmfile/helmfile?tab=readme-ov-file#installation) - **helm-diff** plugin: [Install helm-diff](https://github.com/databus23/helm-diff?tab=readme-ov-file#using-helm-plugin-manager--23x) diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 8d9bdac53..77e86b3e1 100644 --- a/ml-api-adapter/chart-handler-notification/values.yaml +++ b/ml-api-adapter/chart-handler-notification/values.yaml @@ -5,7 +5,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.31 + tag: v14.2.0-snapshot.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 diff --git a/ml-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index 9155f607e..3ec11d216 100644 --- a/ml-api-adapter/chart-service/values.yaml +++ b/ml-api-adapter/chart-service/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.31 + tag: v14.2.0-snapshot.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 diff --git a/ml-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 732667187..5623a0956 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -14,7 +14,7 @@ ml-api-adapter-service: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.31 + tag: v14.2.0-snapshot.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 @@ -351,7 +351,7 @@ ml-api-adapter-handler-notification: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.31 + tag: v14.2.0-snapshot.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 diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index ce15d7a17..a5a6ff4fb 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -2000,7 +2000,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.31 + tag: v14.2.0-snapshot.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 @@ -2291,7 +2291,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.31 + tag: v14.2.0-snapshot.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 From b40ff2ebd3d9ea33dc28c0fdef50e086a8440b0f Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Tue, 29 Oct 2024 13:00:18 +0100 Subject: [PATCH 20/21] chore: bump ml --- mojaloop/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 891c6c6ed..b00789bdd 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -2000,7 +2000,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.2.0-snapshot.9 + tag: v14.2.0-snapshot.12 ## 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 @@ -2291,7 +2291,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.2.0-snapshot.9 + tag: v14.2.0-snapshot.12 ## 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 From 83a9d1c996017aaacbdf2e945b85c944ac20aaa4 Mon Sep 17 00:00:00 2001 From: Steven Oderayi Date: Tue, 29 Oct 2024 14:54:50 +0100 Subject: [PATCH 21/21] chore: bump test-cases version --- mojaloop/values.yaml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index d5f5c132f..bbb67e6c1 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -13559,9 +13559,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/v17.0.0-iso.9/rules/hub/rules_callback/default.json" - rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.9/rules/hub/rules_response/default.json" - rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.9/rules/hub/rules_validation/default.json" + rules_callback__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.11/rules/hub/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.11/rules/hub/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.11/rules/hub/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 @@ -13950,8 +13950,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/v17.0.0-iso.9.zip - testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.9/collections/hub/provisioning/for_golden_path + testCasesZipUrl: &ttkGitUrl https://github.com/mojaloop/testing-toolkit-test-cases/archive/v17.0.0-iso.11.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/provisioning/for_golden_path ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13964,7 +13964,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-17.0.0-iso.9/collections/hub/golden_path + testCasesPathInZip: &ttkGitPathGP testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14065,7 +14065,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-17.0.0-iso.9/collections/hub/cleanup + testCasesPathInZip: &ttkGitPathCleanup testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/cleanup # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14173,7 +14173,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-17.0.0-iso.9/collections/hub/other_tests/bulk_transfers + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/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 @@ -14218,7 +14218,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-17.0.0-iso.9/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/provisioning/for_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 @@ -14263,7 +14263,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-17.0.0-iso.9/collections/hub/provisioning/for_thirdparty + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/provisioning/for_thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -14305,7 +14305,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-17.0.0-iso.9/collections/hub/provisioning/for_sdk_bulk + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/provisioning/for_sdk_bulk ## 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 @@ -14350,7 +14350,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-17.0.0-iso.9/collections/hub/sdk_scheme_adapter/bulk/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/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 @@ -14395,7 +14395,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-17.0.0-iso.9/collections/hub/sdk_scheme_adapter/request-to-pay/basic + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/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 @@ -14440,7 +14440,7 @@ ml-ttk-test-setup-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.9/collections/hub/provisioning/for_inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/provisioning/for_inter_scheme ## 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 @@ -14465,7 +14465,7 @@ ml-ttk-test-val-interscheme: config: ## Test-case archive zip for test-cases: https://github.com/mojaloop/testing-toolkit-test-cases testCasesZipUrl: *ttkGitUrl - testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.9/collections/hub/inter_scheme + testCasesPathInZip: testing-toolkit-test-cases-17.0.0-iso.11/collections/hub/inter_scheme ## 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