From 0145dc9f54cf871e8b664e43e97f39df119ea016 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Tue, 30 Nov 2021 09:46:09 +0100 Subject: [PATCH] [bitnami/mediawiki] Fix Mediawiki host when using ingress (#8239) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [bitnami/mediawiki] Fix Mediawiki host when using ingress * Apply suggestion Co-authored-by: Miguel Ángel Cabrera Miñagorri * Bump patch version Co-authored-by: Miguel Ángel Cabrera Miñagorri --- bitnami/mediawiki/Chart.yaml | 2 +- bitnami/mediawiki/templates/_helpers.tpl | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bitnami/mediawiki/Chart.yaml b/bitnami/mediawiki/Chart.yaml index 0ccb84480b..ae67996bb6 100644 --- a/bitnami/mediawiki/Chart.yaml +++ b/bitnami/mediawiki/Chart.yaml @@ -32,4 +32,4 @@ name: mediawiki sources: - https://github.com/bitnami/bitnami-docker-mediawiki - https://www.mediawiki.org/ -version: 12.4.3 +version: 12.4.4 diff --git a/bitnami/mediawiki/templates/_helpers.tpl b/bitnami/mediawiki/templates/_helpers.tpl index a1ac77e5a0..08f78da1e7 100644 --- a/bitnami/mediawiki/templates/_helpers.tpl +++ b/bitnami/mediawiki/templates/_helpers.tpl @@ -15,9 +15,13 @@ Note, returns 127.0.0.1 if using ClusterIP. {{/* Gets the host to be used for this application. If not using ClusterIP, or if a host or LoadBalancerIP is not defined, the value will be empty. +When using Ingress, it will be set to the Ingress hostname. */}} {{- define "mediawiki.host" -}} {{- $host := index .Values (printf "%sHost" .Chart.Name) | default "" -}} +{{- if .Values.ingress.enabled }} +{{- $host := .Values.ingress.hostname | default "" -}} +{{- end -}} {{- default (include "mediawiki.serviceIP" .) $host -}} {{- end -}}