diff --git a/account-lookup-service/values.yaml b/account-lookup-service/values.yaml index 26d140787..fadfc49b1 100644 --- a/account-lookup-service/values.yaml +++ b/account-lookup-service/values.yaml @@ -28,6 +28,16 @@ account-lookup-service: nameOverride: "" fullnameOverride: "" + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + # + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Pod scheduling preferences. ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -339,6 +349,16 @@ account-lookup-service-admin: nameOverride: "" fullnameOverride: "" + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + # + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Pod scheduling preferences. ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} diff --git a/bulk-api-adapter/Chart.yaml b/bulk-api-adapter/Chart.yaml index 71d89264f..0f3d4af10 100644 --- a/bulk-api-adapter/Chart.yaml +++ b/bulk-api-adapter/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: bulk-api-adapter Helm chart for Kubernetes name: bulk-api-adapter -version: 14.5.0 +version: 14.6.0 appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png @@ -16,11 +16,11 @@ maintainers: email: steven.oderayi@infitx.com dependencies: - name: bulk-api-adapter-service - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-service" condition: bulk-api-adapter-service.enabled - name: bulk-api-adapter-handler-notification - version: ">= 14.3.0" + version: ">= 14.4.0" repository: "file://./chart-handler-notification" condition: bulk-api-adapter-handler-notification.enabled - name: common diff --git a/bulk-api-adapter/chart-handler-notification/Chart.yaml b/bulk-api-adapter/chart-handler-notification/Chart.yaml index 0999d3c1c..29c85ec49 100644 --- a/bulk-api-adapter/chart-handler-notification/Chart.yaml +++ b/bulk-api-adapter/chart-handler-notification/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: bulk-api-adapter Handler for Notifications component Helm chart for Kubernetes name: bulk-api-adapter-handler-notification -version: 14.3.0 +version: 14.4.0 appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png diff --git a/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml b/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml new file mode 100644 index 000000000..ec053eff3 --- /dev/null +++ b/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml @@ -0,0 +1,16 @@ +{{- if .Values.configOverride }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "bulk-api-adapter-handler-notification.fullname" . }}-config-override + labels: + app.kubernetes.io/name: {{ include "bulk-api-adapter-handler-notification.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} +data: +{{- range $fileName, $fileContents := .Values.configOverride }} + {{ $fileName }}: | {{ $fileContents | toPrettyJson | nindent 4 }} +{{- end }} +{{- end }} diff --git a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml index 5d9a7cb82..344dad3ad 100644 --- a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -109,6 +109,11 @@ spec: volumeMounts: - name: {{ template "bulk-api-adapter-handler-notification.fullname" . }}-config-volume mountPath: /opt/app/config +{{- range $fileName, $fileContents := .Values.configOverride }} + - name: config-override-volume + mountPath: /opt/app/{{ $fileName }} + subPath: {{ $fileName }} +{{- end }} {{- if .Values.config.endpointSecurity.jwsSign }} - name: jws-signing-key mountPath: /opt/app/secrets @@ -126,6 +131,11 @@ spec: {{ toYaml . | indent 8 }} {{- end }} volumes: + {{- if .Values.configOverride }} + - name: config-override-volume + configMap: + name: {{ template "bulk-api-adapter-handler-notification.fullname" . }}-config-override + {{- end }} - name: {{ template "bulk-api-adapter-handler-notification.fullname" . }}-config-volume configMap: name: {{ template "bulk-api-adapter-handler-notification.fullname" . }}-config diff --git a/bulk-api-adapter/chart-service/Chart.yaml b/bulk-api-adapter/chart-service/Chart.yaml index 96af45d5d..d69a2a948 100644 --- a/bulk-api-adapter/chart-service/Chart.yaml +++ b/bulk-api-adapter/chart-service/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: bulk-api-adapter API component Helm chart for Kubernetes name: bulk-api-adapter-service -version: 14.3.0 +version: 14.4.0 appVersion: v17.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png diff --git a/bulk-api-adapter/chart-service/templates/config-override.yaml b/bulk-api-adapter/chart-service/templates/config-override.yaml new file mode 100644 index 000000000..9b15c4c09 --- /dev/null +++ b/bulk-api-adapter/chart-service/templates/config-override.yaml @@ -0,0 +1,16 @@ +{{- if .Values.configOverride }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "bulk-api-adapter-service.fullname" . }}-config-override + labels: + app.kubernetes.io/name: {{ include "bulk-api-adapter-service.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} +data: +{{- range $fileName, $fileContents := .Values.configOverride }} + {{ $fileName }}: | {{ $fileContents | toPrettyJson | nindent 4 }} +{{- end }} +{{- end }} diff --git a/bulk-api-adapter/chart-service/templates/deployment.yaml b/bulk-api-adapter/chart-service/templates/deployment.yaml index 733ca04db..543fc56e3 100644 --- a/bulk-api-adapter/chart-service/templates/deployment.yaml +++ b/bulk-api-adapter/chart-service/templates/deployment.yaml @@ -106,6 +106,11 @@ spec: volumeMounts: - name: {{ template "bulk-api-adapter-service.fullname" . }}-config-volume mountPath: /opt/app/config +{{- range $fileName, $fileContents := .Values.configOverride }} + - name: config-override-volume + mountPath: /opt/app/{{ $fileName }} + subPath: {{ $fileName }} +{{- end }} {{- with .Values.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} @@ -119,6 +124,11 @@ spec: {{ toYaml . | indent 8 }} {{- end }} volumes: + {{- if .Values.configOverride }} + - name: config-override-volume + configMap: + name: {{ template "account-lookup-service-admin.fullname" . }}-config-override + {{- end }} - name: {{ template "bulk-api-adapter-service.fullname" . }}-config-volume configMap: name: {{ template "bulk-api-adapter-service.fullname" . }}-config diff --git a/centralledger/values.yaml b/centralledger/values.yaml index 0da09481c..1ed220d2a 100644 --- a/centralledger/values.yaml +++ b/centralledger/values.yaml @@ -34,6 +34,16 @@ centralledger-service: replicaCount: 1 command: '["node", "src/api/index.js"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -430,6 +440,16 @@ centralledger-handler-transfer-prepare: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--prepare"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -829,6 +849,16 @@ centralledger-handler-transfer-position: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--position"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -1222,6 +1252,16 @@ centralledger-handler-transfer-position-batch: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--positionbatch"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -1621,6 +1661,16 @@ centralledger-handler-transfer-get: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--get"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -2014,6 +2064,16 @@ centralledger-handler-transfer-fulfil: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--fulfil"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -2407,6 +2467,16 @@ centralledger-handler-timeout: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--timeout"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -2805,6 +2875,16 @@ centralledger-handler-admin-transfer: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--admin"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: diff --git a/centralsettlement/Chart.yaml b/centralsettlement/Chart.yaml index d2dedc613..e763c839c 100644 --- a/centralsettlement/Chart.yaml +++ b/centralsettlement/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Central-Settlement Helm chart for Kubernetes name: centralsettlement -version: 14.6.0 +version: 14.7.0 appVersion: v16.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png @@ -16,22 +16,22 @@ maintainers: email: steven.oderayi@infitx.com dependencies: - name: centralsettlement-service - version: ">= 15.1.0" + version: ">= 15.2.0" repository: "file://./chart-service" alias: centralsettlement-service condition: centralsettlement-service.enabled - name: centralsettlement-service - version: ">= 15.1.0" + version: ">= 15.2.0" repository: "file://./chart-service" alias: centralsettlement-handler-deferredsettlement condition: centralsettlement-handler-deferredsettlement.enabled - name: centralsettlement-service - version: ">= 15.1.0" + version: ">= 15.2.0" repository: "file://./chart-service" alias: centralsettlement-handler-grosssettlement condition: centralsettlement-handler-grosssettlement.enabled - name: centralsettlement-service - version: ">= 15.1.0" + version: ">= 15.2.0" repository: "file://./chart-service" alias: centralsettlement-handler-rules condition: centralsettlement-handler-rules.enabled diff --git a/centralsettlement/chart-service/Chart.yaml b/centralsettlement/chart-service/Chart.yaml index 153b41f64..caa8c0395 100644 --- a/centralsettlement/chart-service/Chart.yaml +++ b/centralsettlement/chart-service/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Central-Settlement helm chart for API services and handlers name: centralsettlement-service -version: 15.1.0 +version: 15.2.0 appVersion: v16.0.0 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png diff --git a/centralsettlement/chart-service/templates/config-override.yaml b/centralsettlement/chart-service/templates/config-override.yaml new file mode 100644 index 000000000..1c8959b49 --- /dev/null +++ b/centralsettlement/chart-service/templates/config-override.yaml @@ -0,0 +1,16 @@ +{{- if .Values.configOverride }} +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "centralsettlement-service.fullname" . }}-config-override + labels: + app.kubernetes.io/name: {{ include "centralsettlement-service.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} +data: +{{- range $fileName, $fileContents := .Values.configOverride }} + {{ $fileName }}: | {{ $fileContents | toPrettyJson | nindent 4 }} +{{- end }} +{{- end }} diff --git a/centralsettlement/chart-service/templates/deployment.yaml b/centralsettlement/chart-service/templates/deployment.yaml index 71c154269..c8881936c 100644 --- a/centralsettlement/chart-service/templates/deployment.yaml +++ b/centralsettlement/chart-service/templates/deployment.yaml @@ -138,6 +138,11 @@ spec: - name: EVENT_SDK_TRACEID_PER_VENDOR value: {{ .Values.config.event_traceid_per_vendor | quote }} volumeMounts: +{{- range $fileName, $fileContents := .Values.configOverride }} + - name: config-override-volume + mountPath: /opt/app/{{ $fileName }} + subPath: {{ $fileName }} +{{- end }} - name: {{ template "centralsettlement-service.fullname" . }}-cfg-vol mountPath: /opt/app/config - name: {{ template "centralsettlement-service.fullname" . }}-rules-vol @@ -183,6 +188,11 @@ spec: value: {{ .Values.sidecar.config.event_log_metadata_only | quote }} {{- end }} volumes: + {{- if .Values.configOverride }} + - name: config-override-volume + configMap: + name: {{ template "account-lookup-service-admin.fullname" . }}-config-override + {{- end }} - name: {{ template "centralsettlement-service.fullname" . }}-cfg-vol configMap: name: {{ template "centralsettlement-service.fullname" . }}-config diff --git a/centralsettlement/values.yaml b/centralsettlement/values.yaml index 703811657..f134698c7 100644 --- a/centralsettlement/values.yaml +++ b/centralsettlement/values.yaml @@ -28,6 +28,16 @@ centralsettlement-service: replicaCount: 1 command: '["node", "src/api/index.js"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -36,14 +46,14 @@ centralsettlement-service: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/api/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -274,13 +284,13 @@ centralsettlement-service: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST @@ -298,9 +308,9 @@ centralsettlement-service: do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -458,6 +468,16 @@ centralsettlement-handler-deferredsettlement: replicaCount: 1 command: '["node", "src/handlers/index.js", "h", "--deferredSettlement"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -466,7 +486,7 @@ centralsettlement-handler-deferredsettlement: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/handlers/index.js - h @@ -475,7 +495,7 @@ centralsettlement-handler-deferredsettlement: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -706,13 +726,13 @@ centralsettlement-handler-deferredsettlement: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST @@ -730,9 +750,9 @@ centralsettlement-handler-deferredsettlement: do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -892,6 +912,16 @@ centralsettlement-handler-grosssettlement: replicaCount: 1 command: '["node", "src/handlers/index.js", "h", "--grossSettlement"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -900,7 +930,7 @@ centralsettlement-handler-grosssettlement: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/handlers/index.js - h @@ -909,7 +939,7 @@ centralsettlement-handler-grosssettlement: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -1139,13 +1169,13 @@ centralsettlement-handler-grosssettlement: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST @@ -1163,9 +1193,9 @@ centralsettlement-handler-grosssettlement: do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST @@ -1325,6 +1355,16 @@ centralsettlement-handler-rules: replicaCount: 1 command: '["node", "src/handlers/index.js", "h", "--rules"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -1333,7 +1373,7 @@ centralsettlement-handler-rules: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/handlers/index.js - h @@ -1342,7 +1382,7 @@ centralsettlement-handler-rules: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -1662,13 +1702,13 @@ centralsettlement-handler-rules: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST @@ -1686,9 +1726,9 @@ centralsettlement-handler-rules: do echo --------------------; echo Waiting for MySQL...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo MySQL ok!; env: - name: DB_HOST diff --git a/ml-api-adapter/values.yaml b/ml-api-adapter/values.yaml index 627101eb5..aba23d6d3 100644 --- a/ml-api-adapter/values.yaml +++ b/ml-api-adapter/values.yaml @@ -10,7 +10,7 @@ ml-api-adapter-service: # Default values for ml-api-adapter. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - + image: registry: docker.io repository: mojaloop/ml-api-adapter @@ -30,7 +30,17 @@ ml-api-adapter-service: pullSecrets: [] replicaCount: 1 - command: '["node", "src/api/index.js"]' + command: '["node", "src/api/index.js"]' + + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" ## Enable diagnostic mode in the deployment ## @@ -40,14 +50,14 @@ ml-api-adapter-service: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/api/index.js ## @param diagnosticMode.args Args to override all containers in the deployment ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -102,13 +112,13 @@ ml-api-adapter-service: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST @@ -310,7 +320,7 @@ ml-api-adapter-handler-notification: # Default values for ml-api-adapter. # This is a YAML-formatted file. # Declare variables to be passed into your templates. - + image: registry: docker.io repository: mojaloop/ml-api-adapter @@ -332,6 +342,16 @@ ml-api-adapter-handler-notification: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--notification"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -340,7 +360,7 @@ ml-api-adapter-handler-notification: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/handlers/index.js - handler @@ -349,7 +369,7 @@ ml-api-adapter-handler-notification: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -406,13 +426,13 @@ ml-api-adapter-handler-notification: command: - sh - -c - - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; + - until ./bin/kafka-broker-api-versions.sh --bootstrap-server ${KAFKA_HOST}:${KAFKA_PORT}; do echo --------------------; echo Waiting for Kafka...; - sleep 2; + sleep 2; done; - echo ====================; + echo ====================; echo Kafka ok!; env: - name: KAFKA_HOST diff --git a/mojaloop-bulk/Chart.yaml b/mojaloop-bulk/Chart.yaml index 29971c04c..5a4cd67f8 100644 --- a/mojaloop-bulk/Chart.yaml +++ b/mojaloop-bulk/Chart.yaml @@ -15,7 +15,7 @@ maintainers: email: steven.oderayi@infitx.com dependencies: - name: bulk-api-adapter - version: ">= 14.5.0" + version: ">= 14.6.0" repository: "file://../bulk-api-adapter" condition: bulk-api-adapter.enabled - name: bulk-centralledger diff --git a/mojaloop-bulk/values.yaml b/mojaloop-bulk/values.yaml index 6f15aa31c..d0c67eed6 100644 --- a/mojaloop-bulk/values.yaml +++ b/mojaloop-bulk/values.yaml @@ -33,6 +33,16 @@ bulk-api-adapter: replicaCount: 1 command: '["node", "src/api/index.js"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -355,6 +365,16 @@ bulk-api-adapter: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--notification"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -703,6 +723,16 @@ bulk-centralledger: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkprepare"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -1086,6 +1116,16 @@ bulk-centralledger: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkfulfil"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -1454,6 +1494,16 @@ bulk-centralledger: ## pullSecrets: [] + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkprocessing"]' @@ -1837,6 +1887,16 @@ bulk-centralledger: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkget"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: diff --git a/mojaloop/Chart.yaml b/mojaloop/Chart.yaml index ab3171ae0..e32d3084c 100644 --- a/mojaloop/Chart.yaml +++ b/mojaloop/Chart.yaml @@ -31,7 +31,7 @@ dependencies: repository: "file://../centralledger" condition: centralledger.enabled - name: centralsettlement - version: ">= 14.6.0" + version: ">= 14.7.0" repository: "file://../centralsettlement" condition: centralsettlement.enabled - name: simulator diff --git a/quoting-service/values.yaml b/quoting-service/values.yaml index 4bb82e915..5da5652bb 100644 --- a/quoting-service/values.yaml +++ b/quoting-service/values.yaml @@ -31,6 +31,16 @@ quoting-service: # API replicaCount: 1 command: '["node", "src/index.js"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -126,7 +136,7 @@ quoting-service: # API prefix: moja_ defaultLabels: serviceName: quoting-service - + config: # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept), # and for generating requests/callbacks from the Switch itself (DEFAULT value) protocol_versions: |- @@ -201,7 +211,7 @@ quoting-service: # API endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: null + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key @@ -271,11 +281,11 @@ quoting-service: # API ## e.g.: ## clusterIP: None ## - clusterIP: null + clusterIP: null ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer ## - loadBalancerIP: null + loadBalancerIP: null ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service ## e.g: @@ -308,7 +318,7 @@ quoting-service: # API pathType: ImplementationSpecific ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) ## - apiVersion: null + apiVersion: null ## @param ingress.hostname Default host for the ingress record ## hostname: quoting-service.local @@ -321,7 +331,7 @@ quoting-service: # API ## @param ingress.annotations Additional custom annotations for the ingress record ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added ## - annotations: null + annotations: null ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` ## You can: @@ -386,6 +396,16 @@ quoting-service-handler: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--quotes", "--bulk_quotes"]' + # Mount configuration files in the app folder for overriding defaults + # configOverride: + # # event sdk settings override + # .EVENT_SDKrc: + # AUDIT: kafka + + # # logging settings override + # .CSLrc: + # LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -481,7 +501,7 @@ quoting-service-handler: prefix: moja_ defaultLabels: serviceName: quoting-service-handler - + config: # Protocol versions used for validating (VALIDATELIST) incoming FSPIOP API Headers (Content-type, Accept), # and for generating requests/callbacks from the Switch itself (DEFAULT value) @@ -556,7 +576,7 @@ quoting-service-handler: endpointSecurity: jwsSign: false fspiopSourceSigningName: 'switch' - jwsSigningKey: null + jwsSigningKey: null # To generate this key: # Private: # ssh-keygen -t rsa -b 4096 -m PEM -f jwtRS256.key @@ -602,7 +622,7 @@ quoting-service-handler: value: '{{ .Values.config.kafka_host }}' - name: KAFKA_PORT value: '{{ .Values.config.kafka_port }}' - + - name: wait-for-mysql image: mysql:5.7 imagePullPolicy: IfNotPresent @@ -635,7 +655,7 @@ quoting-service-handler: value: {{ .Values.config.db_password }} {{- end }} - name: DB_DATABASE - value: '{{ .Values.config.db_database }}' + value: '{{ .Values.config.db_database }}' ## @param master.podLabels Extra labels for pod(s) ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ diff --git a/transaction-requests-service/values.yaml b/transaction-requests-service/values.yaml index fe6b59707..0e59193c9 100644 --- a/transaction-requests-service/values.yaml +++ b/transaction-requests-service/values.yaml @@ -27,6 +27,16 @@ image: replicaCount: 1 command: '["node", "src/index.js", "api"]' +# Mount configuration files in the app folder for overriding defaults +# configOverride: +# # event sdk settings override +# .EVENT_SDKrc: +# AUDIT: kafka + +# # logging settings override +# .CSLrc: +# LOG_FILTER: "" + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -35,7 +45,7 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/index.js - api @@ -43,7 +53,7 @@ diagnosticMode: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: