minor updates

charts/rollup/templates/ingress.yaml

@@ -36,7 +36,7 @@ spec:
   {{- end }}
   rules:
   {{- with $ingress.hosts }}
-  {{- range $host := . }}
+    {{- range $host := . }}
     - host: {{ tpl $host $ }}
       http:
         paths:
@@ -55,12 +55,12 @@ spec:
               serviceName: {{ tpl $serviceName $ }}
               servicePort: {{ tpl $servicePort $ }}
               {{- end }}
+    {{- end }}
   {{- end }}
   {{- if $ingress.tls }}
   tls:
     {{- tpl (toYaml $ingress.tls) $ | nindent 4 }}
   {{- end }}
-  {{- end }}
 ---
 {{- end }}
 {{- end }}

charts/sequencer-faucet/templates/ingress.yaml

@@ -2,7 +2,7 @@
 {{- $ingressApiIsStable := eq (include "sequencer.ingress.isStable" .) "true" -}}
 {{- $ingressSupportsIngressClassName := eq (include "sequencer.ingress.supportsIngressClassName" .) "true" -}}
 {{- $ingressSupportsPathType := eq (include "sequencer.ingress.supportsPathType" .) "true" -}}
-{{- $servicePort := tpl .Values.ingress.service.port . -}}
+{{- $servicePort := tpl .Values.ingress.service.port.name . -}}
 {{- $serviceName := tpl .Values.ingress.service.name . -}}
 {{- $ingressPath := .Values.ingress.path -}}
 {{- $ingressPathType := .Values.ingress.pathType -}}
@@ -18,15 +18,16 @@ metadata:
     {{- end }}
   {{- with .Values.ingress.annotations }}
   annotations:
+    kubernetes.io/ingress.class: {{ $.Values.ingress.className }}
     {{- range $key, $value := . }}
     {{ $key }}: {{ tpl $value $ | quote }}
     {{- end }}
   {{- end }}
 spec:
   {{- if and $ingressSupportsIngressClassName .Values.ingress.ingressClassName }}
-  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.className }}
   {{- end -}}
-  {{- with .Values.ingress.defaultBackend }}
+  {{- with .Values.ingress.service }}
   defaultBackend:
     {{- tpl (toYaml .) $ | nindent 4 }}
   {{- end }}
@@ -46,9 +47,7 @@ spec:
             backend:
               {{- if $ingressApiIsStable }}
               service:
-                name: {{ tpl $serviceName }}
-                port:
-                  name: {{ $servicePort }}
+                {{- tpl (toYaml $.Values.ingress.service) $ | nindent 16 }}
               {{- else }}
               serviceName: {{ $serviceName }}
               servicePort: {{ $servicePort }}

charts/sequencer-faucet/values.yaml

@@ -38,6 +38,7 @@ ingress:
   # See https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/#specifying-the-class-of-an-ingress
   # ingressClassName: nginx
   # Values can be templated
+  className: nginx
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"
@@ -47,15 +48,10 @@ ingress:
   pathType: Prefix
   hosts: {}
   # - chart-example.local
-  service: {}
-    # name: sequencer-faucet-service
-    # port:
-    #   name: seq-faucet-svc
-  defaultBackend: {}
-    # service:
-    #   name: sequencer-faucet-service
-    #   port:
-    #     name: seq-faucet-svc
+  service:
+    name: sequencer-faucet-service
+    port: 
+      name: seq-faucet-svc
   ## Extra paths to prepend to every host configuration. This is useful when working with annotation based services.
   extraPaths: {}
   # - path: /*