From 3cab63eb2f84809f056c8fa6bbe8a2614c5200d7 Mon Sep 17 00:00:00 2001
From: Mark Wooff <mark.wooff@gmail.com>
Date: Thu, 13 Jan 2022 06:07:44 -0500
Subject: [PATCH] Add support for ingressClassName (#8644)

---
 bitnami/moodle/Chart.yaml             | 2 +-
 bitnami/moodle/README.md              | 1 +
 bitnami/moodle/templates/ingress.yaml | 3 +++
 bitnami/moodle/values.yaml            | 6 +++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/bitnami/moodle/Chart.yaml b/bitnami/moodle/Chart.yaml
index b9ea011d85..f1406dd8af 100644
--- a/bitnami/moodle/Chart.yaml
+++ b/bitnami/moodle/Chart.yaml
@@ -25,4 +25,4 @@ name: moodle
 sources:
   - https://github.com/bitnami/bitnami-docker-moodle
   - https://www.moodle.org/
-version: 11.3.1
+version: 11.4.0
diff --git a/bitnami/moodle/README.md b/bitnami/moodle/README.md
index e77912e893..586e0b4735 100644
--- a/bitnami/moodle/README.md
+++ b/bitnami/moodle/README.md
@@ -161,6 +161,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `service.nodePorts.https`          | Kubernetes HTTPS node port                                                                                                       | `""`                     |
 | `service.externalTrafficPolicy`    | Enable client source IP preservation                                                                                             | `Cluster`                |
 | `ingress.enabled`                  | Set to true to enable ingress record generation                                                                                  | `false`                  |
+| `ingress.ingressClassName`         | Name of the ingress class (Kubernetes 1.18+)                                                                                     | `""`                     |
 | `ingress.pathType`                 | Ingress Path type                                                                                                                | `ImplementationSpecific` |
 | `ingress.apiVersion`               | Override API Version (automatically detected if not set)                                                                         | `""`                     |
 | `ingress.hostname`                 | When the ingress is enabled, a host pointing to this will be created                                                             | `minio.local`            |
diff --git a/bitnami/moodle/templates/ingress.yaml b/bitnami/moodle/templates/ingress.yaml
index 38315c32e5..7d054fb5aa 100644
--- a/bitnami/moodle/templates/ingress.yaml
+++ b/bitnami/moodle/templates/ingress.yaml
@@ -18,6 +18,9 @@ metadata:
     {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
 spec:
+  {{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+  {{- end }}
   rules:
     {{- if .Values.ingress.hostname }}
     - host: {{ .Values.ingress.hostname }}
diff --git a/bitnami/moodle/values.yaml b/bitnami/moodle/values.yaml
index 1940f73f83..5046866a27 100644
--- a/bitnami/moodle/values.yaml
+++ b/bitnami/moodle/values.yaml
@@ -386,7 +386,11 @@ ingress:
   ## DEPRECATED: Use ingress.annotations instead of ingress.certManager
   ## certManager: false
   ##
-
+  ## @param ingress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)
+  ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster .
+  ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/
+  ##
+  ingressClassName: ""
   ## @param ingress.pathType Ingress Path type
   ##
   pathType: ImplementationSpecific