Addition of Financial portal and settlement services

central/values.yaml

@@ -1413,7 +1413,6 @@ centralledger:
         wsrep_cluster_name=galera
         wsrep_sst_method=xtrabackup-v2
         pxc_strict_mode=DISABLED
-        sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
     ## When set to true will create sidecar for `prom/mysqld-exporter`
     ## metrics exporting
     metricsExporter:

finance-portal/Chart.yaml

@@ -1,5 +1,6 @@
 apiVersion: v1
 appVersion: "1.0"
-description: Finance portal backend service
+description: Finance portal service
 name: finance-portal
 version: 8.6.0
+appVersion: "8.6.0"

finance-portal/templates/backend-ingress.yaml

@@ -0,0 +1,33 @@
+{{- if .Values.backend.ingress.enabled -}}
+{{- $serviceName := include "finance-portal.fullname" . -}}
+{{- $backendPort := .Values.backend.service.port -}}
+{{- $backendPath := .Values.backend.ingress.externalPath -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "finance-portal.fullname" . }}-backend
+  labels:
+    app: {{ template "finance-portal.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    {{- range $key, $value := .Values.backend.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
+      {{- end }}
+spec:
+  rules:
+    {{- range $host := .Values.backend.ingress.hosts }}
+    - host: {{ $host }}
+      http:
+        paths:
+          - path: {{ $backendPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $backendPort }}
+    {{- end -}}
+  {{- if .Values.backend.ingress.tls }}
+  tls:
+    {{ toYaml .Values.backend.ingress.tls | indent 4 }}
+  {{- end -}}
+{{- end -}}

finance-portal/templates/configmap-auth-init.yaml

@@ -3,10 +3,11 @@ kind: ConfigMap
 metadata:
   name: {{ .Values.config.is_populate.name | quote }}
   labels:
-    app: {{ template "finance-portal.fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "finance-portal.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 data:
   HTTP_HOST: {{ .Values.config.oauthServer | quote }}
   HTTP_PORT: {{ .Values.config.oauthPort | quote }}

finance-portal/templates/configmap.yaml

@@ -3,10 +3,11 @@ kind: ConfigMap
 metadata:
   name: {{ template "finance-portal.fullname" . }}
   labels:
-    app: {{ template "finance-portal.fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "finance-portal.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 data:
   SETTLEMENTS_ENDPOINT: {{ (printf "http://%s-%s" .Release.Name .Values.config.settlementsEndpoint) | quote }}
   CENTRAL_LEDGER_ENDPOINT: {{ (printf "http://%s-%s" .Release.Name .Values.config.centralLedgerEndpoint) | quote }}

finance-portal/templates/deployment.yaml

@@ -4,10 +4,11 @@ kind: Deployment
 metadata:
   name: {{ template "finance-portal.fullname" . }}
   labels:
-    app: {{ template "finance-portal.name" . }}
-    chart: {{ template "finance-portal.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "finance-portal.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}001
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 spec:
   selector:
     matchLabels:
@@ -57,7 +58,7 @@ spec:
         imagePullPolicy: {{ .Values.frontend.image.pullPolicy }}
         ports:
         - name: frontend
-          containerPort: 80
+          containerPort: {{ .Values.frontend.image.port }}
           protocol: TCP
         livenessProbe:
           httpGet:

finance-portal/templates/frontend-ingress.yaml

@@ -0,0 +1,34 @@
+{{- if .Values.frontend.ingress.enabled -}}
+{{- $serviceName := include "finance-portal.fullname" . -}}
+{{- $frontendPort := .Values.frontend.service.port -}}
+{{- $frontendPath := .Values.frontend.ingress.externalPath -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ template "finance-portal.fullname" . }}-frontend
+  labels:
+    app: {{ template "finance-portal.fullname" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    {{- range $key, $value := .Values.frontend.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  rules:
+    {{- range $host := .Values.frontend.ingress.hosts }}
+    - host: {{ $host }}
+      http:
+        paths:
+          - path: {{ $frontendPath }}
+            backend:
+              serviceName: {{ $serviceName }}
+              servicePort: {{ $frontendPort }}
+    {{- end -}}
+  {{- if .Values.frontend.ingress.tls }}
+  tls:
+    {{ toYaml .Values.frontend.ingress.tls | indent 4 }}
+  {{- end -}}
+{{- end -}}
+

finance-portal/templates/secrets.yaml

@@ -5,10 +5,11 @@ kind: Secret
 metadata:
   name: {{ template "finance-portal.fullname" . }}
   labels:
-    app: {{ template "finance-portal.fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "finance-portal.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 type: Opaque
 data:
   DB_USER: {{ .Values.db.user | b64enc }}

finance-portal/templates/service.yaml

@@ -3,10 +3,11 @@ kind: Service
 metadata:
   name: {{ template "finance-portal.fullname" . }}
   labels:
-    app: {{ template "finance-portal.name" . }}
-    chart: {{ template "finance-portal.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "finance-portal.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 spec:
   type: {{ .Values.service.type }}
   ports:

finance-portal/values.yaml

@@ -45,24 +45,28 @@ config:
     report2: "something"
 
 frontend:
+  service:
+    port: 80
   image:
     repository: mojaloop/finance-portal-ui
     tag: v0.0.3
     pullPolicy: Always
     port: 80
   ingress:
     enabled: true
-    externalPath: /
-    hosts:
-      api: finance-portal.local
-    annotations:
-      nginx.ingress.kubernetes.io/rewrite-target: '/'
-    tls:
-
+    externalPath: /(.*)
+    hosts: 
+      api: finance-portal-frontend.local
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/rewrite-target: /$1
+      
 backend:
+  service:
+    port: 3000
   image:
     repository: mojaloop/finance-portal-backend-service
-    tag: v0.0.4
+    tag: v0.0.5
     pullPolicy: Always
     port: 3000
   init:
@@ -75,9 +79,9 @@ backend:
   secretsMountPoint: '/secrets'
   ingress:
     enabled: true
-    externalPath: /admin-portal-backend
-    hosts:
-      api: finance-portal.local
-    annotations:
-      nginx.ingress.kubernetes.io/rewrite-target: '/'
-    tls:
+    externalPath: /admin-portal-backend/(.*)
+    hosts: 
+      api: finance-portal-backend.local
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # nginx.ingress.kubernetes.io/rewrite-target: /$1

lint-charts.sh

@@ -77,6 +77,10 @@ echo "Linting finance-portal..."
 helm lint ./finance-portal
 checkCommandResult
 
+echo "Linting portal-settlement..."
+helm lint ./portal-settlement
+checkCommandResult
+
 echo "Linting transaction-requests-service..."
 helm lint ./transaction-requests-service
 checkCommandResult

mojaloop/requirements.yaml

@@ -36,9 +36,7 @@ dependencies:
   version: 8.6.0
   repository: "file://../finance-portal"
   condtion: finance-portal.enabled
-- name: nginx-ingress
-  repository: https://kubernetes-charts.storage.googleapis.com
-  version: ~1.24.7
-- name: settlement
+- name: portal-settlement
   version: 8.6.0
-  repository: "file://../settlement"
+  repository: "file://../portal-settlement"
+  condition: portal-settlement.enabled

mojaloop/values.yaml

@@ -1443,7 +1443,6 @@ central:
           wsrep_cluster_name=galera
           wsrep_sst_method=xtrabackup-v2
           pxc_strict_mode=DISABLED
-          sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
       ## When set to true will create sidecar for `prom/mysqld-exporter`
       ## metrics exporting
       metricsExporter:
@@ -3156,7 +3155,6 @@ account-lookup-service:
         max_connections=999
         max_user_connections=994
         thread_cache_size=999
-        sql_mode=STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
     ## When set to true will create sidecar for `prom/mysqld-exporter`
     ## metrics exporting
     metricsExporter:
@@ -3485,7 +3483,7 @@ simulator:
 
   affinity: {}
 
-settlement:
+portal-settlement:
   enabled: true
 
 mojaloop-bulk:
@@ -4483,7 +4481,3 @@ mojaloop-bulk:
           ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
     additionalLabels: {}
 
-nginx-ingress:
-  # This ensures we have a completely deterministic name for the ingress controller, such that we
-  # can predictably port-forward it with the same command, regardless of the release name
-  fullnameOverride: nginx-ingress

package.sh

@@ -91,6 +91,10 @@ echo "Packaging finance-portal..."
 helm package -u -d ./repo ./finance-portal
 checkCommandResult
 
+echo "Packaging portal-settlement..."
+helm package -u -d ./repo ./portal-settlement
+checkCommandResult
+
 echo "Packaging transaction-requests-service..."
 helm package -u -d ./repo ./transaction-requests-service
 checkCommandResult

portal-settlement/Chart.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+appVersion: "1.0"
+description: Portal Settlement
+name: portal-settlement
+version: 8.6.0
+appVersion: "8.6.0"

settlement/templates/_helpers.tpl → portal-settlement/templates/_helpers.tpl

@@ -2,7 +2,7 @@
 {{/*
 Expand the name of the chart.
 */}}
-{{- define "settlement.name" -}}
+{{- define "portal-settlement.name" -}}
 {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
@@ -11,7 +11,7 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 If release name contains chart name it will be used as a full name.
 */}}
-{{- define "settlement.fullname" -}}
+{{- define "portal-settlement.fullname" -}}
 {{- if .Values.fullnameOverride -}}
 {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
@@ -27,6 +27,6 @@ If release name contains chart name it will be used as a full name.
 {{/*
 Create chart name and version as used by the chart label.
 */}}
-{{- define "settlement.chart" -}}
+{{- define "portal-settlement.chart" -}}
 {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}

settlement/templates/configmap.yaml → portal-settlement/templates/configmap.yaml

@@ -1,12 +1,13 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "settlement.fullname" . }}
+  name: {{ template "portal-settlement.fullname" . }}
   labels:
-    app: {{ template "settlement.fullname" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
+    app.kubernetes.io/name: {{ include "portal-settlement.name" . }}
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/managed-by: {{ .Release.Service }}
+    helm.sh/chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
 data:
   ADMIN_ENDPOINT: {{ (printf "%s%s-%s:%s" "http://" .Release.Name .Values.settlementManagement.config.CENTRAL_LEDGER_SERVICE_NAME .Values.settlementManagement.config.CENTRAL_LEDGER_SERVICE_ADMIN_PORT) | quote }}
   MIN_WINDOW_AGE_MS: {{ (printf "%s" .Values.settlementManagement.config.MIN_WINDOW_AGE_MS) | quote }}