diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a97be93dadd0cd85ca6a9339aabe8cb3a36682a2..e2cfd7d5ba50f4e6820e9605f9cbeb677752e3d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,11 @@ deploy_prod_rabbit: - sec_info=$(kubectl --kubeconfig $kubeconfig get secret --namespace geosphere-test geosphere-rabbit-rabbitmq || echo "") - echo $sec_info - auth_sec="geosphere-rabbit-rabbitmq" - - if [ "$sec_info" != "" ]; then EXTRA_ARGS="--set auth.existingPasswordSecret=$auth_sec --set auth.existingErlangSecret=$auth_sec"; fi + - if [ "$sec_info" != "" ]; then + pw=$(kubectl --kubeconfig $kubeconfig get secret --namespace geosphere-test geosphere-rabbit-rabbitmq -o jsonpath="{.data.rabbitmq-password}" | base64 -d); + ec=$(kubectl --kubeconfig $kubeconfig get secret --namespace geosphere-test geosphere-rabbit-rabbitmq -o jsonpath="{.data.rabbitmq-erlang-cookie}" | base64 -d); + EXTRA_ARGS="--set auth.password=$pw --set auth.erlangCookie=$ec"; + fi - echo $EXTRA_ARGS # install third-party rabbitmq server - helm repo add bitnami "https://charts.bitnami.com/bitnami"