use maps instead of lists for rules & tls to allow overriding

common/templates/_extra_ingress.tpl

@@ -11,10 +11,8 @@ metadata:
     {{- include "common.labels" . | nindent 4 }}
 spec:
   ingressClassName: {{ .Values.ingressClassName }}
-  rules: 
-    {{- .Values.rules | toYaml | nindent 4 }}
-  {{- with .Values.tls }}
-  tls: 
-    {{- . | toYaml | nindent 4 }}
-  {{- end }}
+  rules:
+    {{- (include "common.extra-ingress.rules" .) | nindent 4 }}
+  tls:
+    {{- (include "common.extra-ingress.tls" .) | nindent 4 }}
 {{- end }}

common/templates/_helpers.tpl

@@ -15,3 +15,29 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
+
+{{/*
+Extra Ingress
+*/}}
+
+{{/*
+Extra Ingress Rules
+*/}}
+{{- define "common.extra-ingress.rules" -}}
+{{- $rules := list -}}
+{{- range $name, $rule := .Values.rules -}}
+  {{- $rules = append $rules $rule -}}
+{{- end }}
+{{- toYaml $rules -}}
+{{- end }}
+
+{{/*
+Extra Ingress TLS
+*/}}
+{{- define "common.extra-ingress.tls" -}}
+{{- $tlsDefinitions := list -}}
+{{- range $name, $tlsDefinition := .Values.tls -}}
+  {{- $tlsDefinitions = append $tlsDefinitions $tlsDefinition -}}
+{{- end }}
+{{- toYaml $tlsDefinitions -}}
+{{- end }}

example/values.yaml

@@ -2,7 +2,8 @@ extraIngress:
   name: extra-ingress  # Default value
   ingressClassName: traefik
   rules:
-    - host: test.com
+    default:
+      host: test.com
       http:
         paths:
           - path: /
@@ -11,6 +12,7 @@ extraIngress:
               serviceName: webservice
               servicePort: 8080
   tls:
-    - hosts:
+    default:
+      hosts:
         - test.com
       secretName: test-tls