b06eb5f63a
Change Ifb7946e9a289234047934b52d200b951a59c1a3f was rebased wrong
and intends to use an old method of building openstack-armada-app
openstack-helm and openstack-helm-infrafor debian.
This patch correctly applies the new patch changes.
Test Plan:
PASS: Centos Build (build-pkgs openstack-helm-infra openstack-helm)
PASS: Debian Build (build-pkgs -p openstack-helm-infra
build-pkgs -p openstack-helm)
Closes-bug: 1960968
Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com>
Change-Id: Ica08158dbba5a10ec7b6266b6808d22d53244095
92 lines
3.7 KiB
Diff
92 lines
3.7 KiB
Diff
From 4b2cc6a3c4b9af9dd2688d52b493828cef97cdb6 Mon Sep 17 00:00:00 2001
|
|
From: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com>
|
|
Date: Tue, 8 Feb 2022 09:20:36 -0300
|
|
Subject: [PATCH 22/22] remove rabbit tls
|
|
|
|
Change-Id: I04c4c25c72b10b87e71c2f286e21526e5e062b67
|
|
---
|
|
.../templates/manifests/_job-rabbit-init.yaml.tpl | 15 ---------------
|
|
.../templates/scripts/_rabbit-init.sh.tpl | 15 ---------------
|
|
2 files changed, 30 deletions(-)
|
|
|
|
diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
|
|
index 59e0da0f..b776d055 100644
|
|
--- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
|
|
+++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
|
|
@@ -25,9 +25,6 @@ limitations under the License.
|
|
{{- $backoffLimit := index . "backoffLimit" | default "1000" -}}
|
|
{{- $activeDeadlineSeconds := index . "activeDeadlineSeconds" -}}
|
|
{{- $serviceUserPretty := $serviceUser | replace "_" "-" -}}
|
|
-{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
|
|
-{{- $tlsPath := index . "tlsPath" | default "/etc/rabbitmq/certs" -}}
|
|
-{{- $tlsSecret := index . "tlsSecret" | default "" -}}
|
|
|
|
{{- $serviceAccountName := printf "%s-%s" $serviceUserPretty "rabbit-init" }}
|
|
{{ tuple $envAll "rabbit_init" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
|
|
@@ -85,9 +82,6 @@ spec:
|
|
mountPath: /tmp/rabbit-init.sh
|
|
subPath: rabbit-init.sh
|
|
readOnly: true
|
|
-{{- if $envAll.Values.manifests.certificates }}
|
|
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $tlsSecret "path" $tlsPath | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
|
|
-{{- end }}
|
|
env:
|
|
- name: RABBITMQ_ADMIN_CONNECTION
|
|
valueFrom:
|
|
@@ -102,12 +96,6 @@ spec:
|
|
{{- if $envAll.Values.conf.rabbitmq }}
|
|
- name: RABBITMQ_AUXILIARY_CONFIGURATION
|
|
value: {{ toJson $envAll.Values.conf.rabbitmq | quote }}
|
|
-{{- end }}
|
|
-{{- if and $envAll.Values.manifests.certificates (ne $tlsSecret "") }}
|
|
- - name: RABBITMQ_X509
|
|
- value: "REQUIRE X509"
|
|
- - name: USER_CERT_PATH
|
|
- value: {{ $tlsPath | quote }}
|
|
{{- end }}
|
|
volumes:
|
|
- name: pod-tmp
|
|
@@ -122,7 +110,4 @@ spec:
|
|
name: {{ $configMapBin | quote }}
|
|
defaultMode: 0555
|
|
{{- end }}
|
|
-{{- if $envAll.Values.manifests.certificates }}
|
|
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $tlsSecret | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
|
|
-{{- end }}
|
|
{{- end -}}
|
|
diff --git a/helm-toolkit/templates/scripts/_rabbit-init.sh.tpl b/helm-toolkit/templates/scripts/_rabbit-init.sh.tpl
|
|
index 87872d6f..7fb16a0f 100644
|
|
--- a/helm-toolkit/templates/scripts/_rabbit-init.sh.tpl
|
|
+++ b/helm-toolkit/templates/scripts/_rabbit-init.sh.tpl
|
|
@@ -47,27 +47,12 @@ RABBITMQ_VHOST=$(echo "${RABBITMQ_USER_CONNECTION}" | \
|
|
RABBITMQ_VHOST="${RABBITMQ_VHOST:-/}"
|
|
|
|
function rabbitmqadmin_cli () {
|
|
- if [ -n "$RABBITMQ_X509" ]
|
|
- then
|
|
rabbitmqadmin \
|
|
- --ssl \
|
|
- --ssl-disable-hostname-verification \
|
|
- --ssl-ca-cert-file="${USER_CERT_PATH}/ca.crt" \
|
|
- --ssl-cert-file="${USER_CERT_PATH}/tls.crt" \
|
|
- --ssl-key-file="${USER_CERT_PATH}/tls.key" \
|
|
--host="${RABBIT_HOSTNAME}" \
|
|
--port="${RABBIT_PORT}" \
|
|
--username="${RABBITMQ_ADMIN_USERNAME}" \
|
|
--password="${RABBITMQ_ADMIN_PASSWORD}" \
|
|
${@}
|
|
- else
|
|
- rabbitmqadmin \
|
|
- --host="${RABBIT_HOSTNAME}" \
|
|
- --port="${RABBIT_PORT}" \
|
|
- --username="${RABBITMQ_ADMIN_USERNAME}" \
|
|
- --password="${RABBITMQ_ADMIN_PASSWORD}" \
|
|
- ${@}
|
|
- fi
|
|
}
|
|
|
|
echo "Managing: User: ${RABBITMQ_USERNAME}"
|
|
--
|
|
2.17.1
|
|
|