Service name and port

.gitignore

@@ -0,0 +1,2 @@
+*.swp
+*.tar.gz

README.md

@@ -1,2 +1,4 @@
 # mailman3-helm-chart
 Helm chart for Mailman3 deployment
+
+Fork of [fw8/mailman3-helm-chart](https://github.com/fw8/mailman3-helm-chart).

mailman3/templates/ingress.yaml

@@ -1,33 +1,63 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "mailman3.fullname" . -}}
-{{- $svcPort := .Values.service.port -}}
+{{- $httpPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+apiVersion: networking.k8s.io/v1
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
 kind: Ingress
 metadata:
   name: {{ $fullName }}
+  namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "mailman3.labels" . | nindent 4 }}
-  {{- with .Values.ingress.annotations }}
   annotations:
-    {{- toYaml . | nindent 4 }}
+    {{- range $key, $value := .Values.ingress.annotations }}
+      {{ $key }}: {{ $value | quote }}
     {{- end }}
 spec:
+  ingressClassName: {{ tpl .Values.ingress.className . }}
 {{- if .Values.ingress.tls }}
   tls:
+  {{- range .Values.ingress.tls }}
     - hosts:
-      - {{ .Values.hostname }}
+      {{- range .hosts }}
-      secretName: {{ include "mailman3.fullname" . }}-certificate
+        - {{ tpl . $ | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
 {{- end }}
   rules:
-  - host: {{ .Values.hostname | quote }}
+    {{- range .Values.ingress.hosts }}
+    - host: {{ tpl .host $ | quote }}
       http:
         paths:
-      - path: /
+          {{- if .paths }}
+          {{- range .paths }}
+          {{- if kindIs "string" . }}
+          - path: {{ . }}
+            pathType: {{ default "Prefix" $.Values.ingress.pathType }}
             backend:
-          serviceName: {{ include "mailman3.fullname" . }}-web
+              service:
-          servicePort: 80
+                name: {{ $fullName }}-web
+                port:
+                  number: {{ $httpPort }}
+          {{- else }}
+          - path: {{ .path | default "/" }}
+            pathType: {{ .pathType | default "Prefix" }}
+            backend:
+              service:
+                name: {{ $fullName }}-web
+                port:
+                  number: {{ $httpPort }}
           {{- end }}
+          {{- end }}
+          {{- else }}
+          - path: "/"
+            pathType: "Prefix"
+            backend:
+              service:
+                name: {{ $fullName }}-web
+                port:
+                  number: {{ $httpPort }}
+          {{- end }}
+    {{- end }}
+{{- end }}
+

mailman3/values.yaml

@@ -12,7 +12,7 @@
 #hyperkittyApiKey: supersecret
 #djangoSecretKey: supersecret
 
-hostname: lists.example.org
+hostname: lists.example.com
 
 imagePullSecrets: []
 nameOverride: ""
@@ -67,12 +67,18 @@ web:
 
 service:
   type: ClusterIP
+  port: 80
 
 ingress:
   enabled: false
-  tls: false
+  className: ""
-  annotations:
+  pathType: Prefix
-    # use NGINX Ingress Controller
+  annotations: {}
-    #kubernetes.io/ingress.class: "nginx"
+  hosts:
-    # use Cert-Manager for LetsEncrypt Certificates
+    - host: lists.example.com
-    #cert-manager.io/issuer: "letsencrypt-prod"
+      paths:
+        - path: /
+  tls: []
+  #  - secretName: chart-example-tls
+  #    hosts:
+  #      - git.example.com