From 085b3cea6e0bccbf283d76729bc95cb56496f198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?=
 <jsalmeron@bitnami.com>
Date: Thu, 28 Jan 2021 13:17:57 +0100
Subject: [PATCH] [bitnami/joomla] Add hostAliases (#5247)

---
 bitnami/joomla/Chart.yaml                | 2 +-
 bitnami/joomla/README.md                 | 1 +
 bitnami/joomla/templates/deployment.yaml | 9 +++++----
 bitnami/joomla/values.yaml               | 9 +++++++++
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/bitnami/joomla/Chart.yaml b/bitnami/joomla/Chart.yaml
index cbf0ebcd45..c297d84e80 100644
--- a/bitnami/joomla/Chart.yaml
+++ b/bitnami/joomla/Chart.yaml
@@ -27,4 +27,4 @@ name: joomla
 sources:
   - https://github.com/bitnami/bitnami-docker-joomla
   - http://www.joomla.org/
-version: 10.0.1
+version: 10.1.0
diff --git a/bitnami/joomla/README.md b/bitnami/joomla/README.md
index 180ee089cb..39f480233c 100644
--- a/bitnami/joomla/README.md
+++ b/bitnami/joomla/README.md
@@ -96,6 +96,7 @@ The following table lists the configurable parameters of the Joomla! chart and t
 | `initContainers`                     | Add additional init containers to the pod (evaluated as a template)                                                  | `nil`                                       |
 | `lifecycleHooks`                     | LifecycleHook to set additional configuration at startup Evaluated as a template                                     | ``                                          |
 | `livenessProbe`                      | Liveness probe configuration                                                                                         | `Check values.yaml file`                    |
+| `hostAliases`                        | Add deployment host aliases                                                                                          | `Check values.yaml`                         |
 | `joomlaSkipInstall`                  | Skip joomla bootstrap (`no` / `yes`)                                                                                 | `no`                                        |
 | `joomlaUsername`                     | User of the application                                                                                              | `user`                                      |
 | `joomlaPassword`                     | Application password                                                                                                 | _random 10 character alphanumeric string_   |
diff --git a/bitnami/joomla/templates/deployment.yaml b/bitnami/joomla/templates/deployment.yaml
index d93e3c96eb..48192f790c 100644
--- a/bitnami/joomla/templates/deployment.yaml
+++ b/bitnami/joomla/templates/deployment.yaml
@@ -60,10 +60,11 @@ spec:
       {{- if .Values.initContainers }}
       initContainers: {{- include "common.tplvalues.render" (dict "value" .Values.initContainers "context" $) | nindent 8 }}
       {{- end }}
-      hostAliases:
-        - ip: "127.0.0.1"
-          hostnames:
-            - "status.localhost"
+      {{- if .Values.hostAliases }}
+      # yamllint disable rule:indentation
+      hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.hostAliases "context" $) | nindent 8 }}
+      # yamllint enable rule:indentation
+      {{- end }}
       containers:
         - name: joomla
           image: {{ template "joomla.image" . }}
diff --git a/bitnami/joomla/values.yaml b/bitnami/joomla/values.yaml
index 4ff84f01c5..74ac25e354 100644
--- a/bitnami/joomla/values.yaml
+++ b/bitnami/joomla/values.yaml
@@ -48,6 +48,15 @@ fullnameOverride:
 ##
 replicaCount: 1
 
+## Deployment pod host aliases
+## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
+##
+hostAliases:
+  # Necessary for apache-exporter to work
+  - ip: "127.0.0.1"
+    hostnames:
+      - "status.localhost"
+
 ## Skip Joomla! installation wizard. Useful for migrations and restoring from SQL dump
 ## ref: https://github.com/bitnami/bitnami-docker-joomla#configuration
 ##