alter deploy to use secret

mojaloop · Mar 26, 2024 · d1e9409 · d1e9409
1 parent bb24f58
commit d1e9409
Show file tree

Hide file tree

Showing 24 changed files with 112 additions and 142 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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