Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added the option to pass a template as the rules.json #353

Merged
merged 3 commits into from
Aug 11, 2020
Merged

Added the option to pass a template as the rules.json #353

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e426ee7
Added the option to pass a template as the rules.json
Aug 10, 2020
1335226
Bumped the quoting-service chart version.
Aug 10, 2020
075d6df
Fixed duplicated line.
Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mojaloop/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion quoting-service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 4 additions & 1 deletion quoting-service/templates/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you mean to remove this line?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, thanks I removed it.

rules.json: {{ .Values.rules | quote }}
{{- else }}
Expand All @@ -19,7 +22,7 @@ data:
{{- else }}
rules.json: "[]"
{{- end }}

{{- if .Values.sidecar.enabled }}
---
apiVersion: v1
Expand Down