[bitnami/kibana] Template hostname everywhere (#30807)

* [bitnami/kibana] Template hostname everywhere This commit allows the templating the hostname in the kibana config file as well as in the Ingress manifest. Signed-off-by: Jan-Philipp Litza <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> * Update CHANGELOG.md Signed-off-by: Bitnami Containers <[email protected]> --------- Signed-off-by: Jan-Philipp Litza <[email protected]> Signed-off-by: Bitnami Containers <[email protected]> Co-authored-by: Bitnami Containers <[email protected]>
bitnami · Feb 24, 2025 · 82d4893 · 82d4893
1 parent b820c10
commit 82d4893
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 16 deletions.
diff --git a/bitnami/kibana/CHANGELOG.md b/bitnami/kibana/CHANGELOG.md
@@ -1,8 +1,13 @@
 # Changelog
 
-## 11.4.5 (2025-02-11)
+## 11.5.0 (2025-02-24)
 
-* [bitnami/kibana] Release 11.4.5 ([#31871](https://github.com/bitnami/charts/pull/31871))
+* [bitnami/kibana] Template hostname everywhere ([#30807](https://github.com/bitnami/charts/pull/30807))
+
+## <small>11.4.5 (2025-02-11)</small>
+
+* [bitnami/kibana] Release 11.4.5 (#31871) ([b99a5eb](https://github.com/bitnami/charts/commit/b99a5eb6f8510efc5d3a5c75e176889c176fb00f)), closes [#31871](https://github.com/bitnami/charts/issues/31871)
+* Update copyright year (#31682) ([e9f02f5](https://github.com/bitnami/charts/commit/e9f02f5007068751f7eb2270fece811e685c99b6)), closes [#31682](https://github.com/bitnami/charts/issues/31682)
 
 ## <small>11.4.4 (2025-01-30)</small>
 

diff --git a/bitnami/kibana/Chart.yaml b/bitnami/kibana/Chart.yaml
@@ -32,4 +32,4 @@ maintainers:
 name: kibana
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/kibana
-version: 11.4.5
+version: 11.5.0
diff --git a/bitnami/kibana/README.md b/bitnami/kibana/README.md
@@ -381,14 +381,14 @@ You can enable this initContainer by setting `volumePermissions.enabled` to `tru
 | `ingress.enabled`                                   | Enable ingress controller resource                                                                                                                                                                                                                    | `false`                    |
 | `ingress.pathType`                                  | Ingress Path type                                                                                                                                                                                                                                     | `ImplementationSpecific`   |
 | `ingress.apiVersion`                                | Override API Version (automatically detected if not set)                                                                                                                                                                                              | `""`                       |
-| `ingress.hostname`                                  | Default host for the ingress resource. If specified as "*" no host rule is configured                                                                                                                                                                 | `kibana.local`             |
+| `ingress.hostname`                                  | Default host for the ingress resource. Evaluated as a template. If specified as "*" no host rule is configured                                                                                                                                        | `kibana.local`             |
 | `ingress.path`                                      | The Path to Kibana. You may need to set this to '/*' in order to use this with ALB ingress controllers.                                                                                                                                               | `/`                        |
 | `ingress.annotations`                               | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations.                                                                                                                      | `{}`                       |
 | `ingress.tls`                                       | Enable TLS configuration for the hostname defined at ingress.hostname parameter                                                                                                                                                                       | `false`                    |
 | `ingress.selfSigned`                                | Create a TLS secret for this ingress record using self-signed certificates generated by Helm                                                                                                                                                          | `false`                    |
-| `ingress.extraHosts`                                | The list of additional hostnames to be covered with this ingress record.                                                                                                                                                                              | `[]`                       |
-| `ingress.extraPaths`                                | Additional arbitrary path/backend objects                                                                                                                                                                                                             | `[]`                       |
-| `ingress.extraTls`                                  | The tls configuration for additional hostnames to be covered with this ingress record.                                                                                                                                                                | `[]`                       |
+| `ingress.extraHosts`                                | The list of additional hostnames to be covered with this ingress record. Evaluated as a template.                                                                                                                                                     | `[]`                       |
+| `ingress.extraPaths`                                | Additional arbitrary path/backend objects. Evaluated as a template.                                                                                                                                                                                   | `[]`                       |
+| `ingress.extraTls`                                  | The tls configuration for additional hostnames to be covered with this ingress record. Evaluated as a template.                                                                                                                                       | `[]`                       |
 | `ingress.secrets`                                   | If you're providing your own certificates, please use this to add the certificates as secrets                                                                                                                                                         | `[]`                       |
 | `ingress.ingressClassName`                          | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)                                                                                                                                                                         | `""`                       |
 | `ingress.extraRules`                                | The list of additional rules to be added to this ingress record. Evaluated as a template                                                                                                                                                              | `[]`                       |

diff --git a/bitnami/kibana/templates/configmap.yaml b/bitnami/kibana/templates/configmap.yaml
@@ -23,12 +23,12 @@ data:
     server.basePath: {{ .Values.configuration.server.basePath | quote }}
     {{- end }}
     {{- if .Values.configuration.server.publicBaseUrl }}
-    server.publicBaseUrl: {{ .Values.configuration.server.publicBaseUrl }}
+    server.publicBaseUrl: {{ include "common.tplvalues.render" ( dict "value" .Values.configuration.server.publicBaseUrl "context" $ ) }}
     {{- else }}
     {{- if .Values.ingress.enabled }}
     {{- $protocol := ternary "https" "http" (or .Values.ingress.tls .Values.ingress.extraTls) -}}
     {{- $hostname := required "Ingress hostname must be specified" .Values.ingress.hostname -}}
-    server.publicBaseUrl: {{ printf "%s://%s" $protocol $hostname }}
+    server.publicBaseUrl: {{ printf "%s://%s" $protocol ( include "common.tplvalues.render" ( dict "value" $hostname ) "context" $ ) }}
     {{- end }}
     {{- end }}
     server.rewriteBasePath: {{ .Values.configuration.server.rewriteBasePath }}

diff --git a/bitnami/kibana/templates/ingress.yaml b/bitnami/kibana/templates/ingress.yaml
@@ -28,11 +28,11 @@ spec:
             {{- end }}
             backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
       {{- if ne .Values.ingress.hostname "*" }}
-      host: {{ .Values.ingress.hostname }}
+      host: {{ include "common.tplvalues.render" ( dict "value" .Values.ingress.hostname "context" $ ) }}
       {{- end }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
-    - host: {{ .name | quote }}
+    - host: {{ include "common.tplvalues.render" ( dict "value" .name "context" $ ) | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
@@ -48,7 +48,7 @@ spec:
   tls:
     {{- if and .Values.ingress.tls (or (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) .Values.ingress.selfSigned) }}
     - hosts:
-        - {{ .Values.ingress.hostname | quote }}
+        - {{ include "common.tplvalues.render" ( dict "value" .Values.ingress.hostname "context" $ ) }}
       secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
     {{- end }}
     {{- if .Values.ingress.extraTls }}

diff --git a/bitnami/kibana/values.yaml b/bitnami/kibana/values.yaml
@@ -477,7 +477,7 @@ ingress:
   ## @param ingress.apiVersion Override API Version (automatically detected if not set)
   ##
   apiVersion: ""
-  ## @param ingress.hostname Default host for the ingress resource. If specified as "*" no host rule is configured
+  ## @param ingress.hostname Default host for the ingress resource. Evaluated as a template. If specified as "*" no host rule is configured
   ##
   hostname: kibana.local
   ## @param ingress.path The Path to Kibana. You may need to set this to '/*' in order to use this with ALB ingress controllers.
@@ -503,14 +503,14 @@ ingress:
   ## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm
   ##
   selfSigned: false
-  ## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record.
+  ## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record. Evaluated as a template.
   ## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array
   ## extraHosts:
   ## - name: kibana.local
   ##   path: /
   ##
   extraHosts: []
-  ## @param ingress.extraPaths Additional arbitrary path/backend objects
+  ## @param ingress.extraPaths Additional arbitrary path/backend objects. Evaluated as a template. 
   ## For example: The ALB ingress controller requires a special rule for handling SSL redirection.
   ## extraPaths:
   ## - path: /*
@@ -519,7 +519,7 @@ ingress:
   ##     servicePort: use-annotation
   ##
   extraPaths: []
-  ## @param ingress.extraTls The tls configuration for additional hostnames to be covered with this ingress record.
+  ## @param ingress.extraTls The tls configuration for additional hostnames to be covered with this ingress record. Evaluated as a template.
   ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
   ## extraTls:
   ## - hosts: