From 152b2ce46ec501128913ddd33d83a16bf7b37233 Mon Sep 17 00:00:00 2001 From: erik Date: Wed, 16 Aug 2023 14:51:23 +0200 Subject: [PATCH] Add values, flatten folder structure --- .../taiga/{ingress => }/certificate.yaml | 4 ++-- .../taiga/{postgres => }/config-8gb.yaml | 0 .../taiga/{postgres => }/deployment.yaml | 0 .../taiga/{ingress => }/ingress.yaml | 6 +++--- .../resources/taiga/ingress/host-rule.yaml | 10 ---------- .../{postgres => }/persistent-volume.yaml | 0 .../resources/taiga/{postgres => }/pvc.yaml | 4 ++-- .../taiga/{postgres => }/secret.yaml | 0 .../taiga/{postgres => }/service.yaml | 0 src/main/resources/taiga/taiga-configmap.yaml | 20 +++++++++---------- src/main/resources/taiga/taiga-data-pvcs.yaml | 4 ++-- .../taiga/taiga-events-deployment.yaml | 10 +++++----- .../taiga-events-rabbitmq-deployment.yaml | 4 ++-- .../taiga/taiga-front-deployment.yaml | 6 +++--- .../taiga/taiga-protected-deployment.yaml | 2 +- .../resources/taiga/taiga-rabbitmq-pvc.yaml | 4 ++-- .../taiga/taiga-rabbitmq-secret.yaml | 4 ++-- src/main/resources/taiga/taiga-secret.yaml | 14 ++++++------- 18 files changed, 41 insertions(+), 51 deletions(-) rename src/main/resources/taiga/{ingress => }/certificate.yaml (83%) rename src/main/resources/taiga/{postgres => }/config-8gb.yaml (100%) rename src/main/resources/taiga/{postgres => }/deployment.yaml (100%) rename src/main/resources/taiga/{ingress => }/ingress.yaml (85%) delete mode 100644 src/main/resources/taiga/ingress/host-rule.yaml rename src/main/resources/taiga/{postgres => }/persistent-volume.yaml (100%) rename src/main/resources/taiga/{postgres => }/pvc.yaml (76%) rename src/main/resources/taiga/{postgres => }/secret.yaml (100%) rename src/main/resources/taiga/{postgres => }/service.yaml (100%) diff --git a/src/main/resources/taiga/ingress/certificate.yaml b/src/main/resources/taiga/certificate.yaml similarity index 83% rename from src/main/resources/taiga/ingress/certificate.yaml rename to src/main/resources/taiga/certificate.yaml index 6cb4008..3fc00e3 100644 --- a/src/main/resources/taiga/ingress/certificate.yaml +++ b/src/main/resources/taiga/certificate.yaml @@ -7,11 +7,11 @@ metadata: namespace: default spec: secretName: c4k-common-cert - commonName: FQDN + commonName: jitsi.test.meissa.de duration: 2160h # 90d renewBefore: 720h # 30d dnsNames: - - FQDN + - jitsi.test.meissa.de issuerRef: name: staging kind: ClusterIssuer diff --git a/src/main/resources/taiga/postgres/config-8gb.yaml b/src/main/resources/taiga/config-8gb.yaml similarity index 100% rename from src/main/resources/taiga/postgres/config-8gb.yaml rename to src/main/resources/taiga/config-8gb.yaml diff --git a/src/main/resources/taiga/postgres/deployment.yaml b/src/main/resources/taiga/deployment.yaml similarity index 100% rename from src/main/resources/taiga/postgres/deployment.yaml rename to src/main/resources/taiga/deployment.yaml diff --git a/src/main/resources/taiga/ingress/ingress.yaml b/src/main/resources/taiga/ingress.yaml similarity index 85% rename from src/main/resources/taiga/ingress/ingress.yaml rename to src/main/resources/taiga/ingress.yaml index c958fca..0133b07 100644 --- a/src/main/resources/taiga/ingress/ingress.yaml +++ b/src/main/resources/taiga/ingress.yaml @@ -12,16 +12,16 @@ metadata: spec: tls: - hosts: - - FQDN + - jitsi.test.meissa.de secretName: c4k-common-cert rules: - - host: FQDN + - host: jitsi.test.meissa.de http: paths: - pathType: Prefix path: "/" backend: service: - name: SERVICE_NAME + name: taiga-gateway-service port: number: 80 diff --git a/src/main/resources/taiga/ingress/host-rule.yaml b/src/main/resources/taiga/ingress/host-rule.yaml deleted file mode 100644 index 73d0e9f..0000000 --- a/src/main/resources/taiga/ingress/host-rule.yaml +++ /dev/null @@ -1,10 +0,0 @@ -host: FQDN -http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: SERVICE_NAME - port: - number: SERVICE_PORT diff --git a/src/main/resources/taiga/postgres/persistent-volume.yaml b/src/main/resources/taiga/persistent-volume.yaml similarity index 100% rename from src/main/resources/taiga/postgres/persistent-volume.yaml rename to src/main/resources/taiga/persistent-volume.yaml diff --git a/src/main/resources/taiga/postgres/pvc.yaml b/src/main/resources/taiga/pvc.yaml similarity index 76% rename from src/main/resources/taiga/postgres/pvc.yaml rename to src/main/resources/taiga/pvc.yaml index 7d94bd1..785d8f9 100644 --- a/src/main/resources/taiga/postgres/pvc.yaml +++ b/src/main/resources/taiga/pvc.yaml @@ -5,9 +5,9 @@ metadata: labels: app: postgres spec: - storageClassName: REPLACEME + storageClassName: postgres accessModes: - ReadWriteOnce resources: requests: - storage: REPLACEME \ No newline at end of file + storage: postgres \ No newline at end of file diff --git a/src/main/resources/taiga/postgres/secret.yaml b/src/main/resources/taiga/secret.yaml similarity index 100% rename from src/main/resources/taiga/postgres/secret.yaml rename to src/main/resources/taiga/secret.yaml diff --git a/src/main/resources/taiga/postgres/service.yaml b/src/main/resources/taiga/service.yaml similarity index 100% rename from src/main/resources/taiga/postgres/service.yaml rename to src/main/resources/taiga/service.yaml diff --git a/src/main/resources/taiga/taiga-configmap.yaml b/src/main/resources/taiga/taiga-configmap.yaml index 696cbff..8f97784 100644 --- a/src/main/resources/taiga/taiga-configmap.yaml +++ b/src/main/resources/taiga/taiga-configmap.yaml @@ -8,20 +8,20 @@ data: # Database settings handled in deployment # Taiga settings - TAIGA_SITES_SCHEME: TAIGA_SCHEME - TAIGA_SITES_DOMAIN: TAIGA_DOMAIN - TAIGA_SUBPATH: SUBPATH + TAIGA_SITES_SCHEME: https + TAIGA_SITES_DOMAIN: jitsi.test.meissa.de + TAIGA_SUBPATH: "" # Email settings. - EMAIL_BACKEND: EMAIL_BACKEND # django.core.mail.backends.${EMAIL_BACKEND}.EmailBackend # ToDo move to code base - DEFAULT_FROM_EMAIL: DEFAULT_FROM_EMAIL_VALUE - EMAIL_USE_TLS: EMAIL_USE_TLS_VALUE - EMAIL_USE_SSL: EMAIL_USE_SSL_VALUE - EMAIL_HOST: EMAIL_HOST_VALUE - EMAIL_PORT: EMAIL_PORT_VALUE + EMAIL_BACKEND: console # django.core.mail.backends.${EMAIL_BACKEND}.EmailBackend # ToDo move to code base + DEFAULT_FROM_EMAIL: meissa@meissa.de + EMAIL_USE_TLS: false + EMAIL_USE_SSL: false + EMAIL_HOST: smpt.meissa.de + EMAIL_PORT: 39 # Telemetry settings - ENABLE_TELEMETRY: ENABLE_TELEMETRY_VALUE + ENABLE_TELEMETRY: false # ...your customizations go here # Taiga Events Settings diff --git a/src/main/resources/taiga/taiga-data-pvcs.yaml b/src/main/resources/taiga/taiga-data-pvcs.yaml index c9adf34..cd51a7d 100644 --- a/src/main/resources/taiga/taiga-data-pvcs.yaml +++ b/src/main/resources/taiga/taiga-data-pvcs.yaml @@ -12,7 +12,7 @@ spec: - ReadWriteOnce resources: requests: - storage: TAIGA_MEDIA_DATA_STORAGE_SIZE + storage: 1Gi --- apiVersion: v1 kind: PersistentVolumeClaim @@ -28,4 +28,4 @@ spec: - ReadWriteOnce resources: requests: - storage: TAIGA_STATIC_DATA_STORAGE_SIZE + storage: 1Gi diff --git a/src/main/resources/taiga/taiga-events-deployment.yaml b/src/main/resources/taiga/taiga-events-deployment.yaml index 08f15a0..652d173 100644 --- a/src/main/resources/taiga/taiga-events-deployment.yaml +++ b/src/main/resources/taiga/taiga-events-deployment.yaml @@ -23,11 +23,11 @@ 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: 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/taiga-events-rabbitmq-deployment.yaml b/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml index e142073..01c640d 100644 --- a/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml +++ b/src/main/resources/taiga/taiga-events-rabbitmq-deployment.yaml @@ -28,9 +28,9 @@ spec: readOnly: false env: - name: RABBITMQ_ERLANG_COOKIE - value: ERLANG_COOKIE_VALUE + value: erlang-cookie-name - name: RABBITMQ_DEFAULT_VHOST - value: RABBITMQ_VHOST + value: taiga - name: RABBITMQ_USER valueFrom: secretKeyRef: diff --git a/src/main/resources/taiga/taiga-front-deployment.yaml b/src/main/resources/taiga/taiga-front-deployment.yaml index 738df74..9dbb527 100644 --- a/src/main/resources/taiga/taiga-front-deployment.yaml +++ b/src/main/resources/taiga/taiga-front-deployment.yaml @@ -24,8 +24,8 @@ spec: containerPort: 80 env: - name: TAIGA_URL - value: TAGA_SCHEME://TAIGA_DOMAIN + value: https://jitsi.test.meissa.de - name: TAIGA_WEBSOCKETS_URL - value: WEBSOCKETS_SCHEME://TAIGA_DOMAIN + value: https://jitsi.test.meissa.de - name: TAIGA_SUBPATH - value: SUBPATH + value: "" diff --git a/src/main/resources/taiga/taiga-protected-deployment.yaml b/src/main/resources/taiga/taiga-protected-deployment.yaml index 3f78384..e660671 100644 --- a/src/main/resources/taiga/taiga-protected-deployment.yaml +++ b/src/main/resources/taiga/taiga-protected-deployment.yaml @@ -24,7 +24,7 @@ spec: containerPort: 8003 env: - name: MAX_AGE - value: ATTACHMENTS_MAX_AGE + value: 5 - name: SECRET_KEY valueFrom: secretKeyRef: diff --git a/src/main/resources/taiga/taiga-rabbitmq-pvc.yaml b/src/main/resources/taiga/taiga-rabbitmq-pvc.yaml index 58f2b3e..3f56a91 100644 --- a/src/main/resources/taiga/taiga-rabbitmq-pvc.yaml +++ b/src/main/resources/taiga/taiga-rabbitmq-pvc.yaml @@ -12,7 +12,7 @@ spec: - ReadWriteOnce resources: requests: - storage: TAIGA_RABBITMQ_DATA_STORAGE_SIZE + storage: 1Gi --- apiVersion: v1 kind: PersistentVolumeClaim @@ -28,4 +28,4 @@ spec: - ReadWriteOnce resources: requests: - storage: TAIGA_RABBITMQ_DATA_STORAGE_SIZE + storage: 1Gi diff --git a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml index 79a6286..2f13a86 100644 --- a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml +++ b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml @@ -6,5 +6,5 @@ metadata: app.kubernetes.part-of: taiga data: # Rabbitmq settings - RABBITMQ_DEFAULT_USER: RABBITMQ_USER_VALUE # ToDo: Evaluate if we need two different users and passes for rabbitmq - RABBITMQ_DEFAULT_PASS: RABBITMQ_PASS_VALUE + RABBITMQ_DEFAULT_USER: rabbit # ToDo: Evaluate if we need two different users and passes for rabbitmq + RABBITMQ_DEFAULT_PASS: rabbit_pass diff --git a/src/main/resources/taiga/taiga-secret.yaml b/src/main/resources/taiga/taiga-secret.yaml index 08fd205..92ff7d3 100644 --- a/src/main/resources/taiga/taiga-secret.yaml +++ b/src/main/resources/taiga/taiga-secret.yaml @@ -7,16 +7,16 @@ metadata: data: # Taiga settings - TAIGA_SECRET_KEY: SECRET_KEY_VALUE + TAIGA_SECRET_KEY: 59dsfgjsdf4jq3ßdfej345 # Email settings - EMAIL_HOST_USER: EMAIL_HOST_USER_VALUE - EMAIL_HOST_PASSWORD: EMAIL_HOST_USER_PASS + EMAIL_HOST_USER: meissa@meissa.de + EMAIL_HOST_PASSWORD: asdfasdf # Rabbitmq settings - RABBITMQ_USER: RABBITMQ_USER_VALUE - RABBITMQ_PASS: RABBITMQ_PASS_VALUE + RABBITMQ_USER: rabbit + RABBITMQ_PASS: rabbit_pass # Django settings - DJANGO_SUPERUSER_TAIGAADMIN: TAIGA_ADMIN - DJANGO_SUPERUSER_PASSWORD: TAIGA_ADMIN_PASS + DJANGO_SUPERUSER_TAIGAADMIN: taiga + DJANGO_SUPERUSER_PASSWORD: taiga_pass