From f33cd72a92d316080da9b87fed2d0fd453221f35 Mon Sep 17 00:00:00 2001
From: Miguel Ruiz <miruiz@vmware.com>
Date: Tue, 6 Jul 2021 12:51:38 +0200
Subject: [PATCH] [bitnami/keycloak] Add support for ingressClassName (#6849)

---
 bitnami/keycloak/Chart.lock             | 8 ++++----
 bitnami/keycloak/Chart.yaml             | 2 +-
 bitnami/keycloak/README.md              | 1 +
 bitnami/keycloak/templates/ingress.yaml | 3 +++
 bitnami/keycloak/values.yaml            | 6 ++++++
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/bitnami/keycloak/Chart.lock b/bitnami/keycloak/Chart.lock
index fb75363dd..aa84e7d5e 100644
--- a/bitnami/keycloak/Chart.lock
+++ b/bitnami/keycloak/Chart.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 1.6.1
+  version: 1.7.0
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 10.5.0
-digest: sha256:8ddf8e5a5a40c9008f20388c517a745c4e929130472245723dafa586b911d0c8
-generated: "2021-06-18T03:36:17.84293623Z"
+  version: 10.5.2
+digest: sha256:fdd07b1172617d4eefa2de7ee90b8684e3550febec427753719691086958561a
+generated: "2021-07-06T08:23:52.052589+02:00"
diff --git a/bitnami/keycloak/Chart.yaml b/bitnami/keycloak/Chart.yaml
index 7b1f8d3f2..d3ffa5e47 100644
--- a/bitnami/keycloak/Chart.yaml
+++ b/bitnami/keycloak/Chart.yaml
@@ -26,4 +26,4 @@ name: keycloak
 sources:
   - https://github.com/bitnami/bitnami-docker-keycloak
   - https://github.com/keycloak/keycloak
-version: 3.1.1
+version: 3.2.0
diff --git a/bitnami/keycloak/README.md b/bitnami/keycloak/README.md
index 3ba6a82ac..0bb430850 100644
--- a/bitnami/keycloak/README.md
+++ b/bitnami/keycloak/README.md
@@ -197,6 +197,7 @@ The following tables lists the configurable parameters of the Keycloak chart and
 | `service.annotations`              | Annotations for Keycloak service                                                  | `{}` (evaluated as a template) |
 | `ingress.enabled`                  | Enable ingress controller resource                                                | `false`                        |
 | `ingress.apiVersion`               | Force Ingress API version (automatically detected if not set)                     | ``                             |
+| `ingress.ingressClassName`         | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)     | `nil`                          |
 | `ingress.path`                     | Ingress path                                                                      | `/`                            |
 | `ingress.pathType`                 | Ingress path type                                                                 | `ImplementationSpecific`       |
 | `ingress.certManager`              | Add annotations for cert-manager                                                  | `false`                        |
diff --git a/bitnami/keycloak/templates/ingress.yaml b/bitnami/keycloak/templates/ingress.yaml
index d0a3e8067..9ff7d6cc1 100644
--- a/bitnami/keycloak/templates/ingress.yaml
+++ b/bitnami/keycloak/templates/ingress.yaml
@@ -22,6 +22,9 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
+  {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
+  ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
+  {{- end }}
   rules:
     {{- if .Values.ingress.path }}
     - http:
diff --git a/bitnami/keycloak/values.yaml b/bitnami/keycloak/values.yaml
index 6f06e603e..a6c924c9b 100644
--- a/bitnami/keycloak/values.yaml
+++ b/bitnami/keycloak/values.yaml
@@ -490,6 +490,12 @@ ingress:
   ##
   apiVersion:
 
+  ## 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:
+
   ## Ingress Path
   ##
   path: /