From c52d2369b97cb08a15e04e3f098904e704d858a1 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Aug 2023 13:57:31 +0200 Subject: [PATCH] Move data from taiga-rabbitmq-secret to taiga-secret --- src/main/resources/taiga/donotapply/changes-made.md | 10 +++++++++- .../taiga/taiga-async-rabbitmq-deployment.yaml | 6 +++--- src/main/resources/taiga/taiga-back-deployment.yaml | 2 -- src/main/resources/taiga/taiga-configmap.yaml | 1 - src/main/resources/taiga/taiga-rabbitmq-secret.yaml | 11 ----------- src/main/resources/taiga/taiga-secret.yaml | 5 +++++ 6 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 src/main/resources/taiga/taiga-rabbitmq-secret.yaml diff --git a/src/main/resources/taiga/donotapply/changes-made.md b/src/main/resources/taiga/donotapply/changes-made.md index 3578f9f..96d0f2b 100644 --- a/src/main/resources/taiga/donotapply/changes-made.md +++ b/src/main/resources/taiga/donotapply/changes-made.md @@ -22,4 +22,12 @@ Change value of RABBITMQ_USER in taiga-secret.yaml to b64/encode taiga Change value of RABBITMQ_DEFAULT_USER in taiga-rabbitmq-secret.yaml to b64/encode taiga Remove -service suffix from all taiga service names Remove -service suffix from all urls in taiga-gateway configmap -Remove -service suffix from ingress \ No newline at end of file +Remove -service suffix from ingress +Add - name: RABBITMQ_LOGS value: /opt/rabbitmq/logs.log in taiga-async-rabbitmq-deployment +Get RABBITMQ_ERLANG_COOKIE from taiga-secret in taiga-events-rabbitmq-deployment +Put RABBITMQ_DEFAULT_VHOST KV pair in taiga-configmap +Get RABBITMQ_DEFAULT_VHOST from taiga-configmap in taiga-events-rabbitmq-deployment +Get RABBITMQ_DEFAULT_VHOST from taiga-configmap in taiga-async-rabbitmq-deployment +Move all values from taiga-rabbitmq-secret to taiga-secret +Remove taiga-rabbitmq-secret from config +Rename all occurrences of taiga-rabbitmq-secret to taiga-secret \ No newline at end of file diff --git a/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml b/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml index 1aff26a..c55cfad 100644 --- a/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml +++ b/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml @@ -32,17 +32,17 @@ spec: - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: - name: taiga-rabbitmq-secret + name: taiga-secret key: RABBITMQ_DEFAULT_USER - name: RABBITMQ_DEFAULT_PASS valueFrom: secretKeyRef: - name: taiga-rabbitmq-secret + name: taiga-secret key: RABBITMQ_DEFAULT_PASS - name: RABBITMQ_ERLANG_COOKIE valueFrom: secretKeyRef: - name: taiga-rabbitmq-secret + name: taiga-secret key: RABBITMQ_ERLANG_COOKIE - name: RABBITMQ_DEFAULT_VHOST valueFrom: diff --git a/src/main/resources/taiga/taiga-back-deployment.yaml b/src/main/resources/taiga/taiga-back-deployment.yaml index ed9fa83..62d9584 100644 --- a/src/main/resources/taiga/taiga-back-deployment.yaml +++ b/src/main/resources/taiga/taiga-back-deployment.yaml @@ -36,8 +36,6 @@ spec: name: taiga-configmap - secretRef: name: taiga-secret - - secretRef: - name: taiga-rabbitmq-secret env: - name: POSTGRES_USER valueFrom: diff --git a/src/main/resources/taiga/taiga-configmap.yaml b/src/main/resources/taiga/taiga-configmap.yaml index f0cf061..32a9cf9 100644 --- a/src/main/resources/taiga/taiga-configmap.yaml +++ b/src/main/resources/taiga/taiga-configmap.yaml @@ -46,5 +46,4 @@ data: ENABLE_TRELLO_IMPORTER: "false" # Rabbitmq settings - RABBITMQ_DEFAULT_VHOST: taiga diff --git a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml deleted file mode 100644 index d72223d..0000000 --- a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: taiga-rabbitmq-secret - labels: - app.kubernetes.part-of: taiga -data: - # Rabbitmq settings - RABBITMQ_DEFAULT_USER: dGFpZ2E= # ToDo: Evaluate if we need two different users and passes for rabbitmq - RABBITMQ_DEFAULT_PASS: cmFiYml0X3Bhc3M= - RABBITMQ_ERLANG_COOKIE: cmFiYml0X3Bhc3M= diff --git a/src/main/resources/taiga/taiga-secret.yaml b/src/main/resources/taiga/taiga-secret.yaml index 3f55a79..150eed9 100644 --- a/src/main/resources/taiga/taiga-secret.yaml +++ b/src/main/resources/taiga/taiga-secret.yaml @@ -20,3 +20,8 @@ data: # Django settings DJANGO_SUPERUSER_TAIGAADMIN: dGFpZ2E= DJANGO_SUPERUSER_PASSWORD: dGFpZ2FfcGFzcw== + + # Rabbitmq settings + RABBITMQ_DEFAULT_USER: dGFpZ2E= # ToDo: Evaluate if we need two different users and passes for rabbitmq + RABBITMQ_DEFAULT_PASS: cmFiYml0X3Bhc3M= + RABBITMQ_ERLANG_COOKIE: cmFiYml0X3Bhc3M=