From d1fc7080001a23d5b369ac51af51aed30f716f82 Mon Sep 17 00:00:00 2001
From: Nicholas Kuechler <nkuechler@gmail.com>
Date: Thu, 27 Jun 2024 13:57:29 -0500
Subject: [PATCH] horizon: fix templating of list of strings for
 CSRF_TRUSTED_ORIGINS

Change-Id: I740cd48103950e1599e77db46c7e4d9e65677177
---
 horizon/Chart.yaml              | 2 +-
 horizon/values.yaml             | 2 +-
 releasenotes/notes/horizon.yaml | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index f67a05f401..d5fa1b4a40 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Horizon
 name: horizon
-version: 0.3.25
+version: 0.3.26
 home: https://docs.openstack.org/horizon/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
 sources:
diff --git a/horizon/values.yaml b/horizon/values.yaml
index 4218dbf02e..b56652fac6 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -315,7 +315,7 @@ conf:
         SESSION_COOKIE_HTTPONLY = {{ .Values.conf.horizon.local_settings.config.session_cookie_httponly }}
 
         # https://docs.djangoproject.com/en/dev/ref/settings/#csrf-trusted-origins
-        CSRF_TRUSTED_ORIGINS = {{ .Values.conf.horizon.local_settings.config.csrf_trusted_origins }}
+        CSRF_TRUSTED_ORIGINS = [{{ include "helm-toolkit.utils.joinListWithCommaAndSingleQuotes" .Values.conf.horizon.local_settings.config.csrf_trusted_origins }}]
 
         # Overrides for OpenStack API versions. Use this setting to force the
         # OpenStack dashboard to use a specific API version for a given service API.
diff --git a/releasenotes/notes/horizon.yaml b/releasenotes/notes/horizon.yaml
index 540388426b..69d342b8c1 100644
--- a/releasenotes/notes/horizon.yaml
+++ b/releasenotes/notes/horizon.yaml
@@ -62,4 +62,5 @@ horizon:
   - 0.3.23 Use global wsgi subinterpreter
   - 0.3.24 Use base64 values for custom logo
   - 0.3.25 Implement "CSRF_TRUSTED_ORIGINS" option support in horizon
+  - 0.3.26 Fix templating of CSRF_TRUSTED_ORIGINS
 ...