From 8fce9d0bd6420892bbf9708fbff48465dd64bbe8 Mon Sep 17 00:00:00 2001
From: chlumper <25345228+chlumper@users.noreply.github.com>
Date: Thu, 10 Mar 2022 19:55:06 +0100
Subject: [PATCH] feat: tls hostname template support (#9359)

---
 bitnami/influxdb/Chart.yaml             | 2 +-
 bitnami/influxdb/README.md              | 2 +-
 bitnami/influxdb/templates/NOTES.txt    | 2 +-
 bitnami/influxdb/templates/ingress.yaml | 8 ++++----
 bitnami/influxdb/values.yaml            | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bitnami/influxdb/Chart.yaml b/bitnami/influxdb/Chart.yaml
index a267b1396b..cff6aa0e1f 100644
--- a/bitnami/influxdb/Chart.yaml
+++ b/bitnami/influxdb/Chart.yaml
@@ -24,4 +24,4 @@ name: influxdb
 sources:
   - https://github.com/bitnami/bitnami-docker-influxdb
   - https://www.influxdata.com/products/influxdb-overview/
-version: 4.0.0
+version: 4.0.1
diff --git a/bitnami/influxdb/README.md b/bitnami/influxdb/README.md
index be9b05a4ae..f9ac3b5c33 100644
--- a/bitnami/influxdb/README.md
+++ b/bitnami/influxdb/README.md
@@ -287,7 +287,7 @@ The command removes all the Kubernetes components associated with the chart and
 | `ingress.tls`              | Create TLS Secret                                                                                                                | `false`                  |
 | `ingress.pathType`         | Ingress path type                                                                                                                | `ImplementationSpecific` |
 | `ingress.apiVersion`       | Force Ingress API version (automatically detected if not set)                                                                    | `""`                     |
-| `ingress.hostname`         | Default host for the ingress resource                                                                                            | `influxdb.local`         |
+| `ingress.hostname`         | Default host for the ingress resource (evaluated as template)                                                                    | `influxdb.local`         |
 | `ingress.path`             | Ingress path*' in order to use this                                                                                              | `/`                      |
 | `ingress.annotations`      | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}`                     |
 | `ingress.extraHosts`       | The list of additional hostnames to be covered with this ingress record.                                                         | `[]`                     |
diff --git a/bitnami/influxdb/templates/NOTES.txt b/bitnami/influxdb/templates/NOTES.txt
index 5560f882f3..e67fbb5321 100644
--- a/bitnami/influxdb/templates/NOTES.txt
+++ b/bitnami/influxdb/templates/NOTES.txt
@@ -92,7 +92,7 @@ Note: Since NetworkPolicy is enabled, only pods with label "{{ include "common.n
 To connect to your database from outside the cluster execute the following commands:
 
 {{- if .Values.ingress.enabled }}
-{{- $ingressHost := .Values.ingress.hostname }}
+{{- $ingressHost := (tpl .Values.ingress.hostname .) }}
   {{- if .Values.ingress.extraHosts }}
   You should be able to access your new InfluxDB&trade; server(s) through:
   {{- end }}
diff --git a/bitnami/influxdb/templates/ingress.yaml b/bitnami/influxdb/templates/ingress.yaml
index 6ec0d254d8..abced03b82 100644
--- a/bitnami/influxdb/templates/ingress.yaml
+++ b/bitnami/influxdb/templates/ingress.yaml
@@ -27,7 +27,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.ingress.hostname }}
-    - host: {{ .Values.ingress.hostname }}
+    - host: {{ (tpl .Values.ingress.hostname .) }}
       http:
         paths:
           {{- if .Values.ingress.extraPaths }}
@@ -48,7 +48,7 @@ spec:
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
-    - host: {{ .name | quote }}
+    - host: {{ (tpl .name $) | quote }}
       http:
         paths:
           {{- if $.Values.ingress.extraPaths }}
@@ -72,8 +72,8 @@ spec:
   tls:
     {{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
     - hosts:
-        - {{ .Values.ingress.hostname | quote }}
-      secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
+        - {{ (tpl .Values.ingress.hostname .) | quote }}
+      secretName: {{ printf "%s-tls" (tpl .Values.ingress.hostname .) }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}
     {{- include "common.tplvalues.render" (dict "value" .Values.ingress.extraTls "context" $) | nindent 4 }}
diff --git a/bitnami/influxdb/values.yaml b/bitnami/influxdb/values.yaml
index 69ab172bd8..7c44600b1b 100644
--- a/bitnami/influxdb/values.yaml
+++ b/bitnami/influxdb/values.yaml
@@ -865,7 +865,7 @@ ingress:
   ##
   enabled: false
   ## @param ingress.tls Create TLS Secret
-  ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.ingress.hostname }}
+  ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" (tpl .Values.ingress.hostname .) }}
   ## You can use the ingress.secrets parameter to create this TLS secret or relay on cert-manager to create it
   ##
   tls: false
@@ -879,7 +879,7 @@ ingress:
   ## @param ingress.apiVersion Force Ingress API version (automatically detected if not set)
   ##
   apiVersion: ""
-  ## @param ingress.hostname Default host for the ingress resource
+  ## @param ingress.hostname Default host for the ingress resource (evaluated as template)
   ##
   hostname: influxdb.local
   ## @param ingress.path Ingress path*' in order to use this