From b8dc33b5beee44cfab992219e6c2fd27e7eb22bc Mon Sep 17 00:00:00 2001
From: Waqar Ahmed <waqarahmedjoyia@live.com>
Date: Sat, 30 Jan 2021 00:09:40 +0500
Subject: [PATCH] Have a line break between rendering environment variables

---
 .../templates/lib/containers/_environment.tpl | 33 ++++++++++++-------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/library/common/templates/lib/containers/_environment.tpl b/library/common/templates/lib/containers/_environment.tpl
index 7bf6ccef56..4a1fd1410f 100644
--- a/library/common/templates/lib/containers/_environment.tpl
+++ b/library/common/templates/lib/containers/_environment.tpl
@@ -1,3 +1,23 @@
+{{/*
+Render environment variable
+*/}}
+{{- define "common.containers.environmentVariable" -}}
+{{- $envVariable := . -}}
+{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "name")) -}}
+{{- if $envVariable.valueFromSecret -}}
+{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "secretName" "secretKey")) -}}
+- name: {{ $envVariable.name }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ $envVariable.secretName }}
+      key: {{ $envVariable.secretKey }}
+{{- else -}}
+{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "value")) -}}
+- name: {{ $envVariable.name }}
+  value: {{ $envVariable.value }}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Render environment variables
 */}}
@@ -5,17 +25,6 @@ Render environment variables
 {{- $values := . -}}
 {{- include "common.schema.validateKeys" (dict "values" $values "checkKeys" (list "environmentVariables")) -}}
 {{- range $envVariable := $values.environmentVariables -}}
-{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "name")) -}}
-- name: {{ $envVariable.name }}
-{{- if $envVariable.valueFromSecret -}}
-{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "secretName" "secretKey")) -}}
-  valueFrom:
-    secretKeyRef:
-      name: {{ $envVariable.secretName }}
-      key: {{ $envVariable.secretKey }}
-{{- else -}}
-{{- include "common.schema.validateKeys" (dict "values" $envVariable "checkKeys" (list "value")) -}}
-  value: {{ $envVariable.value }}
-{{- end -}}
+{{- include "common.containers.environmentVariable" $envVariable | nindent 0 -}}
 {{- end -}}
 {{- end -}}