feat(helm): add support for spec.ingressClassName to Ingress template (…

…requarks#5202)
crambo · May 9, 2022 · a06201a · a06201a
1 parent 0fcc083
commit a06201a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/dev/helm/README.md b/dev/helm/README.md
@@ -108,6 +108,7 @@ The following table lists the configurable parameters of the Wiki.js chart and t
 | `volumeMounts`                   | Volume mounts for Wiki.js container              | `[]`                                                       |
 | `volumes`                        | Volumes for Wiki.js Pod                          | `[]`                                                       |
 | `ingress.enabled`                    | Enable ingress controller resource          | `false`                                                    |
+| `ingress.className`                  | Ingress class name                          | `""`                                                       |
 | `ingress.annotations`                | Ingress annotations                         | `{}`                                                       |
 | `ingress.hosts`                      | List of ingress rules                        | `[{"host": "wiki.local", "paths": ["/"]}]`                |
 | `ingress.tls`                        | Ingress TLS configuration                   | `[]`                                                       |

diff --git a/dev/helm/templates/ingress.yaml b/dev/helm/templates/ingress.yaml
@@ -23,6 +23,9 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
 {{- if .Values.ingress.tls }}
   tls:
   {{- range .Values.ingress.tls }}

diff --git a/dev/helm/values.yaml b/dev/helm/values.yaml
@@ -54,6 +54,7 @@ service:
 
 ingress:
   enabled: true
+  className: ""
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"