From 111f41edf64e4addf347945ecbd50d79f97c7d25 Mon Sep 17 00:00:00 2001
From: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Date: Fri, 26 Aug 2022 16:27:14 -0300
Subject: [PATCH] Fixing broken mariadb helmrelease for helmv3

In an environment with helmv3, it was noticed that the mariadb
helmrelease is failing to render properly due to unsupported map key
type (int).

This change quickly fix this problem by quoting the value, forcing it to
be rendered as a string.

Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Change-Id: I2f2be87d0f79ca439e731d07354bcd5f149790d5
---
 mariadb/Chart.yaml                            | 2 +-
 mariadb/templates/configmap-services-tcp.yaml | 2 +-
 releasenotes/notes/mariadb.yaml               | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index 5e1f6e362..11a1b12d2 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.2.31
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.26
+version: 0.2.27
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/templates/configmap-services-tcp.yaml b/mariadb/templates/configmap-services-tcp.yaml
index 5b3a7afd8..0cd6cb1e8 100644
--- a/mariadb/templates/configmap-services-tcp.yaml
+++ b/mariadb/templates/configmap-services-tcp.yaml
@@ -20,5 +20,5 @@ kind: ConfigMap
 metadata:
   name: mariadb-services-tcp
 data:
-  {{ tuple "oslo_db" "internal" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}: "{{ .Release.Namespace }}/{{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}:{{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
+  {{ tuple "oslo_db" "internal" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" | quote }}: "{{ .Release.Namespace }}/{{ tuple "oslo_db" "direct" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" }}:{{ tuple "oslo_db" "direct" "mysql" . | include "helm-toolkit.endpoints.endpoint_port_lookup" }}"
 {{- end }}
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index b89d29ad5..0b34f257c 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -42,4 +42,5 @@ mariadb:
   - 0.2.24 Uplift Mariadb-ingress to 1.2.0
   - 0.2.25 Add liveness probe to restart a pod that got stuck in a transfer wsrep_local_state_comment
   - 0.2.26 Added OCI registry authentication
+  - 0.2.27 Fix broken helmrelease for helmv3
 ...