'Updating development release to v6.0.1.2'

mojaloop · Dec 4, 2024 · cbbb8c9 · cbbb8c9
2 parents b93176f + 2da77ce
commit cbbb8c9
Show file tree

Hide file tree

Showing 24 changed files with 1,808 additions and 6,605 deletions.
diff --git a/mojaloop/reporting-nifi-processor-svc/configs/flow.json b/mojaloop/reporting-nifi-processor-svc/configs/flow.json
diff --git a/mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml b/mojaloop/reporting-nifi-processor-svc/templates/statefulset.yaml
@@ -109,7 +109,8 @@ spec:
 
           cat "${NIFI_HOME}/conf/nifi.temp" > "${NIFI_HOME}/conf/nifi.properties"
 
-          if ! test -f /opt/nifi/data/flow.json.gz && test -f /opt/nifi/data/flow.json; then
+          if ! test -f /opt/nifi/data/flow.json.gz ; then
+            curl -L -o /opt/nifi/data/flow.json ${NIFI_FLOW_URL}
             gzip /opt/nifi/data/flow.json
           fi
 
@@ -179,7 +180,7 @@ spec:
           value: '{{ include "common.backends.reportingDB.password" . }}'
         {{- end }}
 {{- if .Values.env }}
-{{ toYaml .Values.env | indent 8 }}
+{{ tpl (toYaml .Values.env) . | indent 8 }}
 {{- end }}
 {{- if .Values.envFrom }}
         envFrom:
@@ -273,9 +274,6 @@ spec:
           - name: "zookeeper-properties"
             mountPath: /opt/nifi/nifi-current/conf/zookeeper.properties
             subPath: "zookeeper.properties"
-          - name: "flow-content"
-            mountPath: /opt/nifi/data/flow.json
-            subPath: "flow.json"
           {{- range $secret := .Values.secrets }}
             {{- if $secret.mountPath }}
               {{- if $secret.keys }}
@@ -399,12 +397,6 @@ spec:
           items:
             - key: "zookeeper.properties"
               path: "zookeeper.properties"
-      - name: "flow-content"
-        configMap:
-          name: {{ template "common.names.fullname" . }}-config
-          items:
-            - key: "flow.json"
-              path: "flow.json"
       {{- range .Values.secrets }}
       - name: {{ include "common.names.fullname" $ }}-{{ .name }}
         secret:

diff --git a/mojaloop/reporting-nifi-processor-svc/values.yaml b/mojaloop/reporting-nifi-processor-svc/values.yaml
@@ -351,6 +351,26 @@ env:
     value: "changeMe"
   - name: KEYSTORE_PASSWORD
     value: "changeMe"
+  ## DB
+  - name: REPORTING_EVENTS_DB_HOST
+    value: '{{ include "common.backends.reportingEventsDB.host" . }}'
+  - name: REPORTING_EVENTS_DB_PORT
+    value: '{{ include "common.backends.reportingEventsDB.port" . }}'
+  - name: REPORTING_EVENTS_DB_DATABASE
+    value: '{{ include "common.backends.reportingEventsDB.database" . }}'
+  - name: REPORTING_EVENTS_DB_USER
+    value: '{{ include "common.backends.reportingEventsDB.user" . }}'
+  - name: REPORTING_DB_HOST
+    value: '{{ include "common.backends.reportingDB.host" . }}'
+  - name: REPORTING_DB_PORT
+    value: '{{ include "common.backends.reportingDB.port" . }}'
+  - name: REPORTING_DB_DATABASE
+    value: '{{ include "common.backends.reportingDB.database" . }}'
+  - name: REPORTING_DB_USER
+    value: '{{ include "common.backends.reportingDB.user" . }}'
+  - name: NIFI_FLOW_URL
+    value: https://raw.githubusercontent.com/mojaloop/reporting-events-processor-svc/refs/tags/v3.0.1-snapshot.0/apache-nifi-workflow/flow.json
+
 
 ## Extra environment variables from secrets and config maps
 envFrom: []

diff --git a/repo/account-lookup-service-13.0.0.tgz b/repo/account-lookup-service-13.0.0.tgz
diff --git a/repo/account-lookup-service-admin-13.0.0.tgz b/repo/account-lookup-service-admin-13.0.0.tgz
diff --git a/repo/admin-api-svc-12.0.0.tgz b/repo/admin-api-svc-12.0.0.tgz
diff --git a/repo/backend-0.1.0.tgz b/repo/backend-0.1.0.tgz
diff --git a/repo/bof-5.1.0.tgz b/repo/bof-5.1.0.tgz
diff --git a/repo/common-3.1.1.tgz b/repo/common-3.1.1.tgz
diff --git a/repo/finance-portal-4.3.1-snapshot.1.tgz b/repo/finance-portal-4.3.1-snapshot.1.tgz
diff --git a/repo/fspiop-transfer-api-svc-12.0.1.tgz b/repo/fspiop-transfer-api-svc-12.0.1.tgz