Merge pull request #34 from maykinmedia/openforms-extra-ingress

Add extra ingress for openforms
maykinmedia · Apr 19, 2023 · 2193429 · 2193429
2 parents ff4afd6 + 29491c0
commit 2193429
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 2 deletions.
diff --git a/charts/openforms/Chart.yaml b/charts/openforms/Chart.yaml
@@ -3,7 +3,7 @@ name: openforms
 description: Snel en eenvoudig slimme formulieren bouwen en publiceren
 
 type: application
-version: 1.0.8
+version: 1.0.9
 appVersion: 2.0.5
 
 dependencies:

diff --git a/charts/openforms/README.md b/charts/openforms/README.md
@@ -1,6 +1,6 @@
 # openforms
 
-![Version: 1.0.8](https://img.shields.io/badge/Version-1.0.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.5](https://img.shields.io/badge/AppVersion-2.0.5-informational?style=flat-square)
+![Version: 1.0.9](https://img.shields.io/badge/Version-1.0.9-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.5](https://img.shields.io/badge/AppVersion-2.0.5-informational?style=flat-square)
 
 Snel en eenvoudig slimme formulieren bouwen en publiceren
 
@@ -43,6 +43,7 @@ helm install my-release my-repo/openforms
 | beat.resources | object | `{}` |  |
 | existingSecret | string | `nil` |  |
 | extraEnvVars | list | `[]` |  |
+| extraIngress | list | `[]` | Specify extra ingresses, for example if you have multiple ingress classes |
 | extraVerifyCerts | string | `""` |  |
 | extraVolumeMounts | list | `[]` |  |
 | extraVolumes | list | `[]` |  |

diff --git a/charts/openforms/templates/ingress.yaml b/charts/openforms/templates/ingress.yaml
@@ -59,3 +59,43 @@ spec:
           {{- end }}
     {{- end }}
 {{- end }}
+---
+{{ if .Values.extraIngress -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  {{- range $key, $value := .Values.extraIngress }}
+  name: {{ .name }}
+  labels:
+    {{- include "openforms.labels" $ | nindent 4 }}
+  annotations:
+    {{- range $key, $value := .annotations }}
+    {{ $key }}: {{ $value | quote }}
+    {{- end }}
+spec:
+  ingressClassName: {{ .className }}
+  tls:
+  - hosts:
+    {{- range $hosts := .tls }}
+    {{- range $k := .hosts }}
+      - {{ . }}
+    {{- end }}
+    secretName: {{ .secretName }}
+    {{- end }}
+  rules:
+      {{- range .hosts }}
+    - host: {{ .host }}
+      http:
+        paths:
+          {{- range .paths }}
+          - path: {{ .path }}
+          {{- end }}
+            pathType: {{ .pathType }}
+            backend:
+              service:
+                name: {{ .servicename }}
+                port:
+                  number: {{ .portNumber }}
+      {{- end }}
+{{- end }}
+{{- end }}
diff --git a/charts/openforms/values.yaml b/charts/openforms/values.yaml
@@ -68,6 +68,26 @@ ingress:
   #    hosts:
   #      - openformulieren.gemeente.nl
 
+# -- Specify extra ingresses, for example if you have multiple ingress classes
+extraIngress: []
+# e.g:
+# extraIngress:
+#  - name: openformulieren-azuregateway
+#    annotations:
+#      appgw.ingress.kubernetes.io/ssl-redirect: "true"
+#    className: azure-application-gateway
+#    hosts:
+#      - host: openformulieren.gemeente.nl
+#        paths:
+#          - path: /
+#        pathType: ImplementationSpecific
+#        servicename: openformulieren
+#        portNumber: 8000
+#    tls:
+#      - secretName: openformulieren-tls
+#        hosts:
+#          - "openformulieren.gemeente.nl"
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little