make secret and extra ingress able to handle multiple in one file

common/templates/_extra_ingress.tpl

@@ -17,4 +17,5 @@ spec:
     {{- (include "common.extra-ingress.rules" .) | nindent 4 }}
   tls:
     {{- (include "common.extra-ingress.tls" .) | nindent 4 }}
+---
 {{- end }}

common/templates/_secret.tpl

@@ -6,4 +6,5 @@ metadata:
 type: {{ .Values.type | default "Opaque" }}
 data:
   {{- (include "common.secret.data" .) | nindent 2 }}
+---
 {{- end }}

example/templates/extra_ingress.yaml

 {{- if .Values.extraIngress }}
-{{ include "common.extra-ingress.ingress" (merge . (dict "Values" .Values.extraIngress)) }}
+{{ include "common.extra-ingress.ingress" (dict "Values" .Values.extraIngress "Chart" .Chart "Release" .Release) }}
 {{- end }}

example/templates/secret.yaml

-{{- if .Values.secret }}
-{{ include "common.secret.secret" (merge . (dict "Values" .Values.secret)) }}
-{{- end }}

example/templates/secrets.yaml

+{{- if .Values.secrets.secret0 }}
+{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret0 "Chart" .Chart "Release" .Release) }}
+{{- end }}
+{{- if .Values.secrets.secret1 }}
+{{ include "common.secret.secret" (dict "Values" .Values.secrets.secret1 "Chart" .Chart "Release" .Release) }}
+{{- end }}

example/values.yaml

@@ -17,9 +17,16 @@ extraIngress:
         - test.com
       secretName: test-tls
 
-secret:
-  name: example-secret
-  type: Generic
-  data:
-    username: dXNlcm5hbWU= # Base64-encoded 'username'
-    password: cGFzc3dvcmQ= # Base64-encoded 'password'
+secrets:
+  secret0:
+    name: example-secret0
+    data:
+      username: dXNlcm5hbWU= # Base64-encoded 'username'
+      password: cGFzc3dvcmQ= # Base64-encoded 'password'
+
+  secret1:
+    name: example-secret1
+    type: Opaque
+    data:
+      username: example
+      password: example