From d1e9409b2245f250998cd6b8c81f9f2fc198101c Mon Sep 17 00:00:00 2001 From: David Fry Date: Tue, 26 Mar 2024 21:12:58 +0000 Subject: [PATCH 1/9] alter deploy to use secret --- account-lookup-svc/templates/deployment.yaml | 12 ++++++++---- account-lookup-svc/values.yaml | 15 +++------------ .../templates/deployment.yaml | 12 ++++++++---- .../values.yaml | 11 +---------- .../templates/deployment.yaml | 9 ++++++++- accounts-and-balances-coa-grpc-svc/values.yaml | 15 +++------------ fspiop-api-svc/templates/deployment.yaml | 9 ++++++++- fspiop-api-svc/values.yaml | 11 +---------- participants-svc/templates/deployment.yaml | 9 ++++++++- participants-svc/values.yaml | 11 +---------- quoting-svc/templates/deployment.yaml | 9 ++++++++- quoting-svc/values.yaml | 11 +---------- settlements-api-svc/templates/deployment.yaml | 9 ++++++++- settlements-api-svc/values.yaml | 11 +---------- .../templates/deployment.yaml | 9 ++++++++- settlements-command-handler-svc/values.yaml | 11 +---------- .../templates/deployment.yaml | 9 ++++++++- settlements-event-handler-svc/values.yaml | 11 +---------- transfers-api-svc/templates/deployment.yaml | 9 ++++++++- transfers-api-svc/values.yaml | 11 +---------- .../templates/deployment.yaml | 9 ++++++++- transfers-command-handler-svc/values.yaml | 11 +---------- .../templates/deployment.yaml | 9 ++++++++- transfers-event-handler-svc/values.yaml | 11 +---------- 24 files changed, 112 insertions(+), 142 deletions(-) diff --git a/account-lookup-svc/templates/deployment.yaml b/account-lookup-svc/templates/deployment.yaml index b923634..fe767f0 100644 --- a/account-lookup-svc/templates/deployment.yaml +++ b/account-lookup-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL @@ -71,9 +78,6 @@ spec: value: {{ .Values.env.auth_n_token_audience }} - name: PARTICIPANTS_SVC_URL value: {{ .Values.env.participants_svc_url }} -{{- if .Values.extraEnvs | default .Values.extraEnvs }} -{{ toYaml ( .Values.extraEnvs | default .Values.extraEnvs ) | indent 10 }} -{{- end }} volumes: - name: account-lookup-svc-data emptyDir: {} diff --git a/account-lookup-svc/values.yaml b/account-lookup-svc/values.yaml index 08ebc33..cb6caf5 100644 --- a/account-lookup-svc/values.yaml +++ b/account-lookup-svc/values.yaml @@ -54,8 +54,8 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -108,16 +108,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience participants_svc_url: http://participants-svc:3010 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_URL diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml index 7c1c900..6d73edb 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL @@ -75,9 +82,6 @@ spec: value: {{ .Values.env.redis_host}} - name: REDIS_PORT value: {{ .Values.env.redis_port | quote}} -{{- if .Values.extraEnvs | default .Values.extraEnvs }} -{{ toYaml ( .Values.extraEnvs | default .Values.extraEnvs ) | indent 10 }} -{{- end }} volumes: - name: aandb-builtin-ledger-grpc-svc-data emptyDir: {} diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml index d7c09da..7d542ce 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml @@ -109,16 +109,7 @@ env: redis_host: redis-master redis_port: 6379 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml b/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml index adcb84a..255133b 100644 --- a/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml +++ b/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: ELASTICSEARCH_URL diff --git a/accounts-and-balances-coa-grpc-svc/values.yaml b/accounts-and-balances-coa-grpc-svc/values.yaml index 17958cd..dcfe622 100644 --- a/accounts-and-balances-coa-grpc-svc/values.yaml +++ b/accounts-and-balances-coa-grpc-svc/values.yaml @@ -54,8 +54,8 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -111,16 +111,7 @@ env: redis_port: 6379 builtin_ledger_svc_url: accounts-and-balances-builtin-ledger-grpc-svc:3350 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/fspiop-api-svc/templates/deployment.yaml b/fspiop-api-svc/templates/deployment.yaml index c1b1287..bcb3cca 100644 --- a/fspiop-api-svc/templates/deployment.yaml +++ b/fspiop-api-svc/templates/deployment.yaml @@ -62,7 +62,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: ELASTICSEARCH_URL diff --git a/fspiop-api-svc/values.yaml b/fspiop-api-svc/values.yaml index b20bfdc..f7149cc 100644 --- a/fspiop-api-svc/values.yaml +++ b/fspiop-api-svc/values.yaml @@ -111,16 +111,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience participants_svc_url: http://participants-svc:3010 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/participants-svc/templates/deployment.yaml b/participants-svc/templates/deployment.yaml index d8e0567..a7bc05a 100644 --- a/participants-svc/templates/deployment.yaml +++ b/participants-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: ELASTICSEARCH_URL diff --git a/participants-svc/values.yaml b/participants-svc/values.yaml index 54c064b..07b56f2 100644 --- a/participants-svc/values.yaml +++ b/participants-svc/values.yaml @@ -108,16 +108,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience account_and_balance_coa_svc: accounts-and-balances-coa-grpc-svc:3300 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/quoting-svc/templates/deployment.yaml b/quoting-svc/templates/deployment.yaml index a8055dc..9dd55ad 100644 --- a/quoting-svc/templates/deployment.yaml +++ b/quoting-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/quoting-svc/values.yaml b/quoting-svc/values.yaml index 883d4d7..bd18569 100644 --- a/quoting-svc/values.yaml +++ b/quoting-svc/values.yaml @@ -107,16 +107,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience participants_svc_url: http://participants-svc:3010 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/settlements-api-svc/templates/deployment.yaml b/settlements-api-svc/templates/deployment.yaml index e17612c..bee85e0 100644 --- a/settlements-api-svc/templates/deployment.yaml +++ b/settlements-api-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/settlements-api-svc/values.yaml b/settlements-api-svc/values.yaml index 46c4789..e6e3f40 100644 --- a/settlements-api-svc/values.yaml +++ b/settlements-api-svc/values.yaml @@ -108,16 +108,7 @@ env: participants_svc_url: http://participants-svc:3010 account_and_balance_coa_svc: accounts-and-balances-coa-grpc-svc:3300 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/settlements-command-handler-svc/templates/deployment.yaml b/settlements-command-handler-svc/templates/deployment.yaml index 8eddffb..cf2df8e 100644 --- a/settlements-command-handler-svc/templates/deployment.yaml +++ b/settlements-command-handler-svc/templates/deployment.yaml @@ -62,7 +62,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/settlements-command-handler-svc/values.yaml b/settlements-command-handler-svc/values.yaml index 49d30f6..80ec698 100644 --- a/settlements-command-handler-svc/values.yaml +++ b/settlements-command-handler-svc/values.yaml @@ -97,16 +97,7 @@ env: participants_svc_url: http://participants-svc:3010 account_and_balance_coa_svc: accounts-and-balances-coa-grpc-svc:3300 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/settlements-event-handler-svc/templates/deployment.yaml b/settlements-event-handler-svc/templates/deployment.yaml index e5a2080..640c4c8 100644 --- a/settlements-event-handler-svc/templates/deployment.yaml +++ b/settlements-event-handler-svc/templates/deployment.yaml @@ -62,7 +62,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/settlements-event-handler-svc/values.yaml b/settlements-event-handler-svc/values.yaml index 774d5a0..e50cda6 100644 --- a/settlements-event-handler-svc/values.yaml +++ b/settlements-event-handler-svc/values.yaml @@ -96,16 +96,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience participants_svc_url: http://participants-svc:3010 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/transfers-api-svc/templates/deployment.yaml b/transfers-api-svc/templates/deployment.yaml index 30435df..c2bf0c0 100644 --- a/transfers-api-svc/templates/deployment.yaml +++ b/transfers-api-svc/templates/deployment.yaml @@ -58,7 +58,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/transfers-api-svc/values.yaml b/transfers-api-svc/values.yaml index a1003d6..b17d275 100644 --- a/transfers-api-svc/values.yaml +++ b/transfers-api-svc/values.yaml @@ -107,16 +107,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience participants_svc_url: http://participants-svc:3010 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/transfers-command-handler-svc/templates/deployment.yaml b/transfers-command-handler-svc/templates/deployment.yaml index e4b6318..58e0439 100644 --- a/transfers-command-handler-svc/templates/deployment.yaml +++ b/transfers-command-handler-svc/templates/deployment.yaml @@ -62,7 +62,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/transfers-command-handler-svc/values.yaml b/transfers-command-handler-svc/values.yaml index 1ae34e8..6f8695f 100644 --- a/transfers-command-handler-svc/values.yaml +++ b/transfers-command-handler-svc/values.yaml @@ -98,16 +98,7 @@ env: account_and_balance_coa_svc: accounts-and-balances-coa-grpc-svc:3300 settlements_svc_url: http://settlements-api-svc:3600 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC diff --git a/transfers-event-handler-svc/templates/deployment.yaml b/transfers-event-handler-svc/templates/deployment.yaml index 5cef137..3759011 100644 --- a/transfers-event-handler-svc/templates/deployment.yaml +++ b/transfers-event-handler-svc/templates/deployment.yaml @@ -62,7 +62,14 @@ spec: - name: KAFKA_AUDITS_TOPIC value: {{ .Values.env.kafka_audits_topic }} - name: MONGO_URL - value: {{ .Values.env.mongo_url }} + {{- if .Values.config.mongo_url_secret }} + valueFrom: + secretKeyRef: + name: '{{ .Values.config.mongo_url_secret.name }}' + key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: {{ .Values.config.mongo_url }} + {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} - name: AUTH_Z_SVC_BASEURL diff --git a/transfers-event-handler-svc/values.yaml b/transfers-event-handler-svc/values.yaml index 626bcb0..3d6eaf4 100644 --- a/transfers-event-handler-svc/values.yaml +++ b/transfers-event-handler-svc/values.yaml @@ -96,16 +96,7 @@ env: auth_n_token_audience: mojaloop.vnext.dev.default_audience participants_svc_url: http://participants-svc:3010 -extraEnvs: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} - valueFrom: - secretKeyRef: - name: '{{ .Values.config.mongo_url_secret.name }}' - key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} +extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 # - name: KAFKA_LOGS_TOPIC From 635171e3fe67a6a81aa92f2780809b857e4eaacb Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 07:49:56 +0000 Subject: [PATCH 2/9] workaround for init container mongo secret --- .../values.yaml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml index 7d542ce..ece321f 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml @@ -4,11 +4,10 @@ #general config params config: mongo_url: mongodb://root:mongodb@mongodb:27017 - # db_secret: ### Example config for an existing secret - # mongo_url_secret: - # name: mongo-secret - # key: password + mongo_url_secret: + name: mongo-secret + key: password replicaCount: 1 image: @@ -156,15 +155,11 @@ initContainers: | echo ====================; echo MongoDB ok!; env: - - name: mongo_url - {{- if .Values.config.mongo_url_secret }} + - name: MONGO_URL valueFrom: secretKeyRef: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' - {{- else }} - value: {{ .Values.config.mongo_url }} - {{- end }} - name: wait-for-platform-configuration-svc image: curlimages/curl:8.3.0 From 80de6eee0561fb5b4a2707e311e35cdb55748e99 Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 08:33:11 +0000 Subject: [PATCH 3/9] add template helper --- .../templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/templates/_helpers.tpl b/accounts-and-balances-builtin-ledger-grpc-svc/templates/_helpers.tpl index 0658c1d..564d5d4 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/templates/_helpers.tpl +++ b/accounts-and-balances-builtin-ledger-grpc-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml index 6d73edb..b35fab9 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} From 2cb2fcb1851865bec2a9c06b95649e8108c0fd01 Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 09:20:55 +0000 Subject: [PATCH 4/9] add helper function for copying init values --- account-lookup-http-oracle-svc/templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 2 +- account-lookup-svc/templates/_helpers.tpl | 10 ++++++++++ account-lookup-svc/templates/deployment.yaml | 2 +- .../templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 2 +- admin-ui/templates/_helpers.tpl | 10 ++++++++++ auditing-svc/templates/_helpers.tpl | 10 ++++++++++ auditing-svc/templates/deployment.yaml | 2 +- authentication-svc/templates/_helpers.tpl | 10 ++++++++++ authentication-svc/templates/deployment.yaml | 2 +- authorization-svc/templates/_helpers.tpl | 10 ++++++++++ authorization-svc/templates/deployment.yaml | 2 +- fspiop-api-svc/templates/_helpers.tpl | 10 ++++++++++ fspiop-api-svc/templates/deployment.yaml | 2 +- logging-svc/templates/_helpers.tpl | 10 ++++++++++ logging-svc/templates/deployment.yaml | 2 +- participants-svc/templates/_helpers.tpl | 10 ++++++++++ participants-svc/templates/deployment.yaml | 2 +- platform-configuration-svc/templates/_helpers.tpl | 10 ++++++++++ platform-configuration-svc/templates/deployment.yaml | 2 +- quoting-svc/templates/_helpers.tpl | 10 ++++++++++ quoting-svc/templates/deployment.yaml | 2 +- settlements-api-svc/templates/_helpers.tpl | 10 ++++++++++ settlements-api-svc/templates/deployment.yaml | 2 +- settlements-command-handler-svc/templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 2 +- settlements-event-handler-svc/templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 2 +- transfers-api-svc/templates/_helpers.tpl | 10 ++++++++++ transfers-api-svc/templates/deployment.yaml | 2 +- transfers-command-handler-svc/templates/_helpers.tpl | 10 ++++++++++ .../templates/deployment.yaml | 2 +- transfers-event-handler-svc/templates/_helpers.tpl | 10 ++++++++++ transfers-event-handler-svc/templates/deployment.yaml | 2 +- vnext/templates/_helpers.tpl | 10 ++++++++++ 36 files changed, 207 insertions(+), 17 deletions(-) diff --git a/account-lookup-http-oracle-svc/templates/_helpers.tpl b/account-lookup-http-oracle-svc/templates/_helpers.tpl index 5fb6961..e81074f 100644 --- a/account-lookup-http-oracle-svc/templates/_helpers.tpl +++ b/account-lookup-http-oracle-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/account-lookup-http-oracle-svc/templates/deployment.yaml b/account-lookup-http-oracle-svc/templates/deployment.yaml index 0686929..17a7e4d 100644 --- a/account-lookup-http-oracle-svc/templates/deployment.yaml +++ b/account-lookup-http-oracle-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: diff --git a/account-lookup-svc/templates/_helpers.tpl b/account-lookup-svc/templates/_helpers.tpl index b752361..06a4acb 100644 --- a/account-lookup-svc/templates/_helpers.tpl +++ b/account-lookup-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/account-lookup-svc/templates/deployment.yaml b/account-lookup-svc/templates/deployment.yaml index fe767f0..248341c 100644 --- a/account-lookup-svc/templates/deployment.yaml +++ b/account-lookup-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/accounts-and-balances-coa-grpc-svc/templates/_helpers.tpl b/accounts-and-balances-coa-grpc-svc/templates/_helpers.tpl index d3350fe..10efe90 100644 --- a/accounts-and-balances-coa-grpc-svc/templates/_helpers.tpl +++ b/accounts-and-balances-coa-grpc-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml b/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml index 255133b..78133ec 100644 --- a/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml +++ b/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/admin-ui/templates/_helpers.tpl b/admin-ui/templates/_helpers.tpl index 310c43d..794ab62 100644 --- a/admin-ui/templates/_helpers.tpl +++ b/admin-ui/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/auditing-svc/templates/_helpers.tpl b/auditing-svc/templates/_helpers.tpl index 1a163f3..420bd6f 100644 --- a/auditing-svc/templates/_helpers.tpl +++ b/auditing-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/auditing-svc/templates/deployment.yaml b/auditing-svc/templates/deployment.yaml index 92ab864..1b9a0b9 100644 --- a/auditing-svc/templates/deployment.yaml +++ b/auditing-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/authentication-svc/templates/_helpers.tpl b/authentication-svc/templates/_helpers.tpl index bb4e3a3..eafd3d6 100644 --- a/authentication-svc/templates/_helpers.tpl +++ b/authentication-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/authentication-svc/templates/deployment.yaml b/authentication-svc/templates/deployment.yaml index 754bfd2..32d5091 100644 --- a/authentication-svc/templates/deployment.yaml +++ b/authentication-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/authorization-svc/templates/_helpers.tpl b/authorization-svc/templates/_helpers.tpl index d3c27f5..3b6ca49 100644 --- a/authorization-svc/templates/_helpers.tpl +++ b/authorization-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/authorization-svc/templates/deployment.yaml b/authorization-svc/templates/deployment.yaml index d93a6bf..a055961 100644 --- a/authorization-svc/templates/deployment.yaml +++ b/authorization-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/fspiop-api-svc/templates/_helpers.tpl b/fspiop-api-svc/templates/_helpers.tpl index f56a136..5fec349 100644 --- a/fspiop-api-svc/templates/_helpers.tpl +++ b/fspiop-api-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/fspiop-api-svc/templates/deployment.yaml b/fspiop-api-svc/templates/deployment.yaml index bcb3cca..b718faa 100644 --- a/fspiop-api-svc/templates/deployment.yaml +++ b/fspiop-api-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/logging-svc/templates/_helpers.tpl b/logging-svc/templates/_helpers.tpl index 780dbc3..fe9f253 100644 --- a/logging-svc/templates/_helpers.tpl +++ b/logging-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/logging-svc/templates/deployment.yaml b/logging-svc/templates/deployment.yaml index 05e3e44..1907e74 100644 --- a/logging-svc/templates/deployment.yaml +++ b/logging-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/participants-svc/templates/_helpers.tpl b/participants-svc/templates/_helpers.tpl index 9de0843..a795b71 100644 --- a/participants-svc/templates/_helpers.tpl +++ b/participants-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/participants-svc/templates/deployment.yaml b/participants-svc/templates/deployment.yaml index a7bc05a..28020ad 100644 --- a/participants-svc/templates/deployment.yaml +++ b/participants-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/platform-configuration-svc/templates/_helpers.tpl b/platform-configuration-svc/templates/_helpers.tpl index dfe09a0..501bf17 100644 --- a/platform-configuration-svc/templates/_helpers.tpl +++ b/platform-configuration-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/platform-configuration-svc/templates/deployment.yaml b/platform-configuration-svc/templates/deployment.yaml index 458dfac..c364fde 100644 --- a/platform-configuration-svc/templates/deployment.yaml +++ b/platform-configuration-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/quoting-svc/templates/_helpers.tpl b/quoting-svc/templates/_helpers.tpl index f1318be..ee6ee33 100644 --- a/quoting-svc/templates/_helpers.tpl +++ b/quoting-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/quoting-svc/templates/deployment.yaml b/quoting-svc/templates/deployment.yaml index 9dd55ad..027fb6c 100644 --- a/quoting-svc/templates/deployment.yaml +++ b/quoting-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/settlements-api-svc/templates/_helpers.tpl b/settlements-api-svc/templates/_helpers.tpl index 6a94ba9..52d4820 100644 --- a/settlements-api-svc/templates/_helpers.tpl +++ b/settlements-api-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/settlements-api-svc/templates/deployment.yaml b/settlements-api-svc/templates/deployment.yaml index bee85e0..c3e53c4 100644 --- a/settlements-api-svc/templates/deployment.yaml +++ b/settlements-api-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/settlements-command-handler-svc/templates/_helpers.tpl b/settlements-command-handler-svc/templates/_helpers.tpl index 465f9e1..e0462e9 100644 --- a/settlements-command-handler-svc/templates/_helpers.tpl +++ b/settlements-command-handler-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/settlements-command-handler-svc/templates/deployment.yaml b/settlements-command-handler-svc/templates/deployment.yaml index cf2df8e..ecda418 100644 --- a/settlements-command-handler-svc/templates/deployment.yaml +++ b/settlements-command-handler-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/settlements-event-handler-svc/templates/_helpers.tpl b/settlements-event-handler-svc/templates/_helpers.tpl index 8c73ebc..bb97fa5 100644 --- a/settlements-event-handler-svc/templates/_helpers.tpl +++ b/settlements-event-handler-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/settlements-event-handler-svc/templates/deployment.yaml b/settlements-event-handler-svc/templates/deployment.yaml index 640c4c8..dcac83f 100644 --- a/settlements-event-handler-svc/templates/deployment.yaml +++ b/settlements-event-handler-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/transfers-api-svc/templates/_helpers.tpl b/transfers-api-svc/templates/_helpers.tpl index b3256f4..12cf1b8 100644 --- a/transfers-api-svc/templates/_helpers.tpl +++ b/transfers-api-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/transfers-api-svc/templates/deployment.yaml b/transfers-api-svc/templates/deployment.yaml index c2bf0c0..9a904c1 100644 --- a/transfers-api-svc/templates/deployment.yaml +++ b/transfers-api-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/transfers-command-handler-svc/templates/_helpers.tpl b/transfers-command-handler-svc/templates/_helpers.tpl index ba2f347..a22510a 100644 --- a/transfers-command-handler-svc/templates/_helpers.tpl +++ b/transfers-command-handler-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/transfers-command-handler-svc/templates/deployment.yaml b/transfers-command-handler-svc/templates/deployment.yaml index 58e0439..ac93ece 100644 --- a/transfers-command-handler-svc/templates/deployment.yaml +++ b/transfers-command-handler-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/transfers-event-handler-svc/templates/_helpers.tpl b/transfers-event-handler-svc/templates/_helpers.tpl index a8e8db9..621965b 100644 --- a/transfers-event-handler-svc/templates/_helpers.tpl +++ b/transfers-event-handler-svc/templates/_helpers.tpl @@ -61,3 +61,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file diff --git a/transfers-event-handler-svc/templates/deployment.yaml b/transfers-event-handler-svc/templates/deployment.yaml index 3759011..1443d6f 100644 --- a/transfers-event-handler-svc/templates/deployment.yaml +++ b/transfers-event-handler-svc/templates/deployment.yaml @@ -29,7 +29,7 @@ spec: {{- toYaml .Values.podSecurityContext | nindent 8 }} initContainers: {{- if .Values.initContainers }} - {{- .Values.initContainers | nindent 8 }} + {{- include "tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }} {{- end }} containers: - name: {{ .Chart.Name }} diff --git a/vnext/templates/_helpers.tpl b/vnext/templates/_helpers.tpl index 25cb5cc..96f8e0c 100644 --- a/vnext/templates/_helpers.tpl +++ b/vnext/templates/_helpers.tpl @@ -60,3 +60,13 @@ Create the name of the service account to use {{- default "default" .Values.serviceAccount.name }} {{- end }} {{- end }} + +{{ include "tplvalues.render" ( dict "value" .Values.path.to.the.Value "context" $) }} +*/}} +{{- define "tplvalues.render" -}} + {{- if typeIs "string" .value }} + {{- tpl .value .context }} + {{- else }} + {{- tpl (.value | toYaml) .context }} + {{- end }} +{{- end -}} \ No newline at end of file From 423bd507bb92fca95bc2af297b4329d5ad5f86a1 Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 09:24:02 +0000 Subject: [PATCH 5/9] add back if on secret presence --- accounts-and-balances-builtin-ledger-grpc-svc/values.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml index ece321f..e7ab40d 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml @@ -156,10 +156,14 @@ initContainers: | echo MongoDB ok!; env: - name: MONGO_URL + {{- if .Values.config.mongo_url_secret }} valueFrom: secretKeyRef: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' + {{- else }} + value: '{{ .Values.config.mongo_url }}' + {{- end }} - name: wait-for-platform-configuration-svc image: curlimages/curl:8.3.0 From 228752607cad019c92c166a638cc8dcba4431d87 Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 09:45:47 +0000 Subject: [PATCH 6/9] fix missing kafka config --- auditing-svc/values.yaml | 6 +++--- authentication-svc/values.yaml | 8 +++----- authorization-svc/values.yaml | 8 +++----- platform-configuration-svc/values.yaml | 6 +++--- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/auditing-svc/values.yaml b/auditing-svc/values.yaml index af3215a..ec908f8 100644 --- a/auditing-svc/values.yaml +++ b/auditing-svc/values.yaml @@ -46,8 +46,8 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -123,4 +123,4 @@ initContainers: | echo Kafka ok!; env: - name: KAFKA_URL - value: kafka:9092 + value: '{{ .Values.env.kafka_url }}' diff --git a/authentication-svc/values.yaml b/authentication-svc/values.yaml index 377be68..8de4bd2 100644 --- a/authentication-svc/values.yaml +++ b/authentication-svc/values.yaml @@ -46,8 +46,8 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -98,7 +98,6 @@ env: auth_n_issuer_name: mojaloop.vnext.dev.default_issuer platform_config_base_svc_url: http://platform-configuration-svc:3100 - extraEnvs: {} # - name: KAFKA_URL # value: kafka:9092 @@ -115,7 +114,6 @@ extraEnvs: {} # - name: PLATFORM_CONFIG_BASE_SVC_URL # value: http://platform-configuration-svc:3100 - initContainers: | - name: wait-for-kafka image: solsson/kafka:2.8.1 @@ -133,4 +131,4 @@ initContainers: | echo Kafka ok!; env: - name: KAFKA_URL - value: kafka:9092 + value: '{{ .Values.env.kafka_url }}' diff --git a/authorization-svc/values.yaml b/authorization-svc/values.yaml index 51af593..11146dd 100644 --- a/authorization-svc/values.yaml +++ b/authorization-svc/values.yaml @@ -46,8 +46,8 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -89,7 +89,6 @@ readinessProbe: initialDelaySeconds: 5 periodSeconds: 10 - env: kafka_url: kafka:9092 kafka_logs_topic: logs @@ -106,7 +105,6 @@ extraEnvs: {} # - name: PLATFORM_CONFIG_BASE_SVC_URL # value: http://platform-configuration-svc:3100 - initContainers: | - name: wait-for-kafka image: solsson/kafka:2.8.1 @@ -124,4 +122,4 @@ initContainers: | echo Kafka ok!; env: - name: KAFKA_URL - value: kafka:9092 + value: '{{ .Values.env.kafka_url }}' diff --git a/platform-configuration-svc/values.yaml b/platform-configuration-svc/values.yaml index f3781b2..b5face6 100644 --- a/platform-configuration-svc/values.yaml +++ b/platform-configuration-svc/values.yaml @@ -46,8 +46,8 @@ ingress: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: - - host: chart-example.local - paths: [] + - host: chart-example.local + paths: [] tls: [] # - secretName: chart-example-tls # hosts: @@ -125,7 +125,7 @@ initContainers: | echo Kafka ok!; env: - name: KAFKA_URL - value: kafka:9092 + value: '{{ .Values.env.kafka_url }}' - name: wait-for-auth-z-svc image: curlimages/curl:8.3.0 From 082e9620432515ec3e22f5f6aca2b368e878a665 Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 12:01:57 +0000 Subject: [PATCH 7/9] clean up init container env sections --- account-lookup-svc/values.yaml | 2 +- accounts-and-balances-builtin-ledger-grpc-svc/values.yaml | 6 +++--- accounts-and-balances-coa-grpc-svc/values.yaml | 2 +- fspiop-api-svc/values.yaml | 2 +- participants-svc/values.yaml | 2 +- platform-configuration-svc/values.yaml | 4 ++-- quoting-svc/values.yaml | 2 +- settlements-api-svc/values.yaml | 2 +- settlements-command-handler-svc/values.yaml | 2 +- settlements-event-handler-svc/values.yaml | 2 +- transfers-api-svc/values.yaml | 2 +- transfers-command-handler-svc/values.yaml | 2 +- transfers-event-handler-svc/values.yaml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/account-lookup-svc/values.yaml b/account-lookup-svc/values.yaml index cb6caf5..607108b 100644 --- a/account-lookup-svc/values.yaml +++ b/account-lookup-svc/values.yaml @@ -150,4 +150,4 @@ initContainers: | echo participants-svc ok!; env: - name: PARTICIPANTS_SVC_URL - value: http://participants-svc:3010 + value: '{{ .Values.env.participants_svc_url }}' diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml index e7ab40d..a0f50e4 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml @@ -182,7 +182,7 @@ initContainers: | echo platform-configuration-svc ok!; env: - name: PLATFORM_CONFIG_BASE_SVC_URL - value: http://platform-configuration-svc:3100 + value: '{{ .Values.env.platform_config_base_svc_url }}' - name: wait-for-redis @@ -203,6 +203,6 @@ initContainers: | env: - name: REDIS_HOST - value: redis-master + value: '{{ .Values.env.redis_host }}' - name: REDIS_PORT - value: "6379" + value: '{{ .Values.env.redis_port }}' diff --git a/accounts-and-balances-coa-grpc-svc/values.yaml b/accounts-and-balances-coa-grpc-svc/values.yaml index dcfe622..700417c 100644 --- a/accounts-and-balances-coa-grpc-svc/values.yaml +++ b/accounts-and-balances-coa-grpc-svc/values.yaml @@ -161,4 +161,4 @@ initContainers: | echo platform-configuration-svc ok!; env: - name: PLATFORM_CONFIG_BASE_SVC_URL - value: http://platform-configuration-svc:3100 + value: '{{ .Values.env.platform_config_base_svc_url }}' diff --git a/fspiop-api-svc/values.yaml b/fspiop-api-svc/values.yaml index f7149cc..1c8d0be 100644 --- a/fspiop-api-svc/values.yaml +++ b/fspiop-api-svc/values.yaml @@ -153,4 +153,4 @@ initContainers: | echo participants-svc ok!; env: - name: PARTICIPANTS_SVC_URL - value: http://participants-svc:3010 + value: '{{ .Values.env.participants_svc_url }}' diff --git a/participants-svc/values.yaml b/participants-svc/values.yaml index 07b56f2..e39fe7f 100644 --- a/participants-svc/values.yaml +++ b/participants-svc/values.yaml @@ -154,4 +154,4 @@ initContainers: | echo platform-configuration-svc ok!; env: - name: PLATFORM_CONFIG_BASE_SVC_URL - value: http://platform-configuration-svc:3100 + value: '{{ .Values.env.platform_config_base_svc_url }}' diff --git a/platform-configuration-svc/values.yaml b/platform-configuration-svc/values.yaml index b5face6..99476e9 100644 --- a/platform-configuration-svc/values.yaml +++ b/platform-configuration-svc/values.yaml @@ -144,7 +144,7 @@ initContainers: | echo AUTH_Z_SVC_BASEURL ok!; env: - name: AUTH_Z_SVC_BASEURL - value: http://authorization-svc:3202 + value: '{{ .Values.env.auth_z_svc_baseurl }}' - name: wait-for-auth-n-svc image: curlimages/curl:8.3.0 @@ -163,4 +163,4 @@ initContainers: | echo AUTH_N_SVC_BASEURL ok!; env: - name: AUTH_N_SVC_BASEURL - value: http://authentication-svc:3201 + value: '{{ .Values.env.auth_n_svc_baseurl }}' diff --git a/quoting-svc/values.yaml b/quoting-svc/values.yaml index bd18569..9048fa4 100644 --- a/quoting-svc/values.yaml +++ b/quoting-svc/values.yaml @@ -147,4 +147,4 @@ initContainers: | echo participants-svc ok!; env: - name: PARTICIPANTS_SVC_URL - value: http://participants-svc:3010 + value: '{{ .Values.env.participants_svc_url }}' diff --git a/settlements-api-svc/values.yaml b/settlements-api-svc/values.yaml index e6e3f40..a5711c3 100644 --- a/settlements-api-svc/values.yaml +++ b/settlements-api-svc/values.yaml @@ -150,4 +150,4 @@ initContainers: | echo platform-configuration-svc ok!; env: - name: PLATFORM_CONFIG_BASE_SVC_URL - value: http://platform-configuration-svc:3100 + value: '{{ .Values.env.platform_config_base_svc_url }}' diff --git a/settlements-command-handler-svc/values.yaml b/settlements-command-handler-svc/values.yaml index 80ec698..9b8e133 100644 --- a/settlements-command-handler-svc/values.yaml +++ b/settlements-command-handler-svc/values.yaml @@ -139,4 +139,4 @@ initContainers: | echo platform-configuration-svc ok!; env: - name: PLATFORM_CONFIG_BASE_SVC_URL - value: http://platform-configuration-svc:3100 + value: '{{ .Values.env.platform_config_base_svc_url }}' diff --git a/settlements-event-handler-svc/values.yaml b/settlements-event-handler-svc/values.yaml index e50cda6..30dc63f 100644 --- a/settlements-event-handler-svc/values.yaml +++ b/settlements-event-handler-svc/values.yaml @@ -134,4 +134,4 @@ initContainers: | echo participants-svc ok!; env: - name: PARTICIPANTS_SVC_URL - value: http://participants-svc:3010 + value: '{{ .Values.env.participants_svc_url }}' diff --git a/transfers-api-svc/values.yaml b/transfers-api-svc/values.yaml index b17d275..a406db0 100644 --- a/transfers-api-svc/values.yaml +++ b/transfers-api-svc/values.yaml @@ -147,4 +147,4 @@ initContainers: | echo participants-svc ok!; env: - name: PARTICIPANTS_SVC_URL - value: http://participants-svc:3010 + value: '{{ .Values.env.participants_svc_url }}' diff --git a/transfers-command-handler-svc/values.yaml b/transfers-command-handler-svc/values.yaml index 6f8695f..8e467c5 100644 --- a/transfers-command-handler-svc/values.yaml +++ b/transfers-command-handler-svc/values.yaml @@ -142,4 +142,4 @@ initContainers: | echo settlements-api-svc ok!; env: - name: SETTLEMENTS_SVC_URL - value: http://settlements-api-svc:3600 + value: '{{ .Values.env.settlements_svc_url }}' diff --git a/transfers-event-handler-svc/values.yaml b/transfers-event-handler-svc/values.yaml index 3d6eaf4..55e252f 100644 --- a/transfers-event-handler-svc/values.yaml +++ b/transfers-event-handler-svc/values.yaml @@ -134,4 +134,4 @@ initContainers: | echo participants-svc ok!; env: - name: PARTICIPANTS_SVC_URL - value: http://participants-svc:3010 + value: '{{ .Values.env.participants_svc_url }}' From 1ee9afe81f3bc96a75a90cbb09c6a2cab4615cfc Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 12:11:37 +0000 Subject: [PATCH 8/9] fix missing quote --- account-lookup-svc/templates/deployment.yaml | 2 +- .../templates/deployment.yaml | 2 +- accounts-and-balances-coa-grpc-svc/templates/deployment.yaml | 2 +- fspiop-api-svc/templates/deployment.yaml | 2 +- participants-svc/templates/deployment.yaml | 2 +- quoting-svc/templates/deployment.yaml | 2 +- settlements-api-svc/templates/deployment.yaml | 2 +- settlements-command-handler-svc/templates/deployment.yaml | 2 +- settlements-event-handler-svc/templates/deployment.yaml | 2 +- transfers-api-svc/templates/deployment.yaml | 2 +- transfers-command-handler-svc/templates/deployment.yaml | 2 +- transfers-event-handler-svc/templates/deployment.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/account-lookup-svc/templates/deployment.yaml b/account-lookup-svc/templates/deployment.yaml index 248341c..7410955 100644 --- a/account-lookup-svc/templates/deployment.yaml +++ b/account-lookup-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml index b35fab9..8203bb9 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml b/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml index 78133ec..c3782fe 100644 --- a/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml +++ b/accounts-and-balances-coa-grpc-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/fspiop-api-svc/templates/deployment.yaml b/fspiop-api-svc/templates/deployment.yaml index b718faa..6212965 100644 --- a/fspiop-api-svc/templates/deployment.yaml +++ b/fspiop-api-svc/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/participants-svc/templates/deployment.yaml b/participants-svc/templates/deployment.yaml index 28020ad..5f01af1 100644 --- a/participants-svc/templates/deployment.yaml +++ b/participants-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/quoting-svc/templates/deployment.yaml b/quoting-svc/templates/deployment.yaml index 027fb6c..1341f5f 100644 --- a/quoting-svc/templates/deployment.yaml +++ b/quoting-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/settlements-api-svc/templates/deployment.yaml b/settlements-api-svc/templates/deployment.yaml index c3e53c4..213d846 100644 --- a/settlements-api-svc/templates/deployment.yaml +++ b/settlements-api-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/settlements-command-handler-svc/templates/deployment.yaml b/settlements-command-handler-svc/templates/deployment.yaml index ecda418..4b7c011 100644 --- a/settlements-command-handler-svc/templates/deployment.yaml +++ b/settlements-command-handler-svc/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/settlements-event-handler-svc/templates/deployment.yaml b/settlements-event-handler-svc/templates/deployment.yaml index dcac83f..c71d2b6 100644 --- a/settlements-event-handler-svc/templates/deployment.yaml +++ b/settlements-event-handler-svc/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/transfers-api-svc/templates/deployment.yaml b/transfers-api-svc/templates/deployment.yaml index 9a904c1..a56e8d6 100644 --- a/transfers-api-svc/templates/deployment.yaml +++ b/transfers-api-svc/templates/deployment.yaml @@ -64,7 +64,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/transfers-command-handler-svc/templates/deployment.yaml b/transfers-command-handler-svc/templates/deployment.yaml index ac93ece..ca7b07e 100644 --- a/transfers-command-handler-svc/templates/deployment.yaml +++ b/transfers-command-handler-svc/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} diff --git a/transfers-event-handler-svc/templates/deployment.yaml b/transfers-event-handler-svc/templates/deployment.yaml index 1443d6f..a9a82c5 100644 --- a/transfers-event-handler-svc/templates/deployment.yaml +++ b/transfers-event-handler-svc/templates/deployment.yaml @@ -68,7 +68,7 @@ spec: name: '{{ .Values.config.mongo_url_secret.name }}' key: '{{ .Values.config.mongo_url_secret.key }}' {{- else }} - value: {{ .Values.config.mongo_url }} + value: '{{ .Values.config.mongo_url }}' {{- end }} - name: PLATFORM_CONFIG_BASE_SVC_URL value: {{ .Values.env.platform_config_base_svc_url }} From 2a45926a44fb069efc123e49a977a8004c01debf Mon Sep 17 00:00:00 2001 From: David Fry Date: Wed, 27 Mar 2024 12:35:00 +0000 Subject: [PATCH 9/9] typo on indent --- accounts-and-balances-builtin-ledger-grpc-svc/values.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml index a0f50e4..5cac037 100644 --- a/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml +++ b/accounts-and-balances-builtin-ledger-grpc-svc/values.yaml @@ -200,9 +200,8 @@ initContainers: | done; echo ====================; echo redis-service ok!; - env: - name: REDIS_HOST value: '{{ .Values.env.redis_host }}' - name: REDIS_PORT - value: '{{ .Values.env.redis_port }}' + value: '{{ .Values.env.redis_port }}'