[bitnami/drupal] Add support for ingressClassName (#7512)

Inspired by

https://github.com/bitnami/charts/pull/6848
This commit is contained in:
Sebastian Krebs
2021-09-17 08:59:54 +02:00
committed by GitHub
parent 7499dcf3c9
commit 82869b473c
5 changed files with 11 additions and 2 deletions

View File

@@ -6,4 +6,4 @@ dependencies:
repository: https://charts.bitnami.com/bitnami repository: https://charts.bitnami.com/bitnami
version: 1.9.0 version: 1.9.0
digest: sha256:2311ed53bf0082f07e424bf19e250d06ce235944c6f0df4e6380c3c93a0062e7 digest: sha256:2311ed53bf0082f07e424bf19e250d06ce235944c6f0df4e6380c3c93a0062e7
generated: "2021-09-16T02:28:03.375957807Z" generated: "2021-09-16T14:11:12.1736338+02:00"

View File

@@ -31,4 +31,4 @@ name: drupal
sources: sources:
- https://github.com/bitnami/bitnami-docker-drupal - https://github.com/bitnami/bitnami-docker-drupal
- http://www.drupal.org/ - http://www.drupal.org/
version: 10.2.36 version: 10.3.0

View File

@@ -160,6 +160,7 @@ The command removes all the Kubernetes components associated with the chart and
| `ingress.certManager` | Add annotations for cert-manager | `false` | | `ingress.certManager` | Add annotations for cert-manager | `false` |
| `ingress.pathType` | Ingress Path type | `ImplementationSpecific` | | `ingress.pathType` | Ingress Path type | `ImplementationSpecific` |
| `ingress.apiVersion` | Override API Version (automatically detected if not set) | `""` | | `ingress.apiVersion` | Override API Version (automatically detected if not set) | `""` |
| `ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `nil` |
| `ingress.hostname` | Default host for the ingress resource | `drupal.local` | | `ingress.hostname` | Default host for the ingress resource | `drupal.local` |
| `ingress.path` | The Path to Drupal. You may need to set this to '/*' in order to use this | `/` | | `ingress.path` | The Path to Drupal. You may need to set this to '/*' in order to use this | `/` |
| `ingress.annotations` | Ingress annotations done as key:value pairs | `{}` | | `ingress.annotations` | Ingress annotations done as key:value pairs | `{}` |

View File

@@ -18,6 +18,9 @@ metadata:
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{ { - if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) } }
ingressClassName: { { .Values.ingress.ingressClassName | quote } }
{ { - end } }
rules: rules:
{{- if .Values.ingress.hostname }} {{- if .Values.ingress.hostname }}
- host: {{ .Values.ingress.hostname }} - host: {{ .Values.ingress.hostname }}

View File

@@ -377,6 +377,11 @@ ingress:
## @param ingress.apiVersion Override API Version (automatically detected if not set) ## @param ingress.apiVersion Override API Version (automatically detected if not set)
## ##
apiVersion: "" apiVersion: ""
## @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.hostname Default host for the ingress resource ## @param ingress.hostname Default host for the ingress resource
## ##
hostname: drupal.local hostname: drupal.local