diff --git a/.circleci/config.yml b/.circleci/config.yml index 718d3cd68..f239f9ce1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,7 +47,7 @@ defaults_Environment: &defaults_environment helm repo add elastic https://helm.elastic.co helm repo add codecentric https://codecentric.github.io/helm-charts helm repo add bitnami https://charts.bitnami.com/bitnami - helm repo add mojaloop-charts https://mojaloop.github.io/charts/repo + helm repo add mojaloop-charts https://mojaloop.github.io/charts/repo helm repo add redpanda https://charts.redpanda.com helm repo update @@ -173,6 +173,11 @@ jobs: echo "export GIT_RELEASE_URL=${GIT_PROJECT_URL}/releases/tag/${CIRCLE_TAG}" >> $BASH_ENV echo "export GIT_RELEASE_TAG='${CIRCLE_TAG}@${CIRCLE_SHA1:0:7}'" >> $BASH_ENV echo "export GIT_RELEASE_TYPE='Helm Snapshot'" >> $BASH_ENV + elif [[ $CIRCLE_BRANCH =~ ^(major|minor|patch)/(.*)$ ]]; then + echo "Setting env configs for Helm Pre-Release" + echo "export GIT_RELEASE_URL=${GIT_PROJECT_URL}/commit/${CIRCLE_SHA1}" >> $BASH_ENV + echo "export GIT_RELEASE_TAG=${BASH_REMATCH[2]}.${CIRCLE_BUILD_NUM}" >> $BASH_ENV + echo "export GIT_RELEASE_TYPE='Helm Pre-Release'" >> $BASH_ENV else echo "CIRCLE_SHA1=${CIRCLE_SHA1} exists setting env configs for Helm Snapshot" echo "export GIT_RELEASE_URL=${GIT_PROJECT_URL}/commit/${CIRCLE_SHA1}" >> $BASH_ENV @@ -203,6 +208,25 @@ jobs: - run: name: Publish Helm Charts command: .circleci/publish_helm_charts.sh + - run: + name: Trigger downstream workflows + # DOWNSTREAM_IMAGE_ variables contain downstream repository:token pairs + command: | + DOWNSTREAM=$(compgen -A variable | grep "^DOWNSTREAM_IMAGE_") + if [ -n "$DOWNSTREAM" ]; then + echo "wait for GitHub Pages to publish" + sleep 180 + fi + for var in $DOWNSTREAM; do + REPO_NAME=$(echo "${!var}" | cut -d: -f1) + echo "Triggering downstream workflow for $REPO_NAME" + curl -L \ + -X POST \ + -H "Accept: application/vnd.github+json" \ + -H "Authorization: Bearer $(echo "${!var}" | cut -d: -f2)" \ + https://api.github.com/repos/"$REPO_NAME"/actions/workflows/docker-image.yaml/dispatches \ + -d '{"ref":"main","inputs":{"upstream":"'"$CIRCLE_BUILD_URL"'","chart":"mojaloop","tag":"'"$GIT_RELEASE_TAG"'"}}' + done - slack/notify: event: pass template: SLACK_TEMP_RELEASE_SUCCESS @@ -249,4 +273,4 @@ workflows: tags: only: /v[0-9]+(\.[0-9]+)*(\-snapshot+((\.[0-9]+)?))?/ branches: - only: main + only: /main|(major|minor|patch)/.*/ diff --git a/account-lookup-service/Chart.yaml b/account-lookup-service/Chart.yaml index 87ae6bdda..706ef4585 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.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: @@ -27,6 +27,6 @@ dependencies: condition: als-oracle-pathfinder.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.1 tags: - moja-common diff --git a/account-lookup-service/chart-admin/Chart.yaml b/account-lookup-service/chart-admin/Chart.yaml index 3997a7c5e..38ff19714 100644 --- a/account-lookup-service/chart-admin/Chart.yaml +++ b/account-lookup-service/chart-admin/Chart.yaml @@ -11,6 +11,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.1 tags: - moja-common diff --git a/account-lookup-service/chart-admin/templates/config-override.yaml b/account-lookup-service/chart-admin/templates/config-override.yaml index bcf874373..1ab7c350e 100644 --- a/account-lookup-service/chart-admin/templates/config-override.yaml +++ b/account-lookup-service/chart-admin/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/account-lookup-service/chart-admin/templates/deployment.yaml b/account-lookup-service/chart-admin/templates/deployment.yaml index d502f9a40..d48250abe 100644 --- a/account-lookup-service/chart-admin/templates/deployment.yaml +++ b/account-lookup-service/chart-admin/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: # prometheus.io/scrape: "true" # {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} initContainers: {{- if .Values.initContainers }} {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} @@ -71,6 +72,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 6281698d5..038b1d9aa 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.3.4 + tag: v15.6.0-iso.19 ## 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: @@ -438,3 +442,4 @@ resources: {} # requests: # cpu: 100m # memory: 128Mi + diff --git a/account-lookup-service/chart-handler-timeout/Chart.yaml b/account-lookup-service/chart-handler-timeout/Chart.yaml index c6c2dea2a..6b094de06 100644 --- a/account-lookup-service/chart-handler-timeout/Chart.yaml +++ b/account-lookup-service/chart-handler-timeout/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 version: 1.0.0 -appVersion: v15.4.0-snapshot.33 +appVersion: v15.6.0-iso.19 description: A Helm chart for Kubernetes name: account-lookup-service-handler-timeout maintainers: @@ -9,6 +9,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.1 tags: - moja-common 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/config-override.yaml b/account-lookup-service/chart-handler-timeout/templates/config-override.yaml index b6e987ba1..1e3ad1edf 100644 --- a/account-lookup-service/chart-handler-timeout/templates/config-override.yaml +++ b/account-lookup-service/chart-handler-timeout/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml index ac0c9d5ff..4503c3364 100644 --- a/account-lookup-service/chart-handler-timeout/templates/deployment.yaml +++ b/account-lookup-service/chart-handler-timeout/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} initContainers: {{- if .Values.initContainers }} {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} @@ -71,6 +72,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-handler-timeout/values.yaml b/account-lookup-service/chart-handler-timeout/values.yaml index 9a999bb30..affc54d32 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.6.0-iso.19 ## 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/Chart.yaml b/account-lookup-service/chart-service/Chart.yaml index 27dabe5f1..9e756950e 100644 --- a/account-lookup-service/chart-service/Chart.yaml +++ b/account-lookup-service/chart-service/Chart.yaml @@ -11,6 +11,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.1 tags: - moja-common diff --git a/account-lookup-service/chart-service/configs/default.json b/account-lookup-service/chart-service/configs/default.json index e132a42b2..593e011d9 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 | quote }}, "PROTOCOL_VERSIONS": {{ .Values.config.protocol_versions | toPrettyJson }}, "DATABASE": { "DIALECT": "{{ .Values.config.db_driver }}", diff --git a/account-lookup-service/chart-service/templates/config-override.yaml b/account-lookup-service/chart-service/templates/config-override.yaml index 2428f1aca..1f3c0c1dc 100644 --- a/account-lookup-service/chart-service/templates/config-override.yaml +++ b/account-lookup-service/chart-service/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/account-lookup-service/chart-service/templates/deployment.yaml b/account-lookup-service/chart-service/templates/deployment.yaml index 911e24338..dd88627a4 100644 --- a/account-lookup-service/chart-service/templates/deployment.yaml +++ b/account-lookup-service/chart-service/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} initContainers: {{- if .Values.initContainers }} {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} @@ -71,6 +72,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-service/values.yaml b/account-lookup-service/chart-service/values.yaml index 097c21bb0..5d5922033 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.33 + tag: v15.6.0-iso.19 ## 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 | 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 49da88b56..2f3dbc6c6 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.33 + tag: v15.6.0-iso.19 ## 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.3.4 + tag: v15.6.0-iso.19 ## 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.6.0-iso.19 ## 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/als-msisdn-oracle/.gitkeep b/als-msisdn-oracle/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/als-msisdn-oracle/Chart.yaml b/als-msisdn-oracle/Chart.yaml new file mode 100644 index 000000000..a197aae5c --- /dev/null +++ b/als-msisdn-oracle/Chart.yaml @@ -0,0 +1,20 @@ +apiVersion: v2 +description: als-msisdn-oracle chart for Mojaloop Services +name: als-msisdn-oracle +version: 0.0.1 +appVersion: v0.0.14 +home: http://mojaloop.io +icon: http://mojaloop.io/images/logo.png +sources: + - https://github.com/mojaloop/mojaloop + - https://github.com/mojaloop/helm + - https://github.com/mojaloop/als-msisdn-oracle-svc +maintainers: + - name: Vijay Kumar Guthi + email: vijaya.guthi@infitx.com +dependencies: + - name: common + repository: https://mojaloop.github.io/charts/repo + version: 3.1.1 + tags: + - moja-common diff --git a/als-msisdn-oracle/README.md b/als-msisdn-oracle/README.md new file mode 100644 index 000000000..86de7ba03 --- /dev/null +++ b/als-msisdn-oracle/README.md @@ -0,0 +1,12 @@ +# MSISDN-Oracle + +MSISDN-Oracle is an Oracle for the Account Lookup Service. + + +## Dependencies + +This chart has the following dependencies: +- mysql + +See `example_dependencies.yaml` for a simple example of installing and using the chart +with base dependencies. \ No newline at end of file diff --git a/als-msisdn-oracle/templates/_helpers.tpl b/als-msisdn-oracle/templates/_helpers.tpl new file mode 100644 index 000000000..29011dd7c --- /dev/null +++ b/als-msisdn-oracle/templates/_helpers.tpl @@ -0,0 +1,48 @@ +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "als-msisdn-oracle.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{- define "als-msisdn-oracle.name" -}} +{{- default .Chart.Name | trunc 63 | trimSuffix "-" -}} +{{- end -}} + +{{/* +Common labels +*/}} +{{- define "als-msisdn-oracle.labels" -}} +helm.sh/chart: {{ include "als-msisdn-oracle.chart" . }} +app.kubernetes.io/name: {{ include "als-msisdn-oracle.name" . }} +{{ include "als-msisdn-oracle.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "als-msisdn-oracle.selectorLabels" -}} +app.kubernetes.io/name: {{ include "als-msisdn-oracle.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + + +{{- define "apiVersion.Deployment" -}} + {{- if .Capabilities.APIVersions.Has "apps/v1/Deployment" -}} + {{- print "apps/v1" -}} + {{- else -}} + {{- print "apps/v1beta2" -}} + {{- end -}} +{{- end -}} + +{{- define "apiVersion.Ingress" -}} + {{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" -}} + {{- print "networking.k8s.io/v1" -}} + {{- else -}} + {{- print "networking.k8s.io/v1" -}} + {{- end -}} +{{- end -}} diff --git a/als-msisdn-oracle/templates/configmap.yaml b/als-msisdn-oracle/templates/configmap.yaml new file mode 100644 index 000000000..d22bc668a --- /dev/null +++ b/als-msisdn-oracle/templates/configmap.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ template "common.names.fullname" . }}-config + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} +data: + {{- range $k, $v := index .Values.config_files }} + {{ $k }}: | + {{- include "common.tplvalues.render" (dict "value" $v "context" $) | nindent 6 }} + {{- end }} diff --git a/als-msisdn-oracle/templates/deployment.yaml b/als-msisdn-oracle/templates/deployment.yaml new file mode 100644 index 000000000..46a499fb7 --- /dev/null +++ b/als-msisdn-oracle/templates/deployment.yaml @@ -0,0 +1,132 @@ +{{- if .Values.enabled -}} +apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: + {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + # Common annotations + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.replicaCount }} + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: {{ .Chart.Name }} + template: + metadata: + labels: + {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: {{ .Chart.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + # Custom Pod Labels + {{- if .Values.podLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }} + {{- end }} + annotations: + # Custom Pod annotations + {{- if .Values.podAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $ ) | nindent 8 }} + {{- end }} + # Common annotations + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }} + {{- end }} + spec: + {{- include "common.topologySpread" . | nindent 6 }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} + initContainers: + {{- if .Values.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.image.pullSecrets }} + {{- include "common.images.renderPullSecrets" (dict "images" (list .Values.image) "context" $) | nindent 6 }} + {{- end }} + containers: + - name: {{ .Chart.Name }} + image: {{ .Values.image.repository }}:{{ .Values.image.tag }} + imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} + {{- end }} + ports: + - name: http + containerPort: {{ .Values.service.internalPort }} + {{- if .Values.diagnosticMode.enabled }} + - name: debug + containerPort: {{ .Values.diagnosticMode.debug.internalPort }} + {{- end }} + {{- if .Values.readinessProbe.enabled }} + readinessProbe: + httpGet: + path: {{ .Values.readinessProbe.httpGet.path }} + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.readinessProbe.periodSeconds }} + {{- end }} + {{- if .Values.livenessProbe.enabled }} + livenessProbe: + httpGet: + path: {{ .Values.livenessProbe.httpGet.path }} + port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + {{- end }} + env: + - name: ALS_MSISDN_ORACLE_DATABASE_PASSWORD + {{- if .Values.config.db_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.db_secret.name }}' + key: '{{ .Values.config.db_secret.key }}' + {{- else }} + value: {{ .Values.config.db_password }} + {{- end }} + {{- range $envItem := .Values.env }} + - name: {{ $envItem.name }} + value: {{ $envItem.value }} + {{- end }} + volumeMounts: + - name: als-msisdn-oracle-config-volume + mountPath: /opt/app/dist/config/default.json + subPath: default.json + volumes: + - name: als-msisdn-oracle-config-volume + configMap: + name: {{ template "common.names.fullname" . }}-config + items: + - key: default.json + path: default.json +{{- end -}} diff --git a/als-msisdn-oracle/templates/ingress.yaml b/als-msisdn-oracle/templates/ingress.yaml new file mode 100644 index 000000000..d3e896c38 --- /dev/null +++ b/als-msisdn-oracle/templates/ingress.yaml @@ -0,0 +1,63 @@ +{{- if .Values.ingress.enabled }} +apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }} +kind: Ingress +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ template "common.names.chart" . }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations .Values.ingress.certManager }} + annotations: + {{- if .Values.ingress.certManager }} + kubernetes.io/tls-acme: "true" + {{- end }} + {{- if .Values.ingress.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.ingress.annotations "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.22-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + rules: + {{- if .Values.ingress.hostname }} + - host: {{ .Values.ingress.hostname }} + http: + paths: + {{- if .Values.ingress.extraPaths }} + {{- toYaml .Values.ingress.extraPaths | nindent 10 }} + {{- end }} + - path: {{ .Values.ingress.path }} + {{- if eq "true" (include "common.ingress.supportsPathType" .) }} + pathType: {{ .Values.ingress.pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.name" .) "servicePort" "http" "context" $) | nindent 14 }} + {{- end }} + {{- range .Values.ingress.extraHosts }} + - host: {{ .name | quote }} + http: + paths: + - path: {{ default "/" .path }} + {{- if eq "true" (include "common.ingress.supportsPathType" $) }} + pathType: {{ default "ImplementationSpecific" .pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.name" $) "servicePort" "http" "context" $) | nindent 14 }} + {{- end }} + {{- if or (and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned)) .Values.ingress.extraTls }} + tls: + {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }} + - hosts: + - {{ .Values.ingress.hostname | quote }} + secretName: {{ printf "%s-tls" .Values.ingress.hostname }} + {{- end }} + {{- if .Values.ingress.extraTls }} + {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/als-msisdn-oracle/templates/service.yaml b/als-msisdn-oracle/templates/service.yaml new file mode 100644 index 000000000..1bb59bbdc --- /dev/null +++ b/als-msisdn-oracle/templates/service.yaml @@ -0,0 +1,57 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: + {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.service.type }} + {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }} + clusterIP: {{ .Values.service.clusterIP }} + {{- end }} + {{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.sessionAffinity }} + sessionAffinity: {{ .Values.service.sessionAffinity }} + {{- end }} + {{- if .Values.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + - name: http + port: {{ .Values.service.port }} + targetPort: {{ .Values.service.internalPort }} + protocol: TCP + {{- if (and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) .Values.service.nodePort) }} + nodePort: {{ .Values.service.nodePort }} + {{- else if eq .Values.service.type "ClusterIP" }} + nodePort: null + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + - name: debug + port: {{ .Values.diagnosticMode.debug.port }} + targetPort: {{ .Values.diagnosticMode.debug.internalPort }} + protocol: TCP + {{- end }} + selector: + {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} diff --git a/als-msisdn-oracle/values.yaml b/als-msisdn-oracle/values.yaml new file mode 100644 index 000000000..7454bd6d3 --- /dev/null +++ b/als-msisdn-oracle/values.yaml @@ -0,0 +1,338 @@ +enabled: true + +image: + registry: docker.io + repository: mojaloop/als-msisdn-oracle-svc + tag: v0.0.14 + ## 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 + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + +replicaCount: 1 +command: '["node", "./dist/src/cli.js"]' + +## Enable diagnostic mode in the deployment +## +diagnosticMode: + ## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden) + ## + enabled: false + ## @param diagnosticMode.command Command to override all containers in the deployment + ## + command: + - node + - ./dist/src/cli.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: + internalPort: 9229 + port: 9229 + +readinessProbe: + enabled: true + httpGet: + path: /health + initialDelaySeconds: 60 + periodSeconds: 15 + +livenessProbe: + enabled: true + httpGet: + path: /health + initialDelaySeconds: 60 + periodSeconds: 15 + +## Pod scheduling preferences. +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity +affinity: {} + +## Node labels for pod assignment +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector +nodeSelector: {} + +## Set toleration for scheduler +## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ +tolerations: [] + +## Configure Container Security Context +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod +## @param containerSecurityContext.enabled Enabled %%MAIN_CONTAINER_NAME%% containers' Security Context +## @param containerSecurityContext.runAsUser Set %%MAIN_CONTAINER_NAME%% containers' Security Context runAsUser +## +containerSecurityContext: + enabled: true + runAsUser: 1001 + +# Add exta environment variables here +env: [] + # e.g. + # - name: LOG_LEVEL + # value: debug + +## Svc configs +config: + ## DB Configuration + db_host: mysqldb + db_port: 3306 + db_user: oracle_msisdn + ## Secret-Management + ### Set this if you are using a clear password configured in the config section + db_password: '' + ### Configure this if you want to use a secret. Note, this will override the db_password, + ### Use the next line if you do wish to use the db_password value instead. + # db_secret: + ### Example config for an existing secret + # db_secret: + # name: mysqldb + # key: mysql-password + db_database: oracle_msisdn + +## Svc config files +config_files: + default.json: | + { + "PORT": {{ .Values.service.internalPort }}, + "HOST": "0.0.0.0", + "INSPECT": { + "DEPTH": 4, + "SHOW_HIDDEN": false, + "COLOR": true + }, + "DATABASE": { + "DIALECT": "mysql", + "HOST": "{{ .Values.config.db_host }}", + "PORT": {{ .Values.config.db_port }}, + "USER": "{{ .Values.config.db_user }}", + "PASSWORD": "{{ .Values.config.db_password }}", + "DATABASE": "{{ .Values.config.db_database }}", + "POOL_MIN_SIZE": 10, + "POOL_MAX_SIZE": 10, + "ACQUIRE_TIMEOUT_MILLIS": 30000, + "CREATE_TIMEOUT_MILLIS": 30000, + "DESTROY_TIMEOUT_MILLIS": 5000, + "IDLE_TIMEOUT_MILLIS": 30000, + "REAP_INTERVAL_MILLIS": 1000, + "CREATE_RETRY_INTERVAL_MILLIS": 200 + } + } + +## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) +## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ +## e.g: +## initContainers: +## - name: your-image-name +## image: your-image +## imagePullPolicy: Always +## command: ['sh', '-c', 'echo "hello world"'] +## env: +## - name: debug +## value: trace +## +# initContainers: [] +initContainers: | + - name: wait-for-mysql + image: mysql:9.0.1 + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - | + until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; + do + echo --------------------; + echo Waiting for MySQL...; + sleep 2; + done; + echo ====================; + echo MySQL ok!; + env: + - name: DB_HOST + value: '{{ .Values.config.db_host }}' + - name: DB_PORT + value: '{{ .Values.config.db_port }}' + - name: DB_USER + value: '{{ .Values.config.db_user }}' + - name: DB_PASSWORD + {{- if .Values.config.db_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.db_secret.name }}' + key: '{{ .Values.config.db_secret.key }}' + {{- else }} + value: {{ .Values.config.db_password }} + {{- end }} + - name: DB_DATABASE + value: '{{ .Values.config.db_database }}' + - name: run-migration + image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - npm run migrate + env: + - name: ALS_MSISDN_ORACLE_DATABASE_PASSWORD + {{- if .Values.config.db_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.db_secret.name }}' + key: '{{ .Values.config.db_secret.key }}' + {{- else }} + value: {{ .Values.config.db_password }} + {{- end }} + - name: NODE_ENV + value: production + volumeMounts: + - name: als-msisdn-oracle-config-volume + mountPath: /opt/app/dist/config/default.json + subPath: default.json + +## @param master.podLabels Extra labels for pod(s) +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +## +podLabels: {} + +## @param podAnnotations Additional custom annotations for pod(s) +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +## +podAnnotations: {} + +service: + internalPort: 3000 + ## @param service.type %%MAIN_CONTAINER_NAME%% service type + ## + type: ClusterIP + ## @param service.port %%MAIN_CONTAINER_NAME%% service HTTP port + ## + port: 80 + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + ## e.g.: + ## clusterIP: None + ## + clusterIP: + ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer + ## + loadBalancerIP: + ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g: + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy + ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param service.annotations Additional custom annotations for %%MAIN_CONTAINER_NAME%% service + ## + annotations: {} + ## @param master.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param master.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + +ingress: + ## @param ingress.enabled Enable ingress record generation for %%MAIN_CONTAINER_NAME%% + ## + enabled: false + ## @param ingress.pathType Ingress path type + ## + pathType: ImplementationSpecific + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: + ## @param ingress.hostname Default host for the ingress record + ## + hostname: als-msisdn-oracle.local + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## + path: / + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: {} + ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter + ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` + ## You can: + ## - Use the `ingress.secrets` parameter to create this TLS secret + ## - Relay on cert-manager to create it by setting `ingress.certManager=true` + ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` + ## + tls: false + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## + certManager: false + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## + selfSigned: false + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: transfer-api-svc.local + ## path: / + ## + extraHosts: [] + ## @param ingress.extraPaths An array with additional arbitrary paths that may need to be added to the ingress under the main host + ## e.g: + ## extraPaths: + ## - path: /* + ## backend: + ## serviceName: ssl-redirect + ## servicePort: use-annotation + ## + extraPaths: [] + ## @param ingress.extraTls TLS configuration for additional hostname(s) to be covered with this ingress record + ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls + ## e.g: + ## extraTls: + ## - hosts: + ## - transfer-api-svc.local + ## secretName: transfer-api-svc.local-tls + ## + extraTls: [] + ## @param ingress.secrets Custom TLS certificates as secrets + ## NOTE: 'key' and 'certificate' are expected in PEM format + ## NOTE: 'name' should line up with a 'secretName' set further up + ## If it is not set and you're using cert-manager, this is unneeded, as it will create a secret for you with valid certificates + ## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 365 days + ## It is also possible to create and manage the certificates outside of this helm chart + ## Please see README.md for more information + ## e.g: + ## secrets: + ## - name: transfer-api-svc.local-tls + ## key: |- + ## -----BEGIN RSA PRIVATE KEY----- + ## ... + ## -----END RSA PRIVATE KEY----- + ## certificate: |- + ## -----BEGIN CERTIFICATE----- + ## ... + ## -----END CERTIFICATE----- + ## + secrets: [] + className: "nginx" diff --git a/als-oracle-pathfinder/Chart.yaml b/als-oracle-pathfinder/Chart.yaml index cb12861cc..87d5e3d8a 100644 --- a/als-oracle-pathfinder/Chart.yaml +++ b/als-oracle-pathfinder/Chart.yaml @@ -15,6 +15,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.1 tags: - moja-common diff --git a/als-oracle-pathfinder/templates/deployment.yaml b/als-oracle-pathfinder/templates/deployment.yaml index ff9b4bdf9..31a96f0a2 100644 --- a/als-oracle-pathfinder/templates/deployment.yaml +++ b/als-oracle-pathfinder/templates/deployment.yaml @@ -42,6 +42,7 @@ spec: {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $ ) | nindent 8 }} {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} diff --git a/bulk-api-adapter/Chart.yaml b/bulk-api-adapter/Chart.yaml index 0f3d4af10..7a4e27d08 100644 --- a/bulk-api-adapter/Chart.yaml +++ b/bulk-api-adapter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bulk-api-adapter Helm chart for Kubernetes name: bulk-api-adapter version: 14.6.0 -appVersion: v17.0.0 +appVersion: v17.1.1 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -25,6 +25,6 @@ dependencies: condition: bulk-api-adapter-handler-notification.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/bulk-api-adapter/chart-handler-notification/Chart.yaml b/bulk-api-adapter/chart-handler-notification/Chart.yaml index 29c85ec49..6e2c289ed 100644 --- a/bulk-api-adapter/chart-handler-notification/Chart.yaml +++ b/bulk-api-adapter/chart-handler-notification/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bulk-api-adapter Handler for Notifications component Helm chart for Kubernetes name: bulk-api-adapter-handler-notification version: 14.4.0 -appVersion: v17.0.0 +appVersion: v17.1.1 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.3 tags: - moja-common diff --git a/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml b/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml index 112abbfdf..f9920d6a2 100644 --- a/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml +++ b/bulk-api-adapter/chart-handler-notification/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | 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 a9874a6c8..021ccb431 100644 --- a/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/bulk-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "bulk-api-adapter-handler-notification.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -31,6 +34,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} diff --git a/bulk-api-adapter/chart-handler-notification/values.yaml b/bulk-api-adapter/chart-handler-notification/values.yaml index cd1149ee1..1e010300c 100644 --- a/bulk-api-adapter/chart-handler-notification/values.yaml +++ b/bulk-api-adapter/chart-handler-notification/values.yaml @@ -23,6 +23,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--notification"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -31,7 +36,7 @@ diagnosticMode: enabled: false ## @param diagnosticMode.command Command to override all containers in the deployment ## - command: + command: - node - src/handlers/index.js - handler @@ -40,7 +45,7 @@ diagnosticMode: ## args: - --inspect=0.0.0.0:{{ .Values.diagnosticMode.debug.port }} - + ## @param diagnosticMode.debug config to override all debug information ## debug: @@ -341,3 +346,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/bulk-api-adapter/chart-service/Chart.yaml b/bulk-api-adapter/chart-service/Chart.yaml index d69a2a948..e14bb14b7 100644 --- a/bulk-api-adapter/chart-service/Chart.yaml +++ b/bulk-api-adapter/chart-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: bulk-api-adapter API component Helm chart for Kubernetes name: bulk-api-adapter-service version: 14.4.0 -appVersion: v17.0.0 +appVersion: v17.1.1 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/bulk-api-adapter/chart-service/templates/config-override.yaml b/bulk-api-adapter/chart-service/templates/config-override.yaml index 9d187dab7..c69750bfc 100644 --- a/bulk-api-adapter/chart-service/templates/config-override.yaml +++ b/bulk-api-adapter/chart-service/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/bulk-centralledger/Chart.yaml b/bulk-centralledger/Chart.yaml index da1a3676b..ab7485769 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -33,6 +33,6 @@ dependencies: condition: cl-handler-bulk-transfer-get.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/Chart.yaml index 2f3441f64..2bc68e98b 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/config-override.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/config-override.yaml index 76136493c..8d5b73506 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/config-override.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} 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 d1005478d..f7445288e 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-bulk-transfer-fulfil.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-fulfil/values.yaml index 572b5d0a3..b796dcb1f 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkfulfil"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/Chart.yaml index e68aaf996..87e4f8eaa 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/templates/config-override.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/templates/config-override.yaml index 387076863..d55efb279 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/templates/config-override.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} 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 19d135ab8..4d305c85d 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-get/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-bulk-transfer-get.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-get/values.yaml index f7c6c505e..0cc39c06d 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkget"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/Chart.yaml index 4b66cfce6..23d2a8933 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/config-override.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/config-override.yaml index 57c1be4fc..28c8d3617 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/config-override.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} 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 1e297f33d..fc26156c5 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/deployment.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-prepare/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-bulk-transfer-prepare.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-prepare/values.yaml index 154a16fc7..cd614c907 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--bulkprepare"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/Chart.yaml index a1c02790c..929d219ab 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/config-override.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/config-override.yaml index 0d0f3fed6..0da7b181e 100644 --- a/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/config-override.yaml +++ b/bulk-centralledger/chart-handler-bulk-transfer-processing/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml b/bulk-centralledger/chart-handler-bulk-transfer-processing/values.yaml index 81187c31c..62b13fccb 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.34 + tag: v17.9.0-iso.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/bulk-centralledger/values.yaml b/bulk-centralledger/values.yaml index a4738968e..94565804c 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.34 + tag: v17.9.0-iso.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 @@ -396,7 +396,7 @@ cl-handler-bulk-transfer-fulfil: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -767,7 +767,7 @@ cl-handler-bulk-transfer-processing: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -1147,7 +1147,7 @@ cl-handler-bulk-transfer-get: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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/centralledger/Chart.yaml b/centralledger/Chart.yaml index 33b0ce216..f364a6d39 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -49,6 +49,6 @@ dependencies: condition: centralledger-handler-transfer-get.enabled - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: ">= 3.1.3" tags: - moja-common diff --git a/centralledger/chart-handler-admin-transfer/Chart.yaml b/centralledger/chart-handler-admin-transfer/Chart.yaml index 992c957e6..813ad79ee 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.3 tags: - moja-common diff --git a/centralledger/chart-handler-admin-transfer/templates/config-override.yaml b/centralledger/chart-handler-admin-transfer/templates/config-override.yaml index 91741c1fe..fed2f1004 100644 --- a/centralledger/chart-handler-admin-transfer/templates/config-override.yaml +++ b/centralledger/chart-handler-admin-transfer/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-admin-transfer/templates/deployment.yaml b/centralledger/chart-handler-admin-transfer/templates/deployment.yaml index 573e44240..957daf964 100644 --- a/centralledger/chart-handler-admin-transfer/templates/deployment.yaml +++ b/centralledger/chart-handler-admin-transfer/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-admin-transfer.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -31,6 +34,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -46,6 +52,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} @@ -220,4 +227,4 @@ spec: items: - key: default.json path: default.json - {{- end }} \ No newline at end of file + {{- end }} diff --git a/centralledger/chart-handler-admin-transfer/values.yaml b/centralledger/chart-handler-admin-transfer/values.yaml index 0bea111bc..13b053113 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--admin"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -399,3 +404,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/centralledger/chart-handler-timeout/Chart.yaml b/centralledger/chart-handler-timeout/Chart.yaml index d99c95ab5..35388e48d 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.1 tags: - moja-common diff --git a/centralledger/chart-handler-timeout/templates/config-override.yaml b/centralledger/chart-handler-timeout/templates/config-override.yaml index 61c0bebe9..9427222eb 100644 --- a/centralledger/chart-handler-timeout/templates/config-override.yaml +++ b/centralledger/chart-handler-timeout/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-timeout/templates/deployment.yaml b/centralledger/chart-handler-timeout/templates/deployment.yaml index 0801cc5f7..91e51ca35 100644 --- a/centralledger/chart-handler-timeout/templates/deployment.yaml +++ b/centralledger/chart-handler-timeout/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-timeout.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -46,6 +49,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} diff --git a/centralledger/chart-handler-timeout/values.yaml b/centralledger/chart-handler-timeout/values.yaml index 583c0e643..edc67faca 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.34 + tag: v17.9.0-iso.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/centralledger/chart-handler-transfer-fulfil/Chart.yaml b/centralledger/chart-handler-transfer-fulfil/Chart.yaml index 3e8ac8370..ac9dc15e6 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.3 tags: - moja-common diff --git a/centralledger/chart-handler-transfer-fulfil/templates/config-override.yaml b/centralledger/chart-handler-transfer-fulfil/templates/config-override.yaml index 9be3b44af..b92920a9e 100644 --- a/centralledger/chart-handler-transfer-fulfil/templates/config-override.yaml +++ b/centralledger/chart-handler-transfer-fulfil/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml b/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml index 64e72003b..0b0639781 100644 --- a/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-fulfil/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-transfer-fulfil.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -31,6 +34,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -46,6 +52,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} @@ -220,4 +227,4 @@ spec: items: - key: default.json path: default.json - {{- end }} \ No newline at end of file + {{- end }} diff --git a/centralledger/chart-handler-transfer-fulfil/values.yaml b/centralledger/chart-handler-transfer-fulfil/values.yaml index c10614561..d7124c058 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--fulfil"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -402,3 +407,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/centralledger/chart-handler-transfer-get/Chart.yaml b/centralledger/chart-handler-transfer-get/Chart.yaml index 5636b0df4..b46ff5e7b 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.3 tags: - moja-common diff --git a/centralledger/chart-handler-transfer-get/templates/config-override.yaml b/centralledger/chart-handler-transfer-get/templates/config-override.yaml index 988b088cb..11c8c63cb 100644 --- a/centralledger/chart-handler-transfer-get/templates/config-override.yaml +++ b/centralledger/chart-handler-transfer-get/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-transfer-get/templates/deployment.yaml b/centralledger/chart-handler-transfer-get/templates/deployment.yaml index a47b1c6cf..0e7bebc17 100644 --- a/centralledger/chart-handler-transfer-get/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-get/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-transfer-get.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -31,6 +34,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -46,6 +52,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} @@ -224,4 +231,4 @@ spec: items: - key: default.json path: default.json - {{- end }} \ No newline at end of file + {{- end }} diff --git a/centralledger/chart-handler-transfer-get/values.yaml b/centralledger/chart-handler-transfer-get/values.yaml index 2433ca42b..18402843e 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--get"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -399,3 +404,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/centralledger/chart-handler-transfer-position-batch/Chart.yaml b/centralledger/chart-handler-transfer-position-batch/Chart.yaml index dbee63ad2..edfdac36c 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.3 tags: - moja-common diff --git a/centralledger/chart-handler-transfer-position-batch/templates/config-override.yaml b/centralledger/chart-handler-transfer-position-batch/templates/config-override.yaml index eecb366f6..002e32b6c 100644 --- a/centralledger/chart-handler-transfer-position-batch/templates/config-override.yaml +++ b/centralledger/chart-handler-transfer-position-batch/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml b/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml index f78f5cbb1..d3cd7dc11 100644 --- a/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-position-batch/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-transfer-position-batch.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -31,6 +34,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -46,6 +52,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} @@ -220,4 +227,4 @@ spec: items: - key: default.json path: default.json - {{- end }} \ No newline at end of file + {{- end }} diff --git a/centralledger/chart-handler-transfer-position-batch/values.yaml b/centralledger/chart-handler-transfer-position-batch/values.yaml index 3dcb50fec..8c38cf765 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.34 + tag: v17.9.0-iso.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 @@ -29,6 +29,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--positionbatch"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -407,3 +412,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/centralledger/chart-handler-transfer-position/Chart.yaml b/centralledger/chart-handler-transfer-position/Chart.yaml index f400a2c8d..2474838d3 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.3 tags: - moja-common diff --git a/centralledger/chart-handler-transfer-position/templates/config-override.yaml b/centralledger/chart-handler-transfer-position/templates/config-override.yaml index 97350c918..4874fba28 100644 --- a/centralledger/chart-handler-transfer-position/templates/config-override.yaml +++ b/centralledger/chart-handler-transfer-position/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-transfer-position/templates/deployment.yaml b/centralledger/chart-handler-transfer-position/templates/deployment.yaml index e49536cf1..7f7bde54c 100644 --- a/centralledger/chart-handler-transfer-position/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-position/templates/deployment.yaml @@ -19,6 +19,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-transfer-position.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -31,6 +34,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -46,6 +52,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} @@ -220,4 +227,4 @@ spec: items: - key: default.json path: default.json - {{- end }} \ No newline at end of file + {{- end }} diff --git a/centralledger/chart-handler-transfer-position/values.yaml b/centralledger/chart-handler-transfer-position/values.yaml index 516aceee5..53e722a6a 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--position"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -399,3 +404,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/centralledger/chart-handler-transfer-prepare/Chart.yaml b/centralledger/chart-handler-transfer-prepare/Chart.yaml index fdc8f26b7..010a3b8ce 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.3 tags: - moja-common diff --git a/centralledger/chart-handler-transfer-prepare/templates/config-override.yaml b/centralledger/chart-handler-transfer-prepare/templates/config-override.yaml index 2024630bd..84cc3b296 100644 --- a/centralledger/chart-handler-transfer-prepare/templates/config-override.yaml +++ b/centralledger/chart-handler-transfer-prepare/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml b/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml index 3e8397b9e..42a1506f2 100644 --- a/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml +++ b/centralledger/chart-handler-transfer-prepare/templates/deployment.yaml @@ -14,6 +14,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "centralledger-handler-transfer-prepare.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -26,6 +29,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -45,6 +51,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} diff --git a/centralledger/chart-handler-transfer-prepare/values.yaml b/centralledger/chart-handler-transfer-prepare/values.yaml index 908975330..aec161acf 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.34 + tag: v17.9.0-iso.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 @@ -27,6 +27,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--prepare"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -405,3 +410,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/centralledger/chart-service/Chart.yaml b/centralledger/chart-service/Chart.yaml index 0a21ab984..efac82026 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.34 +appVersion: v17.9.0-iso.16 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 2.0.0 + version: 3.1.2 tags: - moja-common diff --git a/centralledger/chart-service/templates/config-override.yaml b/centralledger/chart-service/templates/config-override.yaml index 458a0ec38..00ed026ab 100644 --- a/centralledger/chart-service/templates/config-override.yaml +++ b/centralledger/chart-service/templates/config-override.yaml @@ -9,8 +9,10 @@ metadata: app.kubernetes.io/version: {{ .Chart.Version }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + annotations: + helm.sh/hook: pre-install,pre-upgrade data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralledger/chart-service/templates/config.yaml b/centralledger/chart-service/templates/config.yaml index 6d59c7d45..388ccc96d 100644 --- a/centralledger/chart-service/templates/config.yaml +++ b/centralledger/chart-service/templates/config.yaml @@ -8,6 +8,8 @@ metadata: app.kubernetes.io/version: {{ .Chart.Version }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + annotations: + helm.sh/hook: pre-install,pre-upgrade data: default.json: {{ (tpl (.Files.Get "configs/default.json") . ) | quote }} knexfile.js: {{ (tpl (.Files.Get "configs/knexfile.js") . ) | quote }} diff --git a/centralledger/chart-service/templates/deployment.yaml b/centralledger/chart-service/templates/deployment.yaml index a53f5beee..f4a13ff9a 100644 --- a/centralledger/chart-service/templates/deployment.yaml +++ b/centralledger/chart-service/templates/deployment.yaml @@ -45,6 +45,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} diff --git a/centralledger/chart-service/templates/migration-job.yaml b/centralledger/chart-service/templates/migration-job.yaml new file mode 100644 index 000000000..22eeaeef2 --- /dev/null +++ b/centralledger/chart-service/templates/migration-job.yaml @@ -0,0 +1,96 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ template "centralledger-service.fullname" . }}-migration + labels: + batch.kubernetes.io/job-name: {{ template "centralledger-service.fullname" . }}-migration + job-name: {{ template "centralledger-service.fullname" . }}-migration + annotations: +{{- with .Values.migration.annotations }} + {{ toYaml .| indent 4 | trim }} +{{- end }} +spec: + backoffLimit: {{ .Values.migration.backoffLimit }} + template: + metadata: + labels: + batch.kubernetes.io/job-name: {{ template "centralledger-service.fullname" . }}-migration + job-name: {{ template "centralledger-service.fullname" . }}-migration + spec: + restartPolicy: {{ .Values.migration.restartPolicy }} + initContainers: + - name: wait-for-mysql + image: mysql:9.0.1 + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - | + until mysql -h ${DB_HOST} -P ${DB_PORT} -u ${DB_USER} --password=${DB_PASSWORD} ${DB_DATABASE} -e 'select version()' ; + do + echo --------------------; + echo Waiting for MySQL...; + sleep 2; + done; + echo ====================; + echo MySQL ok!; + env: + - name: DB_HOST + value: '{{ .Values.config.db_host }}' + - name: DB_PORT + value: '{{ .Values.config.db_port }}' + - name: DB_USER + value: '{{ .Values.config.db_user }}' + - name: DB_PASSWORD + {{- if .Values.config.db_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.db_secret.name }}' + key: '{{ .Values.config.db_secret.key }}' + {{- else }} + value: {{ .Values.config.db_password }} + {{- end }} + - name: DB_DATABASE + value: '{{ .Values.config.db_database }}' + containers: + - name: run-migration + image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' + imagePullPolicy: IfNotPresent + command: + - sh + - -c + - npm run migrate + env: + - name: CLEDG_MIGRATIONS__RUN_DATA_MIGRATIONS + value: 'true' + - name: CLEDG_DATABASE__PASSWORD + {{- if .Values.config.db_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.db_secret.name }}' + key: '{{ .Values.config.db_secret.key }}' + {{- else }} + value: {{ .Values.config.db_password }} + {{- end }} + volumeMounts: + - name: '{{ template "centralledger-service.fullname" . }}-config-volume' + mountPath: /opt/app/config +{{- range $fileName, $fileContents := .Values.configOverride }} + - name: config-override-volume + mountPath: /opt/app/{{ $fileName }} + subPath: {{ $fileName | replace "/" "-" }} +{{- end }} + volumes: +{{- if .Values.configOverride }} + - name: config-override-volume + configMap: + name: {{ template "centralledger-service.fullname" . }}-config-override +{{- end }} + - name: {{ template "centralledger-service.fullname" . }}-config-volume + configMap: + name: {{ template "centralledger-service.fullname" . }}-config + items: + - key: default.json + path: default.json + - key: knexfile.js + path: knexfile.js diff --git a/centralledger/chart-service/values.yaml b/centralledger/chart-service/values.yaml index 9ca5f673e..f3c152bb4 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.34 + tag: v17.9.0-iso.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 @@ -268,29 +268,6 @@ initContainers: | {{- end }} - name: DB_DATABASE value: '{{ .Values.config.db_database }}' - - name: run-migration - image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' - imagePullPolicy: IfNotPresent - command: - - sh - - -c - - npm run migrate - env: - - name: CLEDG_MIGRATIONS__RUN_DATA_MIGRATIONS - value: 'true' - - name: CLEDG_DATABASE__PASSWORD - {{- if .Values.config.db_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.db_secret.name }}' - key: '{{ .Values.config.db_secret.key }}' - {{- else }} - value: {{ .Values.config.db_password }} - {{- end }} - volumeMounts: - - name: '{{ template "centralledger-service.fullname" . }}-config-volume' - mountPath: /opt/app/config - ## @param master.podLabels Extra labels for pod(s) ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ ## @@ -402,3 +379,9 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +migration: + restartPolicy: OnFailure + backoffLimit: 1 + annotations: + helm.sh/hook: pre-install,pre-upgrade diff --git a/centralledger/values.yaml b/centralledger/values.yaml index c9bba36a8..904a473e2 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.34 + tag: v17.9.0-iso.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 @@ -285,28 +285,6 @@ centralledger-service: {{- end }} - name: DB_DATABASE value: '{{ .Values.config.db_database }}' - - name: run-migration - image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' - imagePullPolicy: IfNotPresent - command: - - sh - - -c - - npm run migrate - env: - - name: CLEDG_MIGRATIONS__RUN_DATA_MIGRATIONS - value: 'true' - - name: CLEDG_DATABASE__PASSWORD - {{- if .Values.config.db_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.db_secret.name }}' - key: '{{ .Values.config.db_secret.key }}' - {{- else }} - value: {{ .Values.config.db_password }} - {{- end }} - volumeMounts: - - name: '{{ template "centralledger-service.fullname" . }}-config-volume' - mountPath: /opt/app/config service: internalPort: 3001 @@ -431,7 +409,7 @@ centralledger-handler-transfer-prepare: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -849,7 +827,7 @@ centralledger-handler-transfer-position: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -1261,7 +1239,7 @@ centralledger-handler-transfer-position-batch: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -1679,7 +1657,7 @@ centralledger-handler-transfer-get: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -2091,7 +2069,7 @@ centralledger-handler-transfer-fulfil: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -2506,7 +2484,7 @@ centralledger-handler-timeout: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -2926,7 +2904,7 @@ centralledger-handler-admin-transfer: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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/centralsettlement/Chart.yaml b/centralsettlement/Chart.yaml index e763c839c..5b5587eb3 100644 --- a/centralsettlement/Chart.yaml +++ b/centralsettlement/Chart.yaml @@ -37,6 +37,6 @@ dependencies: condition: centralsettlement-handler-rules.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 2.0.0 + version: 3.1.1 tags: - moja-common diff --git a/centralsettlement/chart-service/Chart.yaml b/centralsettlement/chart-service/Chart.yaml index caa8c0395..7b8e030be 100644 --- a/centralsettlement/chart-service/Chart.yaml +++ b/centralsettlement/chart-service/Chart.yaml @@ -20,4 +20,4 @@ dependencies: repository: "https://mojaloop.github.io/charts/repo" tags: - moja-common - version: 2.0.0 + version: 3.1.1 diff --git a/centralsettlement/chart-service/templates/config-override.yaml b/centralsettlement/chart-service/templates/config-override.yaml index 3c2c110b8..4d9e71638 100644 --- a/centralsettlement/chart-service/templates/config-override.yaml +++ b/centralsettlement/chart-service/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/centralsettlement/chart-service/templates/deployment.yaml b/centralsettlement/chart-service/templates/deployment.yaml index 3b882c75d..864a0bc97 100644 --- a/centralsettlement/chart-service/templates/deployment.yaml +++ b/centralsettlement/chart-service/templates/deployment.yaml @@ -47,6 +47,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} 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/example-mojaloop-backend/values.yaml b/example-mojaloop-backend/values.yaml index 8b1bc3fad..2f585f9c4 100644 --- a/example-mojaloop-backend/values.yaml +++ b/example-mojaloop-backend/values.yaml @@ -9,31 +9,6 @@ kafka: fullnameOverride: "kafka" - listeners: - client: - protocol: PLAINTEXT - controller: - protocol: PLAINTEXT - interbroker: - protocol: PLAINTEXT - external: - protocol: PLAINTEXT - - extraConfig: |- - offsets.topic.replication.factor=1 - default.replication.factor=1 - transaction.state.log.replication.factor=1 - - controller: - replicaCount: 1 - persistence: - enabled: false - logPersistence: - enabled: false - broker: - persistence: - enabled: false - listeners: client: protocol: PLAINTEXT @@ -214,6 +189,10 @@ mysql: value: "auth_svc" - name: AUTH_SVC_USER value: "auth_svc" + - name: MSISDN_ORACLE_DATABASE + value: "oracle_msisdn" + - name: MSISDN_ORACLE_USER + value: "oracle_msisdn" ## @param initdbScripts Dictionary of initdb scripts ## Specify dictionary of scripts to be run at first boot @@ -268,6 +247,22 @@ mysql: FLUSH PRIVILEGES;" echo "******* Database '$DB_NAME' config complete *******" + msisdnOracleInit.sh: | + #!/bin/bash + set -e + DB_NAME=$MSISDN_ORACLE_DATABASE + DB_USER=$MSISDN_ORACLE_USER + DB_PASS=$MYSQL_PASSWORD + echo "******* Creating '$DB_NAME' DB with user '$DB_USER' *******" + mysql -u root -p$MYSQL_ROOT_PASSWORD -e \ + "DROP DATABASE IF EXISTS $DB_NAME; + CREATE DATABASE $DB_NAME; + DROP USER IF EXISTS $DB_USER@'%'; + CREATE USER '$DB_USER'@'%' IDENTIFIED WITH mysql_native_password BY '$DB_PASS'; + GRANT ALL PRIVILEGES ON $DB_NAME.* TO '$DB_USER'@'%'; + FLUSH PRIVILEGES;" + echo "******* Database '$DB_NAME' config complete *******" + authSvcInit.sh: |- #!/bin/bash set -e @@ -340,6 +335,11 @@ cl-mongodb: ## @param persistence.enabled Enable MongoDB(®) data persistence using PVC ## enabled: false + + # Enable for Apple Silicon + # extraEnvVars: + # - name: EXPERIMENTAL_DOCKER_DESKTOP_FORCE_QEMU + # value: "1" ## Reference: https://github.com/bitnami/charts/blob/main/bitnami/mongodb/values.yaml cep-mongodb: @@ -398,6 +398,11 @@ cep-mongodb: ## @param persistence.enabled Enable MongoDB(®) data persistence using PVC ## enabled: false + + # Enable for Apple Silicon + # extraEnvVars: + # - name: EXPERIMENTAL_DOCKER_DESKTOP_FORCE_QEMU + # value: "1" ## Reference: https://github.com/bitnami/charts/blob/main/bitnami/mongodb/values.yaml ttk-mongodb: @@ -450,6 +455,12 @@ ttk-mongodb: ## @param persistence.enabled Enable MongoDB(®) data persistence using PVC ## enabled: false + + # Enable for Apple Silicon + # extraEnvVars: + # - name: EXPERIMENTAL_DOCKER_DESKTOP_FORCE_QEMU + # value: "1" + ## Reference: https://github.com/bitnami/charts/blob/main/bitnami/redis/values.yaml ttksims-redis: diff --git a/inter-scheme-proxy-adapter/Chart.yaml b/inter-scheme-proxy-adapter/Chart.yaml new file mode 100644 index 000000000..a7a251a39 --- /dev/null +++ b/inter-scheme-proxy-adapter/Chart.yaml @@ -0,0 +1,16 @@ +apiVersion: v2 +version: 1.0.0 +appVersion: "1.0.0" +description: Helm chart for Inter Scheme Proxy Adapter +name: inter-scheme-proxy-adapter +maintainers: + - name: Steven Oderayi + email: steven.oderayi@infitx.com + - name: Vijaya Kumar Guthi + email: vijaya.guthi@infitx.com +dependencies: + - name: common + repository: "https://mojaloop.github.io/charts/repo" + version: ">= 3.1.3" + tags: + - moja-common diff --git a/inter-scheme-proxy-adapter/templates/NOTES.txt b/inter-scheme-proxy-adapter/templates/NOTES.txt new file mode 100644 index 000000000..d815f2aab --- /dev/null +++ b/inter-scheme-proxy-adapter/templates/NOTES.txt @@ -0,0 +1,28 @@ +** Please be patient while the chart is being deployed ** + +{{- if .Values.diagnosticMode.enabled }} +The chart has been deployed in diagnostic mode. All probes have been disabled and the command has been overwritten with: + + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 4 }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 4 }} + +Get the list of pods by executing: + + kubectl get pods --namespace {{ .Release.Namespace }} -l app.kubernetes.io/instance={{ .Release.Name }} + +Access the pod you want to debug by executing + + kubectl exec --namespace {{ .Release.Namespace }} -ti -- bash + +In order to replicate the container startup scripts execute this command: + + %%ENTRYPOINT and CMD from main container%% + +{{- else }} + +%%Instructions to access the application depending on the serviceType and other considerations%% + +{{- end }} + +{{- include "common.warnings.rollingTag" .Values.image }} +{{- include "inter-scheme-proxy-adapter.validateValues" . }} diff --git a/inter-scheme-proxy-adapter/templates/_helpers.tpl b/inter-scheme-proxy-adapter/templates/_helpers.tpl new file mode 100644 index 000000000..57b19a149 --- /dev/null +++ b/inter-scheme-proxy-adapter/templates/_helpers.tpl @@ -0,0 +1,46 @@ +{{/* vim: set filetype=mustache: */}} + +{{/* +Return the proper main image name +*/}} +{{- define "inter-scheme-proxy-adapter.image" -}} +{{ include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) }} +{{- end -}} + +{{/* +Return the proper image name (for the init container volume-permissions image) +*/}} +{{- define "inter-scheme-proxy-adapter.volumePermissions.image" -}} +{{- include "common.images.image" ( dict "imageRoot" .Values.volumePermissions.image "global" .Values.global ) -}} +{{- end -}} + +{{/* +Return the proper Docker Image Registry Secret Names +*/}} +{{- define "inter-scheme-proxy-adapter.imagePullSecrets" -}} +{{- include "common.images.pullSecrets" (dict "images" (list .Values.image) "global" .Values.global) -}} +{{- end -}} + +{{/* +Create the name of the service account to use +*/}} +{{- define "inter-scheme-proxy-adapter.serviceAccountName" -}} +{{- if .Values.serviceAccount.create -}} + {{ default (printf "%s" (include "common.names.fullname" .)) .Values.serviceAccount.name }} +{{- else -}} + {{ default "default" .Values.serviceAccount.name }} +{{- end -}} +{{- end -}} + +{{/* +Compile all warnings into a single message. +*/}} +{{- define "inter-scheme-proxy-adapter.validateValues" -}} +{{- $messages := list -}} +{{- $messages := without $messages "" -}} +{{- $message := join "\n" $messages -}} + +{{- if $message -}} +{{- printf "\nVALUES VALIDATION:\n%s" $message -}} +{{- end -}} +{{- end -}} diff --git a/inter-scheme-proxy-adapter/templates/deployment.yaml b/inter-scheme-proxy-adapter/templates/deployment.yaml new file mode 100644 index 000000000..7d710c436 --- /dev/null +++ b/inter-scheme-proxy-adapter/templates/deployment.yaml @@ -0,0 +1,123 @@ +apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} +kind: Deployment +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + # Common annotations + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} + app.kubernetes.io/component: {{ .Chart.Name }} + template: + metadata: + annotations: + checksum/config: {{ .Values.env | toString | sha256sum }} + {{- if .Values.podAnnotations }} + {{- include "common.tplvalues.render" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.enabled }} + prometheus.io/port: {{ include "common.tplvalues.render" (dict "value" .Values.metrics.config.port "context" $) | quote }} + prometheus.io/scrape: "true" + {{- end }} + labels: {{- include "common.labels.standard" . | nindent 8 }} + app.kubernetes.io/component: {{ .Chart.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + {{- if .Values.podLabels }} + {{- include "common.tplvalues.render" (dict "value" .Values.podLabels "context" $) | nindent 8 }} + {{- end }} + spec: + serviceAccountName: {{ template "inter-scheme-proxy-adapter.serviceAccountName" . }} + {{- include "inter-scheme-proxy-adapter.imagePullSecrets" . | nindent 6 }} + {{- if .Values.hostAliases }} + hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.affinity }} + affinity: {{- include "common.tplvalues.render" ( dict "value" .Values.affinity "context" $) | nindent 8 }} + {{- else }} + affinity: + podAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAffinityPreset "component" "inter-scheme-proxy-adapter" "context" $) | nindent 10 }} + podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "component" "inter-scheme-proxy-adapter" "context" $) | nindent 10 }} + nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }} + {{- end }} + {{- if .Values.nodeSelector }} + nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.nodeSelector "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.tolerations }} + tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.tolerations "context" .) | nindent 8 }} + {{- end }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} + {{- if .Values.podSecurityContext.enabled }} + securityContext: {{- omit .Values.podSecurityContext "enabled" | toYaml | nindent 8 }} + {{- end }} + initContainers: + {{- if .Values.initContainers }} + {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} + {{- end }} + containers: + - name: {{ .Chart.Name }} + image: {{ template "inter-scheme-proxy-adapter.image" . }} + imagePullPolicy: {{ .Values.image.pullPolicy }} + {{- if .Values.containerSecurityContext.enabled }} + securityContext: {{- omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }} + {{- else if .Values.command }} + command: {{- include "common.tplvalues.render" (dict "value" .Values.command "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }} + {{- else if .Values.args }} + args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} + {{- end }} + ports: + {{- if (hasKey .Values.service "internalPort") }} + - name: http + containerPort: {{ .Values.service.internalPort }} + {{- end }} + {{- if (hasKey .Values.env "INBOUND_LISTEN_PORT_A") }} + - name: inboundapia + containerPort: {{ .Values.env.INBOUND_LISTEN_PORT_A }} + protocol: TCP + {{- end }} + {{- if (hasKey .Values.env "INBOUND_LISTEN_PORT_B") }} + - name: inboundapib + containerPort: {{ .Values.env.INBOUND_LISTEN_PORT_B }} + protocol: TCP + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + - name: debug + containerPort: {{ .Values.diagnosticMode.debug.internalPort }} + {{- end }} + {{- if .Values.readinessProbe.enabled }} + readinessProbe: + {{- include "common.tplvalues.render" (dict "value" .Values.readinessProbe "context" $) | nindent 12 }} + {{- end }} + {{- if .Values.livenessProbe.enabled }} + livenessProbe: + {{- include "common.tplvalues.render" (dict "value" .Values.livenessProbe "context" $) | nindent 12 }} + {{- end }} + env: + {{- range $k, $v := .Values.env }} + - name: {{ $k }} + value: {{ if eq (typeOf $v) "string" }}{{ $v | replace "$release_name" $.Release.Name | quote }}{{ else }}{{ $v | quote }}{{ end }} + {{- end }} + {{- range $k, $v := .Values.envFromSecrets }} + - name: {{ $k }} + valueFrom: + secretKeyRef: + name: {{ $v.secret.name }} + key: {{ $v.secret.key | quote }} + {{- end }} diff --git a/inter-scheme-proxy-adapter/templates/ingress.yaml b/inter-scheme-proxy-adapter/templates/ingress.yaml new file mode 100644 index 000000000..f17c032d6 --- /dev/null +++ b/inter-scheme-proxy-adapter/templates/ingress.yaml @@ -0,0 +1,63 @@ +{{- if .Values.ingress.enabled }} +apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }} +kind: Ingress +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + {{- if or .Values.ingress.annotations .Values.commonAnnotations .Values.ingress.certManager }} + annotations: + {{- if .Values.ingress.certManager }} + kubernetes.io/tls-acme: "true" + {{- end }} + {{- if .Values.ingress.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.ingress.annotations "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.22-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + rules: + {{- if .Values.ingress.hostname }} + - host: {{ .Values.ingress.hostname }} + http: + paths: + {{- if .Values.ingress.extraPaths }} + {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraPaths "context" $) | nindent 10 }} + {{- end }} + - path: {{ .Values.ingress.path }} + {{- if eq "true" (include "common.ingress.supportsPathType" .) }} + pathType: {{ .Values.ingress.pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }} + {{- end }} + {{- range .Values.ingress.extraHosts }} + - host: {{ .name | quote }} + http: + paths: + - path: {{ default "/" .path }} + {{- if eq "true" (include "common.ingress.supportsPathType" $) }} + pathType: {{ default "ImplementationSpecific" .pathType }} + {{- end }} + backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $) | nindent 14 }} + {{- end }} + {{- if or (and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned)) .Values.ingress.extraTls }} + tls: + {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }} + - hosts: + - {{ .Values.ingress.hostname | quote }} + secretName: {{ printf "%s-tls" .Values.ingress.hostname }} + {{- end }} + {{- if .Values.ingress.extraTls }} + {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }} + {{- end }} + {{- end }} +{{- end }} diff --git a/inter-scheme-proxy-adapter/templates/service.yaml b/inter-scheme-proxy-adapter/templates/service.yaml new file mode 100644 index 000000000..b91aa0f3f --- /dev/null +++ b/inter-scheme-proxy-adapter/templates/service.yaml @@ -0,0 +1,65 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} + labels: {{- include "common.labels.standard" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} + app.kubernetes.io/version: {{ .Chart.Version }} + {{- if .Values.commonLabels }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} + {{- end }} + annotations: + {{- if .Values.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.service.type }} + {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }} + clusterIP: {{ .Values.service.clusterIP }} + {{- end }} + {{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerSourceRanges)) }} + loadBalancerSourceRanges: {{ .Values.service.loadBalancerSourceRanges }} + {{- end }} + {{- if and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP)) }} + loadBalancerIP: {{ .Values.service.loadBalancerIP }} + {{- end }} + {{- if .Values.service.sessionAffinity }} + sessionAffinity: {{ .Values.service.sessionAffinity }} + {{- end }} + {{- if .Values.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.sessionAffinityConfig "context" $) | nindent 4 }} + {{- end }} + ports: + {{- if (hasKey .Values.service "internalPort") }} + - name: http + port: {{ .Values.service.port }} + targetPort: {{ .Values.service.internalPort }} + protocol: TCP + {{- end }} + {{- if (hasKey .Values.env "INBOUND_LISTEN_PORT_A") }} + - port: {{ .Values.env.INBOUND_LISTEN_PORT_A }} + protocol: TCP + name: inboundapia + targetPort: inboundapia + {{- end }} + {{- if (hasKey .Values.env "INBOUND_LISTEN_PORT_B") }} + - port: {{ .Values.env.INBOUND_LISTEN_PORT_B }} + protocol: TCP + name: inboundapib + targetPort: inboundapib + {{- end }} + {{- if .Values.diagnosticMode.enabled }} + - name: debug + port: {{ .Values.diagnosticMode.debug.port }} + targetPort: {{ .Values.diagnosticMode.debug.internalPort }} + protocol: TCP + {{- end }} + selector: {{- include "common.labels.matchLabels" . | nindent 4 }} + app.kubernetes.io/component: {{ .Chart.Name }} diff --git a/inter-scheme-proxy-adapter/values.yaml b/inter-scheme-proxy-adapter/values.yaml new file mode 100644 index 000000000..f1508a1c6 --- /dev/null +++ b/inter-scheme-proxy-adapter/values.yaml @@ -0,0 +1,396 @@ +# Default values for inter-scheme-proxy-adapter. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +# @section Global parameters +## Global Docker image parameters +## Please, note that this will override the image parameters, including dependencies, configured to use the global value +## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass + +## @param global.imageRegistry Global Docker image registry +## @param global.imagePullSecrets Global Docker registry secret names as an array +## @param global.storageClass Global StorageClass for Persistent Volume(s) +## +global: {} + +config: {} + +envFromSecrets: +# OAUTH_CLIENT_KEY_A: +# secret: +# name: some-secret-name +# key: OAUTH_CLIENT_KEY_A +# OAUTH_CLIENT_SECRET_A: +# secret: +# name: some-secret-name +# key: OAUTH_CLIENT_SECRET_A + +env: + LOG_LEVEL: info + + METRICS_SERVER_LISTEN_PORT: 4004 + + # Port number that the inbound (FSPIOP API) HTTP servers A & B will listen on + INBOUND_LISTEN_PORT_A: 4000 + INBOUND_LISTEN_PORT_B: 4100 + + # Enable mutual TLS authentication. Useful when not running in a secure + # environment, i.e. when you're running it locally against your own implementation. + OUTBOUND_MUTUAL_TLS_ENABLED_A: false + OUTBOUND_MUTUAL_TLS_ENABLED_B: false + + # Location of certs and keys required for TLS + # OUT_CA_CERT_PATH_A:./secrets/cacert_a.pem + # OUT_CLIENT_CERT_PATH_A:./secrets/servercert_a.pem + # OUT_CLIENT_KEY_PATH_A:./secrets/serverkey_a.pem + # OUT_CA_CERT_PATH_B:./secrets/cacert_b.pem + # OUT_CLIENT_CERT_PATH_B:./secrets/servercert_b.pem + # OUT_CLIENT_KEY_PATH_B:./secrets/serverkey_b.pem + + # SWITCH ENDPOINTS + PEER_ENDPOINT_A: $release_name-ml-testing-toolkit-backend:4040 + PEER_ENDPOINT_B: $release_name-ml-testing-toolkit-backend:4040 + + # Participant ID of this Proxy + PROXY_ID: "proxyispa" + + # OAuth2 data used to obtain bearer token + # Use envFromSecrets instead when secret is stored as k8s secret + OAUTH_TOKEN_ENDPOINT_A: http://localhost:8080/openid-connect/token + OAUTH_CLIENT_KEY_A: dfsp-jwt + OAUTH_CLIENT_SECRET_A: secretA + OAUTH_REFRESH_SECONDS_A: 3600 + + OAUTH_TOKEN_ENDPOINT_B: http://localhost:8080/openid-connect/token + OAUTH_CLIENT_KEY_B: dfsp-jwt + OAUTH_CLIENT_SECRET_B: secretB + OAUTH_REFRESH_SECONDS_B: 3600 + + # Management API websocket connection settings. + # The Management API uses this for exchanging connector management messages. + MGMT_API_WS_URL_A: 127.0.0.1 + MGMT_API_WS_PORT_A: 4005 + + MGMT_API_WS_URL_B: 127.0.0.1 + MGMT_API_WS_PORT_B: 4105 + + # Set to true to enable the use of PM4ML-related services e.g MCM, Management API service + PM4ML_ENABLED: false + + # Interval to check peer JWS changes in milliseconds. This is fail safe mechanism, so the value can be high. + CHECK_PEER_JWS_INTERVAL: 1800000 + +podAffinityPreset: "" +## @param podAntiAffinityPreset Pod anti-affinity preset. Ignored if `main.affinity` is set. Allowed values: `soft` or `hard` +## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity +## +podAntiAffinityPreset: soft +## Node affinity preset +## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity +## + +nodeAffinityPreset: + ## @param nodeAffinityPreset.type Node affinity preset type. Ignored if `main.affinity` is set. Allowed values: `soft` or `hard` + ## + type: "" + ## @param nodeAffinityPreset.key Node label key to match. Ignored if `main.affinity` is set + ## + key: "" + ## @param nodeAffinityPreset.values Node label values to match. Ignored if `main.affinity` is set + ## E.g. + ## values: + ## - e2e-az1 + ## - e2e-az2 + ## + values: [] +## @param affinity Affinity for %%MAIN_CONTAINER_NAME%% pods assignment +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity +## NOTE: `podAffinityPreset`, `main.podAntiAffinityPreset`, and `main.nodeAffinityPreset` will be ignored when it's set +## + +## Pod scheduling preferences. +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity +affinity: {} + +## Node labels for pod assignment +## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector +nodeSelector: {} + +## Set toleration for scheduler +## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ +tolerations: [] + +## Configure Pods Security Context +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod +## @param podSecurityContext.enabled Enabled %%MAIN_CONTAINER_NAME%% pods' Security Context +## @param podSecurityContext.fsGroup Set %%MAIN_CONTAINER_NAME%% pod's Security Context fsGroup +## +podSecurityContext: + enabled: true + fsGroup: 1001 +## Configure Container Security Context +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod +## @param containerSecurityContext.enabled Enabled %%MAIN_CONTAINER_NAME%% containers' Security Context +## @param containerSecurityContext.runAsUser Set %%MAIN_CONTAINER_NAME%% containers' Security Context runAsUser +## +containerSecurityContext: + enabled: true + runAsUser: 1001 + +image: + registry: docker.io + repository: mojaloop/inter-scheme-proxy-adapter + tag: v1.3.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 + ## + pullPolicy: IfNotPresent + ## Optionally specify an array of imagePullSecrets. + ## Secrets must be manually created in the namespace. + ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ + ## e.g: + ## pullSecrets: + ## - myRegistryKeySecretName + ## + pullSecrets: [] + +replicaCount: 1 +command: + - npm + - start + + +## Enable diagnostic mode in the deployment +## +diagnosticMode: + ## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden) + ## + enabled: false + ## @param diagnosticMode.command Command to override all containers in the deployment + ## + command: + - yarn + - start + ## @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: + internalPort: 9229 + port: 9229 + +## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) +## ref: https://kubernetes.io/docs/concepts/workloads/pods/init-containers/ +## e.g: +## initContainers: +## - name: your-image-name +## image: your-image +## imagePullPolicy: Always +## command: ['sh', '-c', 'echo "hello world"'] +## +initContainers: [] + +readinessProbe: + enabled: true + httpGet: + path: /health + port: 4000 + initialDelaySeconds: 15 + periodSeconds: 15 +livenessProbe: + enabled: true + httpGet: + path: /health + port: 4000 + initialDelaySeconds: 15 + periodSeconds: 15 + +metrics: + enabled: false + config: + timeout: 5000 + port: 4004 + prefix: moja_ + defaultLabels: + serviceName: inter-scheme-proxy-adapter + +## @param master.podLabels Extra labels for pod(s) +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ +## +podLabels: {} + +## @param podAnnotations Additional custom annotations for pod(s) +## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ +## +podAnnotations: {} + +service: + ## Not used by the inter-scheme-proxy-adapter + # internalPort: 3000 + ## @param service.type %%MAIN_CONTAINER_NAME%% service type + ## + type: ClusterIP + ## @param service.port %%MAIN_CONTAINER_NAME%% service HTTP port + ## + port: 80 + ## @param service.clusterIP %%MAIN_CONTAINER_NAME%% service Cluster IP + ## e.g.: + ## clusterIP: None + ## + clusterIP: + ## @param service.loadBalancerIP %%MAIN_CONTAINER_NAME%% service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer + ## + loadBalancerIP: + ## @param service.loadBalancerSourceRanges %%MAIN_CONTAINER_NAME%% service Load Balancer sources + ## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service + ## e.g: + ## loadBalancerSourceRanges: + ## - 10.10.10.0/24 + ## + loadBalancerSourceRanges: [] + ## @param service.externalTrafficPolicy %%MAIN_CONTAINER_NAME%% service external traffic policy + ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip + ## + externalTrafficPolicy: Cluster + ## @param service.annotations Additional custom annotations for %%MAIN_CONTAINER_NAME%% service + ## + annotations: {} + ## @param master.service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param master.service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} + +ingress: + ## @param ingress.enabled Enable ingress record generation for %%MAIN_CONTAINER_NAME%% + ## + enabled: true + ## @param ingress.pathType Ingress path type + ## + pathType: ImplementationSpecific + ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set) + ## + apiVersion: + ## @param ingress.hostname Default host for the ingress record + ## + hostname: inter-scheme-proxy-adapter.local + ## @param ingress.path Default path for the ingress record + ## NOTE: You may need to set this to '/*' in order to use this with ALB ingress controllers + ## + path: / + ## @param ingress.annotations Additional custom annotations for the ingress record + ## NOTE: If `ingress.certManager=true`, annotation `kubernetes.io/tls-acme: "true"` will automatically be added + ## + annotations: {} + ## Example annotations for ingress class and rewrite-targets + ## https://kubernetes.github.io/ingress-nginx/examples/rewrite/ + # nginx.ingress.kubernetes.io/rewrite-target: '/' + # nginx.ingress.kubernetes.io/rewrite-target: '/$2' + ## https://kubernetes.github.io/ingress-nginx/user-guide/multiple-ingress/ + # kubernetes.io/ingress.class: nginx + ## https://kubernetes.github.io/ingress-nginx/user-guide/tls/#automated-certificate-management-with-kube-lego + # kubernetes.io/tls-acme: "true"" + + ## @param ingress.tls Enable TLS configuration for the host defined at `ingress.hostname` parameter + ## TLS certificates will be retrieved from a TLS secret with name: `{{- printf "%s-tls" .Values.ingress.hostname }}` + ## You can: + ## - Use the `ingress.secrets` parameter to create this TLS secret + ## - Relay on cert-manager to create it by setting `ingress.certManager=true` + ## - Relay on Helm to create self-signed certificates by setting `ingress.selfSigned=true` + ## + tls: false + ## @param ingress.certManager Add the corresponding annotations for cert-manager integration + ## + certManager: false + ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm + ## + selfSigned: false + ## @param ingress.extraHosts An array with additional hostname(s) to be covered with the ingress record + ## e.g: + ## extraHosts: + ## - name: scheme-a.pm4ml.local + ## path: / + ## + ## @param ingress.extraPaths An array with additional arbitrary paths that may need to be added to the ingress under the main host + ## e.g: + ## extraPaths: + ## - path: /* + ## backend: + ## serviceName: ssl-redirect + ## servicePort: use-annotation + ## + # extraPaths: [] + extraPaths: + - path: /inbound-a/ + pathType: ImplementationSpecific + backend: + service: + name: '{{ include "common.names.fullname" . }}' + port: + name: inboundapia + - path: /inbound-b/ + pathType: ImplementationSpecific + backend: + service: + name: '{{ include "common.names.fullname" . }}' + port: + name: inboundapib + ## @param ingress.extraTls TLS configuration for additional hostname(s) to be covered with this ingress record + ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls + ## e.g: + ## extraTls: + ## - hosts: + ## - transfer-api-svc.local + ## secretName: transfer-api-svc.local-tls + ## + extraTls: [] + ## @param ingress.secrets Custom TLS certificates as secrets + ## NOTE: 'key' and 'certificate' are expected in PEM format + ## NOTE: 'name' should line up with a 'secretName' set further up + ## If it is not set and you're using cert-manager, this is unneeded, as it will create a secret for you with valid certificates + ## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created valid for 365 days + ## It is also possible to create and manage the certificates outside of this helm chart + ## Please see README.md for more information + ## e.g: + ## secrets: + ## - name: transfer-api-svc.local-tls + ## key: |- + ## -----BEGIN RSA PRIVATE KEY----- + ## ... + ## -----END RSA PRIVATE KEY----- + ## certificate: |- + ## -----BEGIN CERTIFICATE----- + ## ... + ## -----END CERTIFICATE----- + ## + secrets: [] + className: "nginx" + +## RBAC configuration +## +rbac: + ## @param rbac.create Specifies whether RBAC resources should be created + ## + create: false + +## ServiceAccount configuration +## +serviceAccount: + ## @param serviceAccount.create Specifies whether a ServiceAccount should be created + ## + create: false + ## @param serviceAccount.name The name of the ServiceAccount to use. + ## If not set and create is true, a name is generated using the common.names.fullname template + ## + name: "" diff --git a/lint-charts.sh b/lint-charts.sh index 9bcd479da..e76f9957b 100755 --- a/lint-charts.sh +++ b/lint-charts.sh @@ -32,6 +32,7 @@ else monitoring/efk account-lookup-service als-oracle-pathfinder + als-msisdn-oracle # centralkms # Deprecated - No longer supported # forensicloggingsidecar # Deprecated - No longer supported centralledger @@ -54,6 +55,7 @@ else thirdparty/chart-auth-svc thirdparty/chart-consent-oracle thirdparty/chart-tp-api-svc + inter-scheme-proxy-adapter ) fi diff --git a/local-deployment-methods/docker_arm_rebuild/rebuild.sh b/local-deployment-methods/docker_arm_rebuild/rebuild.sh old mode 100644 new mode 100755 diff --git a/local-deployment-methods/helmfile/README.md b/local-deployment-methods/helmfile/README.md index 6a9e660cb..2ca71bf5b 100644 --- a/local-deployment-methods/helmfile/README.md +++ b/local-deployment-methods/helmfile/README.md @@ -12,13 +12,27 @@ 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 Follow the below steps assume that you have a Kubernetes cluster up and running. -``` +```bash +helm repo add stable https://charts.helm.sh/stable +helm repo add incubator https://charts.helm.sh/incubator +helm repo add kiwigrid https://kiwigrid.github.io +helm repo add kokuwa https://kokuwaio.github.io/helm-charts +helm repo add elastic https://helm.elastic.co +helm repo add codecentric https://codecentric.github.io/helm-charts +helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo add mojaloop-charts https://mojaloop.github.io/charts/repo +helm repo add redpanda https://charts.redpanda.com +helm repo add mojaloop https://mojaloop.io/helm/repo + +helm repo update + sh update-charts-dep.sh cd local-deployment-methods/helmfile helmfile apply @@ -27,5 +41,5 @@ helmfile apply ## Uninstalling Mojaloop To remove the Mojaloop deployment, use: ``` -helmfile delete +helmfile destroy ``` diff --git a/local-deployment-methods/helmfile/helmfile.yaml b/local-deployment-methods/helmfile/helmfile.yaml index 7529eb479..2a4f49da5 100644 --- a/local-deployment-methods/helmfile/helmfile.yaml +++ b/local-deployment-methods/helmfile/helmfile.yaml @@ -40,11 +40,11 @@ releases: # chart: mojaloop/mojaloop # version: 16.2.1 values: - - values-mojaloop.yaml + - values-mojaloop-iso20022.yaml # - values-mojaloop-min.yaml - name: kafka-console namespace: demo chart: redpanda/console - version: 0.7.29 + version: 0.7.31 values: - - values-kafka-console.yaml \ No newline at end of file + - values-kafka-console.yaml diff --git a/local-deployment-methods/helmfile/values-kafka-console.yaml b/local-deployment-methods/helmfile/values-kafka-console.yaml index ac529d02d..4b9a96125 100644 --- a/local-deployment-methods/helmfile/values-kafka-console.yaml +++ b/local-deployment-methods/helmfile/values-kafka-console.yaml @@ -8,3 +8,10 @@ console: - kafka:9092 # roles: # roleBindings: +# ingress: +# enabled: true +# hosts: +# - host: kafka-console.domainname.local +# paths: +# - path: / +# pathType: ImplementationSpecific 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..5253771f9 --- /dev/null +++ b/local-deployment-methods/helmfile/values-mojaloop-iso20022.yaml @@ -0,0 +1,144 @@ +CONFIG: + ## ISO20022 + api_type: &API_TYPE "iso20022" + ttk_transformer_name: &TTK_TRANSFORMER_NAME "fspiopToISO20022" + ttk_input_values_override: &TTK_INPUT_VALUES_OVERRIDE + API_TYPE: *API_TYPE + ilpPacket: "$param_validIlpPacketV4" + validCondition: "$param_validConditionV4" + validFulfillment: "$param_validFulfillmentV4" + original_payload_storage: &ORIGINAL_PAYLOAD_STORAGE "redis" + payload_cache: &PAYLOAD_CACHE + enabled: true + type: redis-cluster + connectionConfig: + cluster: + - 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 + simple_routing_mode_enabled: false + quoting-service-handler: + <<: *DISABLE_PROBES + config: + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + log_level: debug + simple_routing_mode_enabled: false + +ml-api-adapter: + ml-api-adapter-service: + <<: *DISABLE_PROBES + # image: + # repository: localhost:32000/mojaloop/ml-api-adapter + # tag: v14.2.0-snapshot.local.13 + # diagnosticMode: + # enabled: true + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + ml-api-adapter-handler-notification: + <<: *DISABLE_PROBES + # image: + # repository: localhost:32000/mojaloop/ml-api-adapter + # tag: v14.2.0-snapshot.local.13 + # diagnosticMode: + # enabled: true + config: + api_type: *API_TYPE + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + +ml-testing-toolkit: + ml-testing-toolkit-backend: + # image: + # repository: localhost:32000/mojaloop/ml-testing-toolkit + # tag: v18.2.1-snapshot.local.1 + extraEnvironments: + hub-k8s-default-environment.json: + options: + transformerName: *TTK_TRANSFORMER_NAME + inputValues: + <<: *TTK_INPUT_VALUES_OVERRIDE + +ml-ttk-test-setup: + testCaseEnvironmentFile: + options: + transformerName: *TTK_TRANSFORMER_NAME + inputValues: + <<: *TTK_INPUT_VALUES_OVERRIDE +ml-ttk-test-val-gp: + testCaseEnvironmentFile: + options: + transformerName: *TTK_TRANSFORMER_NAME + inputValues: + <<: *TTK_INPUT_VALUES_OVERRIDE +ml-ttk-test-setup-interscheme: + testCaseEnvironmentFile: + options: + transformerName: *TTK_TRANSFORMER_NAME + inputValues: + <<: *TTK_INPUT_VALUES_OVERRIDE +ml-ttk-test-val-interscheme: + testCaseEnvironmentFile: + options: + transformerName: *TTK_TRANSFORMER_NAME + inputValues: + <<: *TTK_INPUT_VALUES_OVERRIDE +ml-ttk-test-cleanup: + testCaseEnvironmentFile: + options: + transformerName: *TTK_TRANSFORMER_NAME + inputValues: + <<: *TTK_INPUT_VALUES_OVERRIDE + +mojaloop-simulator: + defaults: + config: + schemeAdapter: + # image: + # repository: localhost:32000/mojaloop/sdk-scheme-adapter + # tag: v23.6.0-snapshot.local.27 + # diagnosticMode: + # enabled: true + env: + API_TYPE: iso20022 + ILP_VERSION: "4" + LOG_LEVEL: debug + readinessProbe: + enabled: false + livenessProbe: + enabled: false + metrics: + enabled: false + +inter-scheme-proxy-adapter: + <<: *DISABLE_PROBES + env: + LOG_LEVEL: debug + \ No newline at end of file diff --git a/ml-api-adapter/Chart.yaml b/ml-api-adapter/Chart.yaml index 930f81217..eaa2e6ac5 100644 --- a/ml-api-adapter/Chart.yaml +++ b/ml-api-adapter/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-api-adapter Helm chart for Kubernetes name: ml-api-adapter version: 13.6.0 -appVersion: v14.1.0 +appVersion: v15.1.0-iso.9 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -25,6 +25,6 @@ dependencies: condition: ml-api-adapter-handler-notification.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/ml-api-adapter/chart-handler-notification/Chart.yaml b/ml-api-adapter/chart-handler-notification/Chart.yaml index d06baf4e8..c297eee04 100644 --- a/ml-api-adapter/chart-handler-notification/Chart.yaml +++ b/ml-api-adapter/chart-handler-notification/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-api-adapter Handler for Notifications component Helm chart for Kubernetes name: ml-api-adapter-handler-notification version: 13.4.0 -appVersion: v14.1.0 +appVersion: v15.1.0-iso.9 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.3 tags: - moja-common 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/templates/config-override.yaml b/ml-api-adapter/chart-handler-notification/templates/config-override.yaml index 2a3d2a50a..baf1fa686 100644 --- a/ml-api-adapter/chart-handler-notification/templates/config-override.yaml +++ b/ml-api-adapter/chart-handler-notification/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/ml-api-adapter/chart-handler-notification/templates/deployment.yaml b/ml-api-adapter/chart-handler-notification/templates/deployment.yaml index 3b7518cdf..33f958515 100644 --- a/ml-api-adapter/chart-handler-notification/templates/deployment.yaml +++ b/ml-api-adapter/chart-handler-notification/templates/deployment.yaml @@ -20,6 +20,9 @@ spec: matchLabels: app.kubernetes.io/name: {{ include "ml-api-adapter-handler-notification.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} +{{- if (.Values.rollingUpdate).override }} + {{- include "common.rollingUpdateStrategy" . | nindent 2 }} +{{- end }} template: metadata: labels: @@ -32,6 +35,9 @@ spec: {{- if .Values.podLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.podLabels "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.usePdb }} + {{- include "common.pdb.matchLabels" . | nindent 8 }} + {{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/config.yaml") . | sha256sum }} {{- if .Values.configOverride }} @@ -47,6 +53,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} diff --git a/ml-api-adapter/chart-handler-notification/values.yaml b/ml-api-adapter/chart-handler-notification/values.yaml index 91667a5b8..45c09facf 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: v15.1.0-iso.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -23,6 +23,11 @@ image: replicaCount: 1 command: '["node", "src/handlers/index.js", "handler", "--notification"]' +rollingUpdate: + override: true + maxUnavailable: 20% + maxSurge: 20% + ## Enable diagnostic mode in the deployment ## diagnosticMode: @@ -145,6 +150,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 @@ -352,3 +368,5 @@ ingress: # cpu: 100m # memory: 128Mi resources: {} + +usePdb: false diff --git a/ml-api-adapter/chart-service/Chart.yaml b/ml-api-adapter/chart-service/Chart.yaml index ee668114e..d031a984d 100644 --- a/ml-api-adapter/chart-service/Chart.yaml +++ b/ml-api-adapter/chart-service/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 description: ml-api-adapter API component Helm chart for Kubernetes name: ml-api-adapter-service version: 13.4.0 -appVersion: v14.1.0 +appVersion: v15.1.0-iso.9 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -17,6 +17,6 @@ maintainers: dependencies: - name: common repository: "https://mojaloop.github.io/charts/repo" - version: 3.0.0 + version: 3.1.2 tags: - moja-common 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/templates/config-override.yaml b/ml-api-adapter/chart-service/templates/config-override.yaml index afc9de759..3f79e9810 100644 --- a/ml-api-adapter/chart-service/templates/config-override.yaml +++ b/ml-api-adapter/chart-service/templates/config-override.yaml @@ -11,6 +11,6 @@ metadata: helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} data: {{- range $fileName, $fileContents := .Values.configOverride }} - {{ $fileName | replace "/" "-" }}: | {{ $fileContents | toPrettyJson | nindent 4 }} + {{ $fileName | replace "/" "-" }}: | {{ ternary $fileContents (toPrettyJson $fileContents) (eq (typeOf $fileContents) "string") | nindent 4 }} {{- end }} {{- end }} diff --git a/ml-api-adapter/chart-service/templates/deployment.yaml b/ml-api-adapter/chart-service/templates/deployment.yaml index ff2a2d396..97495fd8b 100644 --- a/ml-api-adapter/chart-service/templates/deployment.yaml +++ b/ml-api-adapter/chart-service/templates/deployment.yaml @@ -46,6 +46,7 @@ spec: prometheus.io/scrape: "true" {{- end }} spec: + {{- include "common.topologySpread" . | nindent 6 }} {{- if .Values.affinity }} affinity: {{ toYaml .Values.affinity | indent 8 }} diff --git a/ml-api-adapter/chart-service/values.yaml b/ml-api-adapter/chart-service/values.yaml index 0542daa74..a94999216 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: v15.1.0-iso.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -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..d4054e005 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: v15.1.0-iso.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -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 @@ -340,7 +351,7 @@ ml-api-adapter-handler-notification: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v15.1.0-iso.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -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/ml-testing-toolkit-cli/values.yaml b/ml-testing-toolkit-cli/values.yaml index 670af78df..442ab4abb 100644 --- a/ml-testing-toolkit-cli/values.yaml +++ b/ml-testing-toolkit-cli/values.yaml @@ -4,7 +4,7 @@ replicaCount: 1 image: repository: mojaloop/ml-testing-toolkit-client-lib - tag: v1.2.2 + tag: v1.3.0 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. diff --git a/ml-testing-toolkit/Chart.yaml b/ml-testing-toolkit/Chart.yaml index 0c23d5152..52b0311c6 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.4.3; 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..5e2870da8 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.4.3 home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -21,4 +21,4 @@ dependencies: repository: "https://mojaloop.github.io/charts/repo" version: 3.0.0 tags: - - moja-common + - moja-common diff --git a/ml-testing-toolkit/chart-backend/templates/statefulset.yaml b/ml-testing-toolkit/chart-backend/templates/statefulset.yaml index dde280aee..13a5d37cc 100644 --- a/ml-testing-toolkit/chart-backend/templates/statefulset.yaml +++ b/ml-testing-toolkit/chart-backend/templates/statefulset.yaml @@ -32,6 +32,10 @@ spec: {{- if .Values.podAnnotations }} {{- include "common.tplvalues.render" ( dict "value" .Values.podAnnotations "context" $ ) | nindent 8 }} {{- end }} + {{- if .Values.metrics.enabled }} + prometheus.io/port: "{{ .Values.service.ports.adminApi.port }}" + prometheus.io/scrape: "true" + {{- end }} labels: app.kubernetes.io/name: {{ include "ml-testing-toolkit-backend.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} @@ -87,6 +91,7 @@ spec: ports: - containerPort: {{ .Values.service.ports.specApi.port }} - containerPort: {{ .Values.service.ports.adminApi.port }} + name: http {{- if .Values.readinessProbe.enabled }} readinessProbe: httpGet: @@ -118,7 +123,7 @@ spec: volumes: {{- if .Values.persistence.enabled }} - name: ttk-data - emptyDir: {} + emptyDir: {} {{- end }} - name: {{ template "ml-testing-toolkit-backend.fullname" . }}-volume-config-default configMap: diff --git a/ml-testing-toolkit/chart-backend/values.yaml b/ml-testing-toolkit/chart-backend/values.yaml index 2958fdbae..2c0792f22 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.3.1 + tag: v18.5.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 @@ -183,17 +183,32 @@ config_files: { "name": "p2p", "description": "Tests related to p2p transfer", - "color": "red" + "color": "gold" }, { "name": "settlements", "description": "Tests related to settlements", - "color": "green" + "color": "lime" }, { "name": "quotes", "description": "Tests related to quoting service", - "color": "blue" + "color": "cyan" + }, + { + "name": "min-func-tests", + "description": "Minimal functional tests", + "color": "green" + }, + { + "name": "basic-func-tests", + "description": "Basic functional tests", + "color": "orange" + }, + { + "name": "prod-tests", + "description": "Production Tests", + "color": "red" } ] } @@ -279,6 +294,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", @@ -490,3 +511,8 @@ persistence: # storageClass: "-" accessMode: ReadWriteOnce size: 1Gi + +## metric configuration for prometheus instrumentation +metrics: + ## flag to enable/disable the metrics end-points + enabled: true 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..bd4a51e8c 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.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 diff --git a/ml-testing-toolkit/values.yaml b/ml-testing-toolkit/values.yaml index 2197b07bf..9947f6e6a 100644 --- a/ml-testing-toolkit/values.yaml +++ b/ml-testing-toolkit/values.yaml @@ -39,8 +39,6 @@ ml-testing-toolkit-backend: # AUTH_ENABLED: true # KEYCLOAK: # ENABLED: true - - config: mongodb: host: "ttk-mongodb" port: "27017" diff --git a/mojaloop-bulk/Chart.yaml b/mojaloop-bulk/Chart.yaml index 02b0bacbe..0f15cee89 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.34" +appVersion: "bulk-api-adapter: v17.0.0; central-ledger: v17.9.0-iso.16" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png sources: @@ -24,6 +24,6 @@ dependencies: condition: bulk-centralledger.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 3.0.0 + version: 3.1.2 tags: - moja-common diff --git a/mojaloop-bulk/values.yaml b/mojaloop-bulk/values.yaml index 4071cbf18..b93a83cc3 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.34 + tag: v17.9.0-iso.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 @@ -1103,7 +1103,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -1484,7 +1484,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -1874,7 +1874,7 @@ bulk-centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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/mojaloop-simulator/templates/deployment.yaml b/mojaloop-simulator/templates/deployment.yaml index 66356ecd3..373a5359c 100644 --- a/mojaloop-simulator/templates/deployment.yaml +++ b/mojaloop-simulator/templates/deployment.yaml @@ -114,6 +114,8 @@ spec: path: / port: {{ $config.config.schemeAdapter.env.OUTBOUND_LISTEN_PORT }} scheme: HTTP + timeoutSeconds: 5 + failureThreshold: 6 {{- end }} {{- if $config.config.schemeAdapter.livenessProbe.enabled }} livenessProbe: @@ -121,6 +123,8 @@ spec: path: / port: {{ $config.config.schemeAdapter.env.OUTBOUND_LISTEN_PORT }} scheme: HTTP + timeoutSeconds: 5 + failureThreshold: 6 {{- end }} volumeMounts: - name: jws-public-keys diff --git a/mojaloop-simulator/values.yaml b/mojaloop-simulator/values.yaml index 139415edc..03ac3ce41 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.16 + tag: v23.6.0-iso.10 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes 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 a7028cac2..cdc82af7e 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.1.1; 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: @@ -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 @@ -38,6 +38,10 @@ dependencies: version: ">= 13.3.0" repository: "file://../simulator" condition: simulator.enabled + - name: als-msisdn-oracle + version: ">= 0.0.1" + repository: "file://../als-msisdn-oracle" + condition: als-msisdn-oracle.enabled - name: mojaloop-simulator version: ">= 15.2.1" repository: "file://../mojaloop-simulator" @@ -60,11 +64,11 @@ dependencies: condition: mojaloop-ttk-simulators.enabled - name: common repository: https://mojaloop.github.io/charts/repo - version: 3.0.0 + version: ">= 3.1.3" 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 @@ -142,3 +146,8 @@ dependencies: version: ">= 15.6.0" repository: "file://../ml-testing-toolkit-cli" condition: ml-ttk-test-cleanup.tests.enabled + - name: inter-scheme-proxy-adapter + alias: inter-scheme-proxy-adapter + version: ">= 1.0.0" + repository: "file://../inter-scheme-proxy-adapter" + condition: inter-scheme-proxy-adapter.enabled diff --git a/mojaloop/templates/pdb.yaml b/mojaloop/templates/pdb.yaml new file mode 100644 index 000000000..2140b6efa --- /dev/null +++ b/mojaloop/templates/pdb.yaml @@ -0,0 +1,3 @@ +{{- if .Values.pdb.enabled }} + {{- include "common.pdb.resource" . }} +{{- end -}} diff --git a/mojaloop/values.yaml b/mojaloop/values.yaml index 9fb3a2b66..ad6dec367 100644 --- a/mojaloop/values.yaml +++ b/mojaloop/values.yaml @@ -15,6 +15,16 @@ CONFIG: als_db_port: &ALS_DB_PORT 3306 als_db_user: &ALS_DB_USER "account_lookup" + ## ALS MSISDN Oracle + als_msisdn_oracle_db_name: &ALS_ORACLE_DB_NAME "oracle_msisdn" + als_msisdn_oracle_db_password: &ALS_ORACLE_DB_PASSWORD '' + als_msisdn_oracle_db_secret: &ALS_ORACLE_DB_SECRET + name: &ALS_ORACLE_DB_SECRET_NAME mysqldb + key: &ALS_ORACLE_DB_SECRET_KEY mysql-password + als_msisdn_oracle_db_host: &ALS_ORACLE_DB_HOST 'mysqldb' + als_msisdn_oracle_db_port: &ALS_ORACLE_DB_PORT 3306 + als_msisdn_oracle_db_user: &ALS_ORACLE_DB_USER "oracle_msisdn" + ## CENTRAL-LEDGER BACKEND cl_db_name: &CL_DB_NAME "central_ledger" cl_db_password: &CL_DB_PASSWORD '' @@ -83,7 +93,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 @@ -94,11 +104,33 @@ CONFIG: - host: proxy-cache-redis port: 6379 + ## ISO20022 + api_type: &API_TYPE "fspiop" + ttk_transformer_name: &TTK_TRANSFORMER_NAME "none" + SDK_ILP_VERSION: &SDK_ILP_VERSION "1" + # api_type: &API_TYPE "iso20022" + # ttk_transformer_name: &TTK_TRANSFORMER_NAME "fspiopToISO20022" + # SDK_ILP_VERSION: &SDK_ILP_VERSION "4" + ## 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 global: {} +pdb: + enabled: true + maxUnavailable: 1 +# minAvailable: 20% +## Only one key should be set + # Declare variables to be passed into your templates. account-lookup-service: @@ -113,7 +145,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.33 + tag: v15.6.0-iso.19 ## 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 +345,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 +526,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.3.4 + tag: v15.6.0-iso.19 ## 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 +906,7 @@ account-lookup-service: image: registry: docker.io repository: mojaloop/account-lookup-service - tag: v15.4.0-snapshot.33 + tag: v15.6.0-iso.19 ## 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 +1716,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.43 + tag: v15.9.0-iso.13 config: hub_participant: *HUB_PARTICIPANT @@ -1754,6 +1789,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 +1848,7 @@ quoting-service: image: registry: docker.io repository: mojaloop/quoting-service - tag: v15.8.0-snapshot.43 + tag: v15.9.0-iso.13 config: hub_participant: *HUB_PARTICIPANT @@ -1879,6 +1919,10 @@ quoting-service: ## Proxy cache configuration proxy_cache: *PROXY_CACHE + ## ISO20022 configuration + original_payload_storage: *ORIGINAL_PAYLOAD_STORAGE + payload_cache: *PAYLOAD_CACHE + error_handling: include_cause_extension: false truncate_extensions: true @@ -1973,7 +2017,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v15.1.0-iso.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -2133,6 +2177,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 @@ -2259,7 +2308,7 @@ ml-api-adapter: image: registry: docker.io repository: mojaloop/ml-api-adapter - tag: v14.1.0-snapshot.25 + tag: v15.1.0-iso.9 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -2479,6 +2528,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 @@ -2612,7 +2666,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -2807,28 +2861,6 @@ centralledger: {{- end }} - name: DB_DATABASE value: '{{ .Values.config.db_database }}' - - name: run-migration - image: '{{ .Values.image.repository }}:{{ .Values.image.tag }}' - imagePullPolicy: IfNotPresent - command: - - sh - - -c - - npm run migrate - env: - - name: CLEDG_MIGRATIONS__RUN_DATA_MIGRATIONS - value: 'true' - - name: CLEDG_DATABASE__PASSWORD - {{- if .Values.config.db_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.db_secret.name }}' - key: '{{ .Values.config.db_secret.key }}' - {{- else }} - value: {{ .Values.config.db_password }} - {{- end }} - volumeMounts: - - name: '{{ template "account-lookup-service-admin.fullname" . }}-config-volume' - mountPath: /opt/app/config service: internalPort: 3001 @@ -2952,7 +2984,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -3297,7 +3329,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -3637,7 +3669,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -3982,7 +4014,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -4321,7 +4353,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -4663,7 +4695,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -5010,7 +5042,7 @@ centralledger: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -7275,7 +7307,7 @@ transaction-requests-service: # 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: + protocol_versions: | { "CONTENT": { "DEFAULT": "1.1", @@ -9280,7 +9312,7 @@ thirdparty: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.16 + tag: v23.6.0-iso.10 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -10404,7 +10436,7 @@ mojaloop-simulator: publicKey: '' image: repository: mojaloop/sdk-scheme-adapter - tag: v23.6.0-snapshot.16 + tag: v23.6.0-iso.10 pullPolicy: IfNotPresent command: '[ "yarn", "start:api-svc" ]' <<: *defaultProbes @@ -10431,6 +10463,9 @@ mojaloop-simulator: type: Utilization averageUtilization: 80 env: + + API_TYPE: *API_TYPE + ILP_VERSION: *SDK_ILP_VERSION # Ports the scheme adapter listens on. Shouldn't really matter for a user of this chart. # You probably shouldn't bother configuring them- it likely won't do you much good. But it # won't do any harm, either. @@ -10989,11 +11024,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.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' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.6.0-iso.10/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-iso.10/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-iso.10/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-iso.10/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-iso.10/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 +11201,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.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' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.6.0-iso.10/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-iso.10/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-iso.10/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-iso.10/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-iso.10/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 +11378,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.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' + rules_response__default.json: 'https://github.com/mojaloop/sdk-scheme-adapter/raw/v23.6.0-iso.10/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-iso.10/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-iso.10/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-iso.10/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-iso.10/test/func/config/ttk-ttksim3/spec_files/api_definitions/mojaloop_sdk_outbound_scheme_adapter_1.0/callback_map.json' ml-testing-toolkit-frontend: ingress: @@ -11482,7 +11517,7 @@ mojaloop-bulk: # 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: + protocol_versions: | { "CONTENT": { "DEFAULT": "2.0", @@ -11736,7 +11771,7 @@ mojaloop-bulk: # 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: + protocol_versions: | { "CONTENT": { "DEFAULT": "2.0", @@ -11970,7 +12005,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -12339,7 +12374,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -12705,7 +12740,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -13071,7 +13106,7 @@ mojaloop-bulk: image: registry: docker.io repository: mojaloop/central-ledger - tag: v17.8.0-snapshot.34 + tag: v17.9.0-iso.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 @@ -13428,6 +13463,34 @@ mojaloop-bulk: # memory: 128Mi resources: {} +als-msisdn-oracle: + enabled: true + config: + db_host: *ALS_ORACLE_DB_HOST + db_port: *ALS_ORACLE_DB_PORT + db_user: *ALS_ORACLE_DB_USER + db_secret: + name: *ALS_ORACLE_DB_SECRET_NAME + key: *ALS_ORACLE_DB_SECRET_KEY + db_database: *ALS_ORACLE_DB_NAME + # db_password: '' + +inter-scheme-proxy-adapter: + enabled: *INTERSCHEME_ENABLED + image: + registry: docker.io + repository: mojaloop/inter-scheme-proxy-adapter + tag: v1.3.3 + config: {} + env: {} + metrics: + enabled: true + config: + timeout: 5000 + prefix: moja_ + defaultLabels: + serviceName: inter-schememojaloop/inter-scheme-proxy-adapter + ml-testing-toolkit: enabled: true ml-testing-toolkit-backend: ## @param initContainers Add additional init containers to the %%MAIN_CONTAINER_NAME%% pod(s) @@ -13522,9 +13585,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.40/rules/hub/rules_callback/default.json" + rules_response__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.40/rules/hub/rules_response/default.json" + rules_validation__default.json: "https://github.com/mojaloop/testing-toolkit-test-cases/raw/v17.0.0-iso.40/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 @@ -13538,10 +13601,24 @@ ml-testing-toolkit: simNameTTKSim1: 'ttksim1' simNameTTKSim2: 'ttksim2' simNameTTKSim3: 'ttksim3' + validIlpPacketV1: 'AYIDBQAAAAAAACcQJGcucGF5ZWVmc3AubXNpc2RuLnt7cmVjZWl2ZXJtc2lzZG59fYIC1GV5SjBjbUZ1YzJGamRHbHZia2xrSWpvaVptVXhNREU0Wm1NdE1EaGxZeTAwWWpJM0xUbGpZalF0TnpjMk9URTFNR00zT1dKaklpd2ljWFZ2ZEdWSlpDSTZJbVpsTVRBeE9HWmpMVEE0WldNdE5HSXlOeTA1WTJJMExUYzNOamt4TlRCak56bGlZeUlzSW5CaGVXVmxJanA3SW5CaGNuUjVTV1JKYm1adklqcDdJbkJoY25SNVNXUlVlWEJsSWpvaVRWTkpVMFJPSWl3aWNHRnlkSGxKWkdWdWRHbG1hV1Z5SWpvaWUzdHlaV05sYVhabGNrMVRTVk5FVG4xOUlpd2labk53U1dRaU9pSndZWGxsWldaemNDSjlmU3dpY0dGNVpYSWlPbnNpY0dGeWRIbEpaRWx1Wm04aU9uc2ljR0Z5ZEhsSlpGUjVjR1VpT2lKTlUwbFRSRTRpTENKd1lYSjBlVWxrWlc1MGFXWnBaWElpT2lJeU56Y3hNemd3TXprd05TSXNJbVp6Y0Vsa0lqb2ljR0Y1WlhKbWMzQWlmU3dpY0dWeWMyOXVZV3hKYm1adklqcDdJbU52YlhCc1pYaE9ZVzFsSWpwN0ltWnBjbk4wVG1GdFpTSTZJazFoZEhNaUxDSnNZWE4wVG1GdFpTSTZJa2hoWjIxaGJpSjlMQ0prWVhSbFQyWkNhWEowYUNJNklqRTVPRE10TVRBdE1qVWlmWDBzSW1GdGIzVnVkQ0k2ZXlKaGJXOTFiblFpT2lJeE1EQWlMQ0pqZFhKeVpXNWplU0k2SWxWVFJDSjlMQ0owY21GdWMyRmpkR2x2YmxSNWNHVWlPbnNpYzJObGJtRnlhVzhpT2lKVVVrRk9VMFpGVWlJc0ltbHVhWFJwWVhSdmNpSTZJbEJCV1VWU0lpd2lhVzVwZEdsaGRHOXlWSGx3WlNJNklrTlBUbE5WVFVWU0luMTkA' + validConditionV1: 'GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM' + validFulfillmentV1: 'UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA' + validIlpPacket2V1: 'AYIC9AAAAAAAABdwHWcucGF5ZWVmc3AubXNpc2RuLjIyNTU2OTk5MTI1ggLKZXlKMGNtRnVjMkZqZEdsdmJrbGtJam9pWmpRMFltUmtOV010WXpreE1DMDBZVGt3TFRoa05qa3RaR0ppWVRaaVl6aGxZVFpqSWl3aWNYVnZkR1ZKWkNJNklqVTBaRFZtTURsaUxXRTBOMlF0TkRCa05pMWhZVEEzTFdFNVkyWXpZbUl5TkRsaFpDSXNJbkJoZVdWbElqcDdJbkJoY25SNVNXUkpibVp2SWpwN0luQmhjblI1U1dSVWVYQmxJam9pVFZOSlUwUk9JaXdpY0dGeWRIbEpaR1Z1ZEdsbWFXVnlJam9pTWpJMU5UWTVPVGt4TWpVaUxDSm1jM0JKWkNJNkluQmhlV1ZsWm5Od0luMTlMQ0p3WVhsbGNpSTZleUp3WVhKMGVVbGtTVzVtYnlJNmV5SndZWEowZVVsa1ZIbHdaU0k2SWsxVFNWTkVUaUlzSW5CaGNuUjVTV1JsYm5ScFptbGxjaUk2SWpJeU5UQTNNREE0TVRneElpd2labk53U1dRaU9pSndZWGxsY21aemNDSjlMQ0p3WlhKemIyNWhiRWx1Wm04aU9uc2lZMjl0Y0d4bGVFNWhiV1VpT25zaVptbHljM1JPWVcxbElqb2lUV0YwY3lJc0lteGhjM1JPWVcxbElqb2lTR0ZuYldGdUluMHNJbVJoZEdWUFprSnBjblJvSWpvaU1UazRNeTB4TUMweU5TSjlmU3dpWVcxdmRXNTBJanA3SW1GdGIzVnVkQ0k2SWpZd0lpd2lZM1Z5Y21WdVkza2lPaUpWVTBRaWZTd2lkSEpoYm5OaFkzUnBiMjVVZVhCbElqcDdJbk5qWlc1aGNtbHZJam9pVkZKQlRsTkdSVklpTENKcGJtbDBhV0YwYjNJaU9pSlFRVmxGVWlJc0ltbHVhWFJwWVhSdmNsUjVjR1VpT2lKRFQwNVRWVTFGVWlKOWZRAA' + validCondition2V1: 'kPLCKM62VY2jbekuw3apCTBg5zk_mVs9DD8-XpljQms' + validIlpPacketV4: 'DIICYwAAAAAAAABkMjAyNDEwMjkxMTE0MTQzNTIv1lSZPk0mP5Io_nXbsO9zUmQXinvjJbhGwsqc53pARgpnLm1vamFsb29wggIcZXlKMGNtRnVjMkZqZEdsdmJrbGtJam9pTURGS1FqbEVRVk5PTURGRVdUUlhTME5hV1RoWVVrVTBXa01pTENKeGRXOTBaVWxrSWpvaU1ERktRamxFUVZOWk5EZFNUVVEwUzFOS1MwZElVMW8wTUVvaUxDSndZWGxsWlNJNmV5SndZWEowZVVsa1NXNW1ieUk2ZXlKd1lYSjBlVWxrVkhsd1pTSTZJalUwTXpJeE1EQXhJaXdpY0dGeWRIbEpaR1Z1ZEdsbWFXVnlJam9pVFZOSlUwUk9JaXdpWm5Od1NXUWlPaUowZEd0d1lYbGxaV1p6Y0NKOWZTd2ljR0Y1WlhJaU9uc2ljR0Z5ZEhsSlpFbHVabThpT25zaWNHRnlkSGxKWkZSNWNHVWlPaUkwTkRFeU16UTFOamM0T1NJc0luQmhjblI1U1dSbGJuUnBabWxsY2lJNklrMVRTVk5FVGlJc0ltWnpjRWxrSWpvaWRIUnJabmh3WVhsbGNpSjlmU3dpWVcxdmRXNTBJanA3SW1OMWNuSmxibU41SWpvaVdGUlRJaXdpWVcxdmRXNTBJam9pTVRBd0luMHNJblJ5WVc1ellXTjBhVzl1Vkhsd1pTSTZiblZzYkN3aVpYaHdhWEpoZEdsdmJpSTZJakl3TWpRdE1UQXRNamxVTVRFNk1UUTZNVFF1TXpVeVdpSXNJbTV2ZEdVaU9tNTFiR3g5' + validConditionV4: 'L9ZUmT5NJj-SKP5127Dvc1JkF4p74yW4RsLKnOd6QEY' + validFulfillmentV4: 'VFhBCqP17O5VolemGmeVeVn_ZByepYwtqBDe2F675kA' + extraEnvironments: hub-k8s-default-environment.json: &ttkInputValues { + "options": { + "breakOnError": false, + "transformerName": *TTK_TRANSFORMER_NAME, + "generateIDType": "ulid" + }, "inputValues": { - "generateID": "ulid", + "API_TYPE": *API_TYPE, "HUB_NAME": *HUB_NAME, "BASE_CENTRAL_LEDGER_ADMIN": "", "CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-ml-testing-toolkit-backend:4040", @@ -13570,6 +13647,8 @@ ml-testing-toolkit: "PAYERFSP_CALLBACK_URL": "http://$release_name-sim-$param_simNamePayerfsp-scheme-adapter:4000", "PAYERFSP_SDK_TESTAPI_URL": "http://$release_name-sim-$param_simNamePayerfsp-scheme-adapter:4002", "PAYERFSP_SDK_TESTAPI_WS_URL": "ws://$release_name-sim-$param_simNamePayerfsp-scheme-adapter:4002", + "PROXY2_NAME": "proxyispa", + "PROXY2_CALLBACK_ENDPOINT_BASE_URL": "http://$release_name-inter-scheme-proxy-adapter:4000", "SIMPAYEE_CURRENCY": "XXX", "SIMPAYEE_JWS_PUB_KEY": "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzLtduponsAlAk+3+PQdE\nsgjxRs5qhkrPa0z25NbHvgQYan4bH5GY+nEUX65YN65nusHtCG9gBeU0C56EgZQw\nIpkHDTh166qQGPwdJf5oMlMJn79DSd1I2bghbsNx0a1P6ElH16AyEwvgYtdtMOBW\nNgf7z5/tYgv7bGgmsp3qGlf0nnaux/frJhJ0Hxpd6eUCafwdlrNwc9R6iCKMSxGj\nvVTHgx0D7zSZ/+4PXq6gObyIZoC0uOsKKzlY3USx9khAh+96qfFoNKyfGHltpEPJ\nLmOLh3BtzDuna2KwtNdVNGcjPdCle3b9mNIdhR5aZ/bP6Zm+t9JuRC6ZwU/6WEy3\nFwIDAQAB\n-----END PUBLIC KEY-----\n", "SIMPAYEE_MSISDN": "17039811902", @@ -13658,7 +13737,7 @@ ml-testing-toolkit: "homeTransactionId": "123ABC", "hubEmail": "some.email@gmail.com", "hub_operator": "NOT_APPLICABLE", - "ilpPacket": "AYIDBQAAAAAAACcQJGcucGF5ZWVmc3AubXNpc2RuLnt7cmVjZWl2ZXJtc2lzZG59fYIC1GV5SjBjbUZ1YzJGamRHbHZia2xrSWpvaVptVXhNREU0Wm1NdE1EaGxZeTAwWWpJM0xUbGpZalF0TnpjMk9URTFNR00zT1dKaklpd2ljWFZ2ZEdWSlpDSTZJbVpsTVRBeE9HWmpMVEE0WldNdE5HSXlOeTA1WTJJMExUYzNOamt4TlRCak56bGlZeUlzSW5CaGVXVmxJanA3SW5CaGNuUjVTV1JKYm1adklqcDdJbkJoY25SNVNXUlVlWEJsSWpvaVRWTkpVMFJPSWl3aWNHRnlkSGxKWkdWdWRHbG1hV1Z5SWpvaWUzdHlaV05sYVhabGNrMVRTVk5FVG4xOUlpd2labk53U1dRaU9pSndZWGxsWldaemNDSjlmU3dpY0dGNVpYSWlPbnNpY0dGeWRIbEpaRWx1Wm04aU9uc2ljR0Z5ZEhsSlpGUjVjR1VpT2lKTlUwbFRSRTRpTENKd1lYSjBlVWxrWlc1MGFXWnBaWElpT2lJeU56Y3hNemd3TXprd05TSXNJbVp6Y0Vsa0lqb2ljR0Y1WlhKbWMzQWlmU3dpY0dWeWMyOXVZV3hKYm1adklqcDdJbU52YlhCc1pYaE9ZVzFsSWpwN0ltWnBjbk4wVG1GdFpTSTZJazFoZEhNaUxDSnNZWE4wVG1GdFpTSTZJa2hoWjIxaGJpSjlMQ0prWVhSbFQyWkNhWEowYUNJNklqRTVPRE10TVRBdE1qVWlmWDBzSW1GdGIzVnVkQ0k2ZXlKaGJXOTFiblFpT2lJeE1EQWlMQ0pqZFhKeVpXNWplU0k2SWxWVFJDSjlMQ0owY21GdWMyRmpkR2x2YmxSNWNHVWlPbnNpYzJObGJtRnlhVzhpT2lKVVVrRk9VMFpGVWlJc0ltbHVhWFJwWVhSdmNpSTZJbEJCV1VWU0lpd2lhVzVwZEdsaGRHOXlWSGx3WlNJNklrTlBUbE5WVFVWU0luMTkA", + "ilpPacket": "$param_validIlpPacketV1", "invalidFulfillment": "_3cco-YN5OGpRKVWV3n6x6uNpBTH9tYUdOYmHA-----", "invalidToIdType": "ACCOUNT_ID", "invalidToIdValue": "27713803099", @@ -13699,10 +13778,10 @@ ml-testing-toolkit: "toBurmeseIdMiddleName": "အောင်", "toBurmeseIdLastName": "ဒေါ်သန္တာထွန်", "toBurmeseIdFspId": "$param_simNamePayeefsp", - "validCondition": "GRzLaTP7DJ9t4P-a_BA0WA9wzzlsugf00-Tn6kESAfM", - "validCondition2": "kPLCKM62VY2jbekuw3apCTBg5zk_mVs9DD8-XpljQms", - "validFulfillment": "UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA", - "validIlpPacket2": "AYIC9AAAAAAAABdwHWcucGF5ZWVmc3AubXNpc2RuLjIyNTU2OTk5MTI1ggLKZXlKMGNtRnVjMkZqZEdsdmJrbGtJam9pWmpRMFltUmtOV010WXpreE1DMDBZVGt3TFRoa05qa3RaR0ppWVRaaVl6aGxZVFpqSWl3aWNYVnZkR1ZKWkNJNklqVTBaRFZtTURsaUxXRTBOMlF0TkRCa05pMWhZVEEzTFdFNVkyWXpZbUl5TkRsaFpDSXNJbkJoZVdWbElqcDdJbkJoY25SNVNXUkpibVp2SWpwN0luQmhjblI1U1dSVWVYQmxJam9pVFZOSlUwUk9JaXdpY0dGeWRIbEpaR1Z1ZEdsbWFXVnlJam9pTWpJMU5UWTVPVGt4TWpVaUxDSm1jM0JKWkNJNkluQmhlV1ZsWm5Od0luMTlMQ0p3WVhsbGNpSTZleUp3WVhKMGVVbGtTVzVtYnlJNmV5SndZWEowZVVsa1ZIbHdaU0k2SWsxVFNWTkVUaUlzSW5CaGNuUjVTV1JsYm5ScFptbGxjaUk2SWpJeU5UQTNNREE0TVRneElpd2labk53U1dRaU9pSndZWGxsY21aemNDSjlMQ0p3WlhKemIyNWhiRWx1Wm04aU9uc2lZMjl0Y0d4bGVFNWhiV1VpT25zaVptbHljM1JPWVcxbElqb2lUV0YwY3lJc0lteGhjM1JPWVcxbElqb2lTR0ZuYldGdUluMHNJbVJoZEdWUFprSnBjblJvSWpvaU1UazRNeTB4TUMweU5TSjlmU3dpWVcxdmRXNTBJanA3SW1GdGIzVnVkQ0k2SWpZd0lpd2lZM1Z5Y21WdVkza2lPaUpWVTBRaWZTd2lkSEpoYm5OaFkzUnBiMjVVZVhCbElqcDdJbk5qWlc1aGNtbHZJam9pVkZKQlRsTkdSVklpTENKcGJtbDBhV0YwYjNJaU9pSlFRVmxGVWlJc0ltbHVhWFJwWVhSdmNsUjVjR1VpT2lKRFQwNVRWVTFGVWlKOWZRAA", + "validCondition": "$param_validConditionV1", + "validCondition2": "$param_validCondition2V1", + "validFulfillment": "$param_validFulfillmentV1", + "validIlpPacket2": "$param_validIlpPacket2V1", "NORESPONSE_SIMPAYEE_NAME": "$param_simNameNoResponsePayeefsp", "SIM1_NAME": "$param_simNameTestfsp1", "SIM2_NAME": "$param_simNameTestfsp2", @@ -13811,10 +13890,11 @@ ml-testing-toolkit: "contentTypeFxTransfers": "application/vnd.interoperability.fxTransfers+json;version=2.0", "fxpCurrency": "XXX", "HOST_ORACLE": "http://$release_name-simulator/oracle", + "HOST_ORACLE_MSISDN": "http://$release_name-als-msisdn-oracle", "dfspEmail": "test@mojaloop.com", "fulfillment": "UNlJ98hZTY_dsw0cAqw4i_UN3v4utt7CZFB4yfLbVFA", "expiration": "2024-07-26T11:12:15.158Z", - "ttkpayeefspIdentifier1": "7891234", + "ttkpayeefspIdentifier1": "5671234", "ttkpayeefspIdentifier2": "5201", "ttkpayeefspName": "ttkpayeefsp", "PROXY1_NAME": "proxyttk", @@ -13900,8 +13980,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.40.zip + testCasesPathInZip: &ttkGitPathSetup testing-toolkit-test-cases-17.0.0-iso.40/collections/hub/provisioning/for_golden_path ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 parameters: <<: *simNames @@ -13914,7 +13994,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.40/collections/hub/golden_path # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14015,7 +14095,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.40/collections/hub/cleanup # awsS3BucketName: aws-s3-bucket-name # awsS3FilePath: ttk-tests/reports ttkBackendURL: http://$release_name-ml-testing-toolkit-backend:5050 @@ -14123,7 +14203,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.40/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 @@ -14168,7 +14248,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.40/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 @@ -14213,7 +14293,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.40/collections/hub/provisioning/for_thirdparty # awsS3FilePath: ttk-tests/reports testSuiteName: Thirdparty Tests environmentName: Development @@ -14255,7 +14335,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.40/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 @@ -14300,7 +14380,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.40/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 @@ -14345,7 +14425,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.40/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 @@ -14390,7 +14470,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.40/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 @@ -14415,7 +14495,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.40/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 @@ -14432,6 +14512,7 @@ ml-ttk-test-val-interscheme: parameters: <<: *simNames testCaseEnvironmentFile: *ttkInputValues + ml-ttk-test-cleanup: tests: enabled: true diff --git a/monitoring/promfana/values.yaml b/monitoring/promfana/values.yaml index 70dc8d5ef..9cd567e31 100644 --- a/monitoring/promfana/values.yaml +++ b/monitoring/promfana/values.yaml @@ -1328,6 +1328,31 @@ prometheus: target_label: __metrics_path__ replacement: /api/v1/nodes/$1/proxy/metrics + - job_name: 'kubelet-probes' + # Default to scraping over https. If required, just disable this or change to + # `http`. + scheme: https + tls_config: + ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt + # If your node certificates are self-signed or use a different CA to the + # master CA, then disable certificate verification below. Note that + # certificate verification is an integral part of a secure infrastructure + # so this should only be disabled in a controlled environment. You can + # disable certificate verification by uncommenting the line below. + # + insecure_skip_verify: true + bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token + kubernetes_sd_configs: + - role: node + relabel_configs: + - action: labelmap + regex: __meta_kubernetes_node_label_(.+) + - target_label: __address__ + replacement: kubernetes.default.svc:443 + - source_labels: [__meta_kubernetes_node_name] + regex: (.+) + target_label: __metrics_path__ + replacement: /api/v1/nodes/${1}/proxy/metrics/probes - job_name: 'kubernetes-nodes-cadvisor' diff --git a/package.sh b/package.sh index 1a0fb206b..a826f4a97 100755 --- a/package.sh +++ b/package.sh @@ -34,6 +34,7 @@ else monitoring/efk account-lookup-service als-oracle-pathfinder + als-msisdn-oracle # centralkms # Deprecated - No longer supported # forensicloggingsidecar # Deprecated - No longer supported centralledger @@ -57,6 +58,7 @@ else mojaloop kube-system/ntpd/ ml-operator + inter-scheme-proxy-adapter ) fi @@ -65,6 +67,15 @@ do if [ -z $BUILD_NUM ] || [ -z $GIT_SHA1 ]; then # we're most likely not running in CI # Probably running on someone's machine helm package -u -d ./repo "$chart" + elif [[ -z $GITHUB_TAG && $CIRCLE_BRANCH =~ ^(major|minor|patch)/(.*)$ ]]; then + set -u + # Build a pre-relase version from pre-relase branches major/name, minor/name, patch/name + # Can be used with helm upgrade --version '>=x.x.x-name.0