From e426ee74043d7a2d8bb32342080f0b90205941dd Mon Sep 17 00:00:00 2001 From: Vassilis Barzokas Date: Mon, 10 Aug 2020 17:59:03 +0300 Subject: [PATCH 1/3] Added the option to pass a template as the rules.json --- quoting-service/templates/config.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/quoting-service/templates/config.yaml b/quoting-service/templates/config.yaml index 5cb49ec22..8d9810902 100644 --- a/quoting-service/templates/config.yaml +++ b/quoting-service/templates/config.yaml @@ -11,6 +11,9 @@ metadata: data: default.json: {{ (tpl (.Files.Get "configs/default.json") . ) | quote }} {{- if .Values.rules }} + {{- if (typeIs "string" .Values.rules.template) }} + rules.json: {{ (tpl .Values.rules.template . ) }} + {{- else if (typeIs "string" .Values.rules) }} {{- if (typeIs "string" .Values.rules) }} rules.json: {{ .Values.rules | quote }} {{- else }} @@ -19,7 +22,7 @@ data: {{- else }} rules.json: "[]" {{- end }} - + {{- if .Values.sidecar.enabled }} --- apiVersion: v1 From 1335226250e6b2c114f2613fb90ec1818b16b8ec Mon Sep 17 00:00:00 2001 From: Vassilis Barzokas Date: Mon, 10 Aug 2020 18:36:18 +0300 Subject: [PATCH 2/3] Bumped the quoting-service chart version. --- mojaloop/requirements.yaml | 2 +- quoting-service/Chart.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mojaloop/requirements.yaml b/mojaloop/requirements.yaml index 005a2ba04..41ed7a820 100644 --- a/mojaloop/requirements.yaml +++ b/mojaloop/requirements.yaml @@ -17,7 +17,7 @@ dependencies: repository: "file://../account-lookup-service" condition: account-lookup-service.enabled - name: quoting-service - version: 10.4.0 + version: 10.4.1 repository: "file://../quoting-service" condition: quoting-service.enabled - name: simulator diff --git a/quoting-service/Chart.yaml b/quoting-service/Chart.yaml index 41ecef4cd..60cf5c235 100644 --- a/quoting-service/Chart.yaml +++ b/quoting-service/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: Quoting-Service Helm chart for Kubernetes name: quoting-service -version: 10.4.0 +version: 10.4.1 appVersion: "10.5.5" home: http://mojaloop.io icon: http://mojaloop.io/images/logo.png From 075d6dfc60b2f713ad8f2071838eb52bf3c2f0ee Mon Sep 17 00:00:00 2001 From: Vassilis Barzokas Date: Tue, 11 Aug 2020 14:05:16 +0300 Subject: [PATCH 3/3] Fixed duplicated line. --- quoting-service/templates/config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/quoting-service/templates/config.yaml b/quoting-service/templates/config.yaml index 8d9810902..a1ed76449 100644 --- a/quoting-service/templates/config.yaml +++ b/quoting-service/templates/config.yaml @@ -14,7 +14,6 @@ data: {{- if (typeIs "string" .Values.rules.template) }} rules.json: {{ (tpl .Values.rules.template . ) }} {{- else if (typeIs "string" .Values.rules) }} - {{- if (typeIs "string" .Values.rules) }} rules.json: {{ .Values.rules | quote }} {{- else }} rules.json: {{ .Values.rules | toPrettyJson | quote }}