Merge pull request #3 from mojaloop/feat/add-secret-env

alter deployment to use secret
mojaloop · Mar 27, 2024 · 4721c79 · 4721c79
2 parents 794f80b + 2a45926
commit 4721c79
Show file tree

Hide file tree

Showing 54 changed files with 363 additions and 199 deletions.
diff --git 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 -}}
diff --git 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
@@ -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 -}}
diff --git 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 }}
@@ -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
@@ -159,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/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 -}}
diff --git 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 }}
@@ -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
@@ -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:
@@ -109,16 +108,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
@@ -165,14 +155,14 @@ initContainers: |
         echo ====================;
         echo MongoDB ok!;
     env:
-      - name: mongo_url
+      - 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 }}
+        value: '{{ .Values.config.mongo_url }}'
         {{- end }}
 
   - name: wait-for-platform-configuration-svc
@@ -192,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
@@ -210,9 +200,8 @@ initContainers: |
         done;
         echo ====================;
         echo redis-service ok!;
-
     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/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 -}}
diff --git 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 }}
@@ -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
@@ -170,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/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 -}}
diff --git 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 -}}
diff --git 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/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/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 -}}
diff --git 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 }}