From 1eca3e6fd6543df2775265a19cccab9e549b202d Mon Sep 17 00:00:00 2001 From: Matteo Di Fazio Date: Tue, 1 Oct 2024 09:50:36 +0200 Subject: [PATCH] [bitnami/drupal] templates/ingress.yaml: fix wrong www.www tls name (#29564) * [bitnami/drupal] templates/ingress.yaml: fix wrong www.www tls name Signed-off-by: Matteo Di Fazio * Update CHANGELOG.md Signed-off-by: Bitnami Containers * Update CHANGELOG.md Signed-off-by: Bitnami Containers * [bitnami/drupal] templates/ingress.yaml: improve fix Signed-off-by: Matteo Di Fazio * Update CHANGELOG.md Signed-off-by: Bitnami Containers --------- Signed-off-by: Matteo Di Fazio Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/drupal/CHANGELOG.md | 8 ++++++-- bitnami/drupal/Chart.yaml | 2 +- bitnami/drupal/templates/ingress.yaml | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/bitnami/drupal/CHANGELOG.md b/bitnami/drupal/CHANGELOG.md index fbc3726e28..b0037aa651 100644 --- a/bitnami/drupal/CHANGELOG.md +++ b/bitnami/drupal/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 20.0.7 (2024-09-19) +## 20.0.8 (2024-09-29) -* [bitnami/drupal] Release 20.0.7 ([#29515](https://github.com/bitnami/charts/pull/29515)) +* [bitnami/drupal] templates/ingress.yaml: fix wrong www.www tls name ([#29564](https://github.com/bitnami/charts/pull/29564)) + +## 20.0.7 (2024-09-19) + +* [bitnami/drupal] Release 20.0.7 (#29515) ([cfcfb7f](https://github.com/bitnami/charts/commit/cfcfb7fd7ae06eb0f766a71230bafb788893bc3c)), closes [#29515](https://github.com/bitnami/charts/issues/29515) ## 20.0.6 (2024-09-17) diff --git a/bitnami/drupal/Chart.yaml b/bitnami/drupal/Chart.yaml index 0254370984..c873893b43 100644 --- a/bitnami/drupal/Chart.yaml +++ b/bitnami/drupal/Chart.yaml @@ -40,4 +40,4 @@ maintainers: name: drupal sources: - https://github.com/bitnami/charts/tree/main/bitnami/drupal -version: 20.0.7 +version: 20.0.8 diff --git a/bitnami/drupal/templates/ingress.yaml b/bitnami/drupal/templates/ingress.yaml index 09fc9ad2f6..a0a3b8e5b4 100644 --- a/bitnami/drupal/templates/ingress.yaml +++ b/bitnami/drupal/templates/ingress.yaml @@ -54,7 +54,7 @@ spec: {{- if .Values.ingress.tls }} - hosts: - {{ .Values.ingress.hostname | quote }} - {{- if or (.Values.ingress.tlsWwwPrefix) (eq (index .Values.ingress.annotations "nginx.ingress.kubernetes.io/from-to-www-redirect") "true" ) }} + {{- if and (or (.Values.ingress.tlsWwwPrefix) (eq (index .Values.ingress.annotations "nginx.ingress.kubernetes.io/from-to-www-redirect") "true" )) (not (contains "www." .Values.ingress.hostname)) }} - {{ printf "www.%s" (tpl .Values.ingress.hostname $) | quote }} {{- end }} secretName: {{ printf "%s-tls" .Values.ingress.hostname }}