From f571611f3caa0e171e145eac7c876183c7287632 Mon Sep 17 00:00:00 2001
From: "Anselme, Schubert (sa246v)" <sa246v@att.com>
Date: Thu, 16 Nov 2023 14:48:38 -0500
Subject: [PATCH] Enable TLS connection to rabbitmq

Change-Id: Ia4d65393ad0112ae63433a7f67a8c8706a15b216
Signed-off-by: Anselme, Schubert (sa246v) <sa246v@att.com>
---
 charts/shipyard/Chart.yaml                          | 2 +-
 charts/shipyard/templates/job-rabbit-init.yaml      | 5 ++++-
 charts/shipyard/templates/secret-user-rabbitmq.yaml | 2 +-
 charts/shipyard/values.yaml                         | 5 ++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/charts/shipyard/Chart.yaml b/charts/shipyard/Chart.yaml
index 22418a08..a50c0bcc 100644
--- a/charts/shipyard/Chart.yaml
+++ b/charts/shipyard/Chart.yaml
@@ -16,7 +16,7 @@
 apiVersion: v1
 description: A Helm chart for Shipyard and Airflow
 name: shipyard
-version: 0.2.1
+version: 0.2.2
 appVersion: 2.6.2
 keywords:
 - shipyard
diff --git a/charts/shipyard/templates/job-rabbit-init.yaml b/charts/shipyard/templates/job-rabbit-init.yaml
index 39aa527d..bb5ed69a 100644
--- a/charts/shipyard/templates/job-rabbit-init.yaml
+++ b/charts/shipyard/templates/job-rabbit-init.yaml
@@ -16,5 +16,8 @@ limitations under the License.
 
 {{- if .Values.manifests.job_rabbit_init }}
 {{- $rmqJob := dict "envAll" . "serviceName" "airflow" -}}
+{{- if .Values.manifests.certificates -}}
+{{- $_ := set $rmqJob "tlsSecret" .Values.endpoints.oslo_messaging.auth.admin.secret.tls.internal -}}
+{{- end -}}
 {{ $rmqJob | include "helm-toolkit.manifests.job_rabbit_init" }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/charts/shipyard/templates/secret-user-rabbitmq.yaml b/charts/shipyard/templates/secret-user-rabbitmq.yaml
index 2f57d74a..724aa73c 100644
--- a/charts/shipyard/templates/secret-user-rabbitmq.yaml
+++ b/charts/shipyard/templates/secret-user-rabbitmq.yaml
@@ -24,5 +24,5 @@ metadata:
   name: {{ $secretName }}
 type: Opaque
 data:
-  RABBITMQ_CONNECTION: {{ tuple "oslo_messaging" "internal" "user" "amqp" $envAll | include "shipyard.endpoints.authenticated_transport_endpoint_uri_lookup" | b64enc }}
+  RABBITMQ_CONNECTION: {{ tuple "oslo_messaging" "internal" "user" "http" $envAll | include "shipyard.endpoints.authenticated_transport_endpoint_uri_lookup" | b64enc }}
 {{- end }}
diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml
index 6c6d79dd..003352bc 100644
--- a/charts/shipyard/values.yaml
+++ b/charts/shipyard/values.yaml
@@ -334,12 +334,15 @@ endpoints:
       admin:
         username: rabbitmq
         password: password
+        secret:
+          tls:
+            internal: rabbitmq-tls-direct
     hosts:
       default: rabbitmq
     host_fqdn_override:
       default: null
     path: /airflow
-    scheme: amqp
+    scheme: rabbit
     port:
       amqp:
         default: 5672