From 77d1827526d447e414ff520c34d9b1ea5cb7b500 Mon Sep 17 00:00:00 2001 From: erik Date: Fri, 25 Aug 2023 11:21:59 +0200 Subject: [PATCH] Single rabbitmq user, remove env vars, add todos --- src/main/resources/taiga/async-rabbitmq-deployment.yaml | 6 ++---- src/main/resources/taiga/async-service.yaml | 2 +- src/main/resources/taiga/back-deployment.yaml | 1 + src/main/resources/taiga/configmap.yaml | 2 +- src/main/resources/taiga/data-pvcs.yaml | 8 ++++---- src/main/resources/taiga/events-deployment.yaml | 5 ----- src/main/resources/taiga/events-rabbitmq-deployment.yaml | 4 ++-- src/main/resources/taiga/rabbitmq-pvc.yaml | 8 ++++---- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/src/main/resources/taiga/async-rabbitmq-deployment.yaml b/src/main/resources/taiga/async-rabbitmq-deployment.yaml index c55cfad..af02c46 100644 --- a/src/main/resources/taiga/async-rabbitmq-deployment.yaml +++ b/src/main/resources/taiga/async-rabbitmq-deployment.yaml @@ -27,18 +27,16 @@ spec: mountPath: /var/lib/rabbitmq readOnly: false env: - - name: RABBITMQ_LOGS - value: /opt/rabbitmq/logs.log - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: name: taiga-secret - key: RABBITMQ_DEFAULT_USER + key: RABBITMQ_USER - name: RABBITMQ_DEFAULT_PASS valueFrom: secretKeyRef: name: taiga-secret - key: RABBITMQ_DEFAULT_PASS + key: RABBITMQ_PASS - name: RABBITMQ_ERLANG_COOKIE valueFrom: secretKeyRef: diff --git a/src/main/resources/taiga/async-service.yaml b/src/main/resources/taiga/async-service.yaml index 5ce1ceb..943056f 100644 --- a/src/main/resources/taiga/async-service.yaml +++ b/src/main/resources/taiga/async-service.yaml @@ -14,5 +14,5 @@ spec: - name: http targetPort: http port: 8000 - protocol: TCP + protocol: TCP \ No newline at end of file diff --git a/src/main/resources/taiga/back-deployment.yaml b/src/main/resources/taiga/back-deployment.yaml index 62d9584..e37f75f 100644 --- a/src/main/resources/taiga/back-deployment.yaml +++ b/src/main/resources/taiga/back-deployment.yaml @@ -19,6 +19,7 @@ spec: - name: taiga-back command: - /taiga-back/docker/entrypoint.sh + - /taiga-back/docker/manage.py createsuperuser --noinput image: taigaio/taiga-back:latest imagePullPolicy: IfNotPresent ports: diff --git a/src/main/resources/taiga/configmap.yaml b/src/main/resources/taiga/configmap.yaml index 171a832..6b18be9 100644 --- a/src/main/resources/taiga/configmap.yaml +++ b/src/main/resources/taiga/configmap.yaml @@ -9,7 +9,7 @@ data: # Taiga settings TAIGA_SITES_SCHEME: https - TAIGA_SITES_DOMAIN: taiga.test.meissa.de + TAIGA_SITES_DOMAIN: taiga.test.meissa.de # Replace by replacable values TAIGA_SUBPATH: "" # Email settings. diff --git a/src/main/resources/taiga/data-pvcs.yaml b/src/main/resources/taiga/data-pvcs.yaml index cd51a7d..0af7c35 100644 --- a/src/main/resources/taiga/data-pvcs.yaml +++ b/src/main/resources/taiga/data-pvcs.yaml @@ -7,12 +7,12 @@ metadata: app: taiga app.kubernetes.part-of: taiga spec: - storageClassName: local-path + storageClassName: local-path # ToDo: configurable accessModes: - ReadWriteOnce resources: requests: - storage: 1Gi + storage: 1Gi # ToDo: configurable --- apiVersion: v1 kind: PersistentVolumeClaim @@ -23,9 +23,9 @@ metadata: app: taiga app.kubernetes.part-of: taiga spec: - storageClassName: local-path + storageClassName: local-path # ToDo: configurable accessModes: - ReadWriteOnce resources: requests: - storage: 1Gi + storage: 1Gi # ToDo: configurable diff --git a/src/main/resources/taiga/events-deployment.yaml b/src/main/resources/taiga/events-deployment.yaml index 652d173..9745172 100644 --- a/src/main/resources/taiga/events-deployment.yaml +++ b/src/main/resources/taiga/events-deployment.yaml @@ -23,11 +23,6 @@ spec: - name: http containerPort: 8888 env: - #- name: EVENTS_PUSH_BACKEND_URL # ToDo: check if we really need to set these URLs - # valueFrom: - # configMapKeyRef: - # name: taiga-configmap - # key: EVENTS_PUSH_BACKEND_URL - name: RABBITMQ_USER valueFrom: secretKeyRef: diff --git a/src/main/resources/taiga/events-rabbitmq-deployment.yaml b/src/main/resources/taiga/events-rabbitmq-deployment.yaml index f04eff8..768ace5 100644 --- a/src/main/resources/taiga/events-rabbitmq-deployment.yaml +++ b/src/main/resources/taiga/events-rabbitmq-deployment.yaml @@ -37,12 +37,12 @@ spec: configMapKeyRef: name: taiga-configmap key: RABBITMQ_DEFAULT_VHOST - - name: RABBITMQ_USER + - name: RABBITMQ_DEFAULT_USER valueFrom: secretKeyRef: name: taiga-secret key: RABBITMQ_USER - - name: RABBITMQ_PASS + - name: RABBITMQ_DEFAULT_PASS valueFrom: secretKeyRef: name: taiga-secret diff --git a/src/main/resources/taiga/rabbitmq-pvc.yaml b/src/main/resources/taiga/rabbitmq-pvc.yaml index 3f56a91..649256c 100644 --- a/src/main/resources/taiga/rabbitmq-pvc.yaml +++ b/src/main/resources/taiga/rabbitmq-pvc.yaml @@ -7,12 +7,12 @@ metadata: app: taiga app.kubernetes.part-of: taiga spec: - storageClassName: local-path + storageClassName: local-path # ToDo: configurable accessModes: - ReadWriteOnce resources: requests: - storage: 1Gi + storage: 1Gi # ToDo: configurable --- apiVersion: v1 kind: PersistentVolumeClaim @@ -23,9 +23,9 @@ metadata: app: taiga app.kubernetes.part-of: taiga spec: - storageClassName: local-path + storageClassName: local-path # ToDo: configurable accessModes: - ReadWriteOnce resources: requests: - storage: 1Gi + storage: 1Gi # ToDo: configurable