chore: pre-relase branches

.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)/.*/

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

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

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 }}

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:

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
+

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

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 }}",

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 }}

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:

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 @@
       serviceName: account-lookup-service-handler-timeout
 
 config:
+  ## fspiop or iso20022
+  api_type: fspiop
   hub_participant:
     id: 1
     name: Hub
@@ -226,7 +228,7 @@
 # Public:
 # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub
 # Should look like:
 # -----BEGIN RSA PRIVATE KEY-----
 # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R
 # ..
 # ..
@@ -264,6 +266,10 @@
       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:

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

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 }}",

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 }}

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:

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:

account-lookup-service/values.yaml

@@ -7,7 +7,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
@@ -344,7 +344,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
@@ -704,7 +704,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
@@ -854,7 +854,7 @@
     # Public:
     # openssl rsa -in jwtRS256.key -pubout -outform PEM -out jwtRS256.key.pub
     # Should look like:
     # -----BEGIN RSA PRIVATE KEY-----
     # MIIJKQIBAAKCAgEAxfqaZivMPd4MpdBHu0jVMf3MSuSdkSMHn+sNJdDQfl+x4R5R
     # ..
     # ..
@@ -871,7 +871,7 @@
         cluster:
           - host: proxy-cache-redis
             port: 6379
-    
+
     handlers:
       DISABLED: true
       MONITORING_PORT: 4003
@@ -1032,7 +1032,7 @@
   #    hosts:
   #      - chart-example.local
   resources: {}
-  
+
 
 als-oracle-pathfinder:
   enabled: false

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: [email protected]
+dependencies:
+  - name: common
+    repository: https://mojaloop.github.io/charts/repo
+    version: 3.1.1
+    tags:
+      - moja-common

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.