diff --git a/bitnami/grafana-operator/Chart.yaml b/bitnami/grafana-operator/Chart.yaml
index 4a4e18f0e..44ad43ee8 100644
--- a/bitnami/grafana-operator/Chart.yaml
+++ b/bitnami/grafana-operator/Chart.yaml
@@ -25,4 +25,4 @@ name: grafana-operator
 sources:
   - https://github.com/integr8ly/grafana-operator
   - https://github.com/bitnami/bitnami-docker-grafana-operator
-version: 1.2.0
+version: 1.3.0
diff --git a/bitnami/grafana-operator/README.md b/bitnami/grafana-operator/README.md
index 2a6ff9a2e..f2ccbaf1d 100644
--- a/bitnami/grafana-operator/README.md
+++ b/bitnami/grafana-operator/README.md
@@ -173,6 +173,7 @@ For more information, refer to the [documentation on the differences between the
 | `grafana.client.preferService`                              | If the API should be used via Ingress or via the internal service                             | `true`               |
 | `grafana.labels`                                            | Add additional labels to the grafana deployment, service and ingress resources                | `{}`                 |
 | `grafana.ingress.enabled`                                   | If an ingress or OpenShift Route should be created                                            | `false`              |
+| `grafana.ingress.ingressClassName`                          | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)                 | `""`                 |
 | `grafana.ingress.hostname`                                  | The hostname under which the grafana instance should be reachable                             | `grafana.local`      |
 | `grafana.ingress.path`                                      | The path for the ingress instance to forward to the grafana app                               | `/`                  |
 | `grafana.ingress.labels`                                    | Additional Labels for the ingress resource                                                    | `{}`                 |
diff --git a/bitnami/grafana-operator/templates/grafana.yaml b/bitnami/grafana-operator/templates/grafana.yaml
index e5eeb1d05..711fdbee6 100644
--- a/bitnami/grafana-operator/templates/grafana.yaml
+++ b/bitnami/grafana-operator/templates/grafana.yaml
@@ -117,6 +117,9 @@ spec:
   {{- end }}
   ingress:
     enabled: {{ .Values.grafana.ingress.enabled }}
+    {{- if and .Values.grafana.ingress.ingressClassName (include "common.ingress.supportsIngressClassname" .) }}
+    ingressClassName: {{ .Values.grafana.ingress.ingressClassName | quote }}
+    {{- end }}
     hostname: {{ include "common.tplvalues.render" (dict "value" .Values.grafana.ingress.hostname "context" $) }}
     tlsEnabled: {{ .Values.grafana.ingress.tls }}
     tlsSecretName: {{ .Values.grafana.ingress.tlsSecret }}
diff --git a/bitnami/grafana-operator/values.yaml b/bitnami/grafana-operator/values.yaml
index 91553ce1e..82c6314b6 100644
--- a/bitnami/grafana-operator/values.yaml
+++ b/bitnami/grafana-operator/values.yaml
@@ -405,6 +405,11 @@ grafana:
     ## @param grafana.ingress.enabled If an ingress or OpenShift Route should be created
     ##
     enabled: false
+    ## @param grafana.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 grafana.ingress.hostname The hostname under which the grafana instance should be reachable
     ##
     hostname: grafana.local