From 2db161bfc200a3cc5dee832fa19e8be9f251e0cb Mon Sep 17 00:00:00 2001
From: Alejandro Moreno <amorenoc@vmware.com>
Date: Tue, 19 Jan 2021 10:24:18 +0100
Subject: [PATCH] [bitnami/wordpress] Fix issue with wildcard domains (#5082)

* Fix issue with wildcard domains

* Quick fix

* Add CI test

* Fix test
---
 bitnami/wordpress/Chart.yaml                      | 2 +-
 bitnami/wordpress/ci/ingress-wildcard-values.yaml | 9 +++++++++
 bitnami/wordpress/templates/ingress.yaml          | 6 +++---
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 bitnami/wordpress/ci/ingress-wildcard-values.yaml

diff --git a/bitnami/wordpress/Chart.yaml b/bitnami/wordpress/Chart.yaml
index 5c7f67a127..fe5cd03d81 100644
--- a/bitnami/wordpress/Chart.yaml
+++ b/bitnami/wordpress/Chart.yaml
@@ -31,4 +31,4 @@ name: wordpress
 sources:
   - https://github.com/bitnami/bitnami-docker-wordpress
   - http://www.wordpress.com/
-version: 10.4.4
+version: 10.4.5
diff --git a/bitnami/wordpress/ci/ingress-wildcard-values.yaml b/bitnami/wordpress/ci/ingress-wildcard-values.yaml
new file mode 100644
index 0000000000..b57ce6eaea
--- /dev/null
+++ b/bitnami/wordpress/ci/ingress-wildcard-values.yaml
@@ -0,0 +1,9 @@
+service:
+  type: ClusterIP
+
+ingress:
+  enabled: true
+  tls: true
+  extraHosts:
+    - name: "*.domain.tld"
+      path: /
diff --git a/bitnami/wordpress/templates/ingress.yaml b/bitnami/wordpress/templates/ingress.yaml
index 38315c32e5..9527f78581 100755
--- a/bitnami/wordpress/templates/ingress.yaml
+++ b/bitnami/wordpress/templates/ingress.yaml
@@ -20,7 +20,7 @@ metadata:
 spec:
   rules:
     {{- if .Values.ingress.hostname }}
-    - host: {{ .Values.ingress.hostname }}
+    - host: {{ .Values.ingress.hostname | quote }}
       http:
         paths:
           {{- if .Values.ingress.extraPaths }}
@@ -46,9 +46,9 @@ spec:
   tls:
     {{- if .Values.ingress.tls }}
     - hosts:
-        - {{ .Values.ingress.hostname }}
+        - {{ .Values.ingress.hostname | quote }}
         {{- range .Values.ingress.extraHosts }}
-        - {{ .name }}
+        - {{ .name | quote }}
         {{- end }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
     {{- end }}