airship
/
shipyard
Code Issues Proposed changes

Enable TLS connection to rabbitmq 

Change-Id: Ia4d65393ad0112ae63433a7f67a8c8706a15b216
Signed-off-by: Anselme, Schubert (sa246v) <sa246v@att.com>
This commit is contained in:
Anselme, Schubert (sa246v) 2023-11-16 14:48:38 -05:00
parent f3ea82daec
commit f571611f3c
No known key found for this signature in database
GPG Key ID: 4E0F7ECFE90D344C
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/shipyard/Chart.yaml
View File

@ -16,7 +16,7 @@
apiVersion: v1 apiVersion: v1
description: A Helm chart for Shipyard and Airflow description: A Helm chart for Shipyard and Airflow
name: shipyard name: shipyard
version: 0.2.1 version: 0.2.2
appVersion: 2.6.2 appVersion: 2.6.2
keywords: keywords:
- shipyard - shipyard

5
charts/shipyard/templates/job-rabbit-init.yaml
View File

@ -16,5 +16,8 @@ limitations under the License.
{{- if .Values.manifests.job_rabbit_init }} {{- if .Values.manifests.job_rabbit_init }}
{{- $rmqJob := dict "envAll" . "serviceName" "airflow" -}} {{- $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" }} {{ $rmqJob | include "helm-toolkit.manifests.job_rabbit_init" }}
{{- end }} {{- end }}

2
charts/shipyard/templates/secret-user-rabbitmq.yaml
View File

@ -24,5 +24,5 @@ metadata:
name: {{ $secretName }} name: {{ $secretName }}
type: Opaque type: Opaque
data: 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 }} {{- end }}

5
charts/shipyard/values.yaml
View File

@ -334,12 +334,15 @@ endpoints:
admin: admin:
username: rabbitmq username: rabbitmq
password: password password: password
secret:
tls:
internal: rabbitmq-tls-direct
hosts: hosts:
default: rabbitmq default: rabbitmq
host_fqdn_override: host_fqdn_override:
default: null default: null
path: /airflow path: /airflow
scheme: amqp scheme: rabbit
port: port:
amqp: amqp:
default: 5672 default: 5672