From 41fec510e484acd4eb7fd20cbc31bdeff17e7e47 Mon Sep 17 00:00:00 2001
From: Manyanda Chitimbo <manyanda.chitimbo@gmail.com>
Date: Tue, 17 Dec 2024 10:40:53 +0100
Subject: [PATCH] bump(maestro): bump maestro to
 15b3dcff1c9a96a02c516b787e847757dac8c1af

This adds support for entra token refreshing (https://github.com/openshift-online/maestro/pull/231)
---
 config/config.yaml                                    | 2 +-
 config/public-cloud-cs-pr.json                        | 2 +-
 config/public-cloud-dev.json                          | 2 +-
 config/public-cloud-personal-dev.json                 | 2 +-
 maestro/server/helm/templates/maestro.deployment.yaml | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/config/config.yaml b/config/config.yaml
index da3d3c365..6caa92f09 100644
--- a/config/config.yaml
+++ b/config/config.yaml
@@ -140,7 +140,7 @@ clouds:
       armHelperFPAPrincipalId: bc17c825-6cf8-40d0-8bd6-5536a993115e
       # Maestro
       maestro:
-        imageTag: bc2f131579c6ffc664c15f48c50a9936f1b4a7ce
+        imageTag: 15b3dcff1c9a96a02c516b787e847757dac8c1af
       # Cluster Service
       clusterService:
         imageTag: 9f7fef3
diff --git a/config/public-cloud-cs-pr.json b/config/public-cloud-cs-pr.json
index 5e56e7ed0..f8c99d813 100644
--- a/config/public-cloud-cs-pr.json
+++ b/config/public-cloud-cs-pr.json
@@ -88,7 +88,7 @@
       "private": false
     },
     "imageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
-    "imageTag": "bc2f131579c6ffc664c15f48c50a9936f1b4a7ce",
+    "imageTag": "15b3dcff1c9a96a02c516b787e847757dac8c1af",
     "postgres": {
       "deploy": true,
       "minTLSVersion": "TLSV1.2",
diff --git a/config/public-cloud-dev.json b/config/public-cloud-dev.json
index 15f4ad119..cc3025bdd 100644
--- a/config/public-cloud-dev.json
+++ b/config/public-cloud-dev.json
@@ -88,7 +88,7 @@
       "private": false
     },
     "imageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
-    "imageTag": "bc2f131579c6ffc664c15f48c50a9936f1b4a7ce",
+    "imageTag": "15b3dcff1c9a96a02c516b787e847757dac8c1af",
     "postgres": {
       "deploy": true,
       "minTLSVersion": "TLSV1.2",
diff --git a/config/public-cloud-personal-dev.json b/config/public-cloud-personal-dev.json
index 9f845c5e7..258c58b02 100644
--- a/config/public-cloud-personal-dev.json
+++ b/config/public-cloud-personal-dev.json
@@ -88,7 +88,7 @@
       "private": false
     },
     "imageBase": "quay.io/redhat-user-workloads/maestro-rhtap-tenant/maestro/maestro",
-    "imageTag": "bc2f131579c6ffc664c15f48c50a9936f1b4a7ce",
+    "imageTag": "15b3dcff1c9a96a02c516b787e847757dac8c1af",
     "postgres": {
       "deploy": false,
       "minTLSVersion": "TLSV1.2",
diff --git a/maestro/server/helm/templates/maestro.deployment.yaml b/maestro/server/helm/templates/maestro.deployment.yaml
index 730548c4f..9ad607742 100644
--- a/maestro/server/helm/templates/maestro.deployment.yaml
+++ b/maestro/server/helm/templates/maestro.deployment.yaml
@@ -54,6 +54,7 @@ spec:
         - --db-user-file=/secrets/db/db.user
         - --db-password-file=/secrets/db/db.password
         - --db-name-file=/secrets/db/db.name
+        - --db-rootcert=
         - --db-sslmode={{ .Values.database.ssl }}
         - --alsologtostderr
         - -v={{ .Values.maestro.glog_v }}
@@ -88,7 +89,7 @@ spec:
         - --db-user-file=/secrets/db/db.user
         - --db-password-file=/secrets/db/db.password
         - --db-name-file=/secrets/db/db.name
-        - --db-rootcert=/secrets/db/db.ca_cert
+        - --db-rootcert=
         - --db-sslmode={{ .Values.database.ssl }}
         - --db-max-open-connections={{ .Values.database.maxOpenConnections }}
         - --message-broker-config-file=/secrets/maestro/config.yaml