From f630c152e8bba1fdf51601c7ae75e8f40f39c5b8 Mon Sep 17 00:00:00 2001
From: Sergiy Markin <smarkin@mirantis.com>
Date: Fri, 1 Nov 2024 16:02:19 +0000
Subject: [PATCH] Mariadb chart updates

This PS is for improvements for wait_for_cluster mariadb job.

Change-Id: I46de32243e3aaa98b7e3e8c132a84d7b65d657cc
---
 mariadb/Chart.yaml                                     | 2 +-
 mariadb/templates/bin/_mariadb-wait-for-cluster.py.tpl | 2 +-
 mariadb/templates/job-cluster-wait.yaml                | 2 ++
 mariadb/values_overrides/wait-for-cluster.yaml         | 4 ++++
 releasenotes/notes/mariadb.yaml                        | 1 +
 5 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 mariadb/values_overrides/wait-for-cluster.yaml

diff --git a/mariadb/Chart.yaml b/mariadb/Chart.yaml
index 2fcf48e2f..66fb45b2a 100644
--- a/mariadb/Chart.yaml
+++ b/mariadb/Chart.yaml
@@ -15,7 +15,7 @@ apiVersion: v1
 appVersion: v10.6.7
 description: OpenStack-Helm MariaDB
 name: mariadb
-version: 0.2.51
+version: 0.2.52
 home: https://mariadb.com/kb/en/
 icon: http://badges.mariadb.org/mariadb-badge-180x60.png
 sources:
diff --git a/mariadb/templates/bin/_mariadb-wait-for-cluster.py.tpl b/mariadb/templates/bin/_mariadb-wait-for-cluster.py.tpl
index fb36e271d..c1dbfeeeb 100644
--- a/mariadb/templates/bin/_mariadb-wait-for-cluster.py.tpl
+++ b/mariadb/templates/bin/_mariadb-wait-for-cluster.py.tpl
@@ -162,7 +162,7 @@ def is_mariadb_stabe():
             LOG.info("The wspep is ready")
             return True
     except Exception as e:
-        LOG.error(f"Got exception while checking state. {e}")
+        LOG.exception(f"Got exception while checking state. {e}")
     return False
 
 
diff --git a/mariadb/templates/job-cluster-wait.yaml b/mariadb/templates/job-cluster-wait.yaml
index 4a239de3e..30d96bf83 100644
--- a/mariadb/templates/job-cluster-wait.yaml
+++ b/mariadb/templates/job-cluster-wait.yaml
@@ -109,6 +109,7 @@ spec:
               mountPath: /etc/mysql/admin_user.cnf
               subPath: admin_user.cnf
               readOnly: true
+{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_db.server.internal "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
       volumes:
         - name: pod-tmp
           emptyDir: {}
@@ -120,4 +121,5 @@ spec:
           secret:
             secretName: mariadb-secrets
             defaultMode: 0444
+{{- dict "enabled" $envAll.Values.manifests.certificates "name" $envAll.Values.secrets.tls.oslo_db.server.internal | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
 {{- end }}
diff --git a/mariadb/values_overrides/wait-for-cluster.yaml b/mariadb/values_overrides/wait-for-cluster.yaml
new file mode 100644
index 000000000..f1ecdfce8
--- /dev/null
+++ b/mariadb/values_overrides/wait-for-cluster.yaml
@@ -0,0 +1,4 @@
+---
+manifests:
+  job_cluster_wait: true
+...
diff --git a/releasenotes/notes/mariadb.yaml b/releasenotes/notes/mariadb.yaml
index 3a7d6b948..d5879b657 100644
--- a/releasenotes/notes/mariadb.yaml
+++ b/releasenotes/notes/mariadb.yaml
@@ -67,4 +67,5 @@ mariadb:
   - 0.2.49 Remove ingress deployment
   - 0.2.50 Add cluster-wait job
   - 0.2.51 Add 2024.2 overrides
+  - 0.2.52 Added SSL support to cluster-wait job
 ...