From e6fbd6d5dc10281294ded67f4c23e1f18cee7632 Mon Sep 17 00:00:00 2001 From: erik Date: Tue, 22 Aug 2023 13:12:15 +0200 Subject: [PATCH] remove -service suffix --- src/main/resources/taiga/donotapply/changes-made.md | 10 +++++++++- src/main/resources/taiga/ingress.yaml | 2 +- .../taiga/taiga-async-rabbitmq-deployment.yaml | 7 +++++-- .../resources/taiga/taiga-async-rabbitmq-service.yaml | 2 +- src/main/resources/taiga/taiga-async-service.yaml | 2 +- src/main/resources/taiga/taiga-back-service.yaml | 2 +- .../resources/taiga/taiga-events-rabbitmq-service.yaml | 2 +- src/main/resources/taiga/taiga-events-service.yaml | 2 +- src/main/resources/taiga/taiga-front-service.yaml | 2 +- src/main/resources/taiga/taiga-gateway-configmap.yaml | 10 +++++----- src/main/resources/taiga/taiga-gateway-deployment.yaml | 1 + src/main/resources/taiga/taiga-gateway-service.yaml | 2 +- src/main/resources/taiga/taiga-protected-service.yaml | 2 +- src/main/resources/taiga/taiga-rabbitmq-secret.yaml | 3 ++- src/main/resources/taiga/taiga-secret.yaml | 2 +- 15 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/main/resources/taiga/donotapply/changes-made.md b/src/main/resources/taiga/donotapply/changes-made.md index 563b6af..3578f9f 100644 --- a/src/main/resources/taiga/donotapply/changes-made.md +++ b/src/main/resources/taiga/donotapply/changes-made.md @@ -14,4 +14,12 @@ Correct reference to taiga-configmap and taiga-secret in taiga-back-deployment Remove init-container in taiga-back-deployment Update command in taiga-back-deployment to ["/taiga-back/docker/entrypoint.sh"] Update command in taiga-back-deployment to command: ["/taiga-back/docker/entrypoint.sh && python manage.py createsupersuer"] -Extend configmap in taiga-config map by values for taiga-front # we may want to check CAPITALIZATION of KW before starting work in c4k code \ No newline at end of file +Extend configmap in taiga-config map by values for taiga-front # we may want to check CAPITALIZATION of KW before starting work in c4k code +Rename taiga-async-rabbitmq-service to taiga-async-rabbitmq +Move erlang cookie to taiga-rabbitmq-secret in taiga-async-rabbitmq-deployment +Change value of RABBITMQ_DEFAULT_VHOST to taiga in taiga-async-rabbitmq-deployment +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 diff --git a/src/main/resources/taiga/ingress.yaml b/src/main/resources/taiga/ingress.yaml index 31b7fe4..4a563ac 100644 --- a/src/main/resources/taiga/ingress.yaml +++ b/src/main/resources/taiga/ingress.yaml @@ -22,6 +22,6 @@ spec: path: "/" backend: service: - name: taiga-gateway-service + name: taiga-gateway port: number: 80 diff --git a/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml b/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml index 0a3cb2d..d651a3c 100644 --- a/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml +++ b/src/main/resources/taiga/taiga-async-rabbitmq-deployment.yaml @@ -38,9 +38,12 @@ spec: name: taiga-rabbitmq-secret key: RABBITMQ_DEFAULT_PASS - name: RABBITMQ_ERLANG_COOKIE - value: ERLANG_COOKIE_VALUE + valueFrom: + secretKeyRef: + name: taiga-rabbitmq-secret + key: RABBITMQ_ERLANG_COOKIE - name: RABBITMQ_DEFAULT_VHOST - value: RABBITMQ_VHOST + value: taiga volumes: - name: taiga-async-rabbitmq-data diff --git a/src/main/resources/taiga/taiga-async-rabbitmq-service.yaml b/src/main/resources/taiga/taiga-async-rabbitmq-service.yaml index f62ce44..0844391 100644 --- a/src/main/resources/taiga/taiga-async-rabbitmq-service.yaml +++ b/src/main/resources/taiga/taiga-async-rabbitmq-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-async-rabbitmq-service + name: taiga-async-rabbitmq labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-async-rabbitmq diff --git a/src/main/resources/taiga/taiga-async-service.yaml b/src/main/resources/taiga/taiga-async-service.yaml index e349899..b9176af 100644 --- a/src/main/resources/taiga/taiga-async-service.yaml +++ b/src/main/resources/taiga/taiga-async-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-async-service + name: taiga-async labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-async diff --git a/src/main/resources/taiga/taiga-back-service.yaml b/src/main/resources/taiga/taiga-back-service.yaml index 0d1ca19..369ed4a 100644 --- a/src/main/resources/taiga/taiga-back-service.yaml +++ b/src/main/resources/taiga/taiga-back-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-back-service + name: taiga-back labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-back diff --git a/src/main/resources/taiga/taiga-events-rabbitmq-service.yaml b/src/main/resources/taiga/taiga-events-rabbitmq-service.yaml index 6d0662c..2f542fc 100644 --- a/src/main/resources/taiga/taiga-events-rabbitmq-service.yaml +++ b/src/main/resources/taiga/taiga-events-rabbitmq-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-events-rabbitmq-service + name: taiga-events-rabbitmq labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-events-rabbitmq diff --git a/src/main/resources/taiga/taiga-events-service.yaml b/src/main/resources/taiga/taiga-events-service.yaml index 3d448b0..4ec0f51 100644 --- a/src/main/resources/taiga/taiga-events-service.yaml +++ b/src/main/resources/taiga/taiga-events-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-events-service + name: taiga-events labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-events diff --git a/src/main/resources/taiga/taiga-front-service.yaml b/src/main/resources/taiga/taiga-front-service.yaml index 6e857bb..d586429 100644 --- a/src/main/resources/taiga/taiga-front-service.yaml +++ b/src/main/resources/taiga/taiga-front-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-front-service + name: taiga-front labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-front diff --git a/src/main/resources/taiga/taiga-gateway-configmap.yaml b/src/main/resources/taiga/taiga-gateway-configmap.yaml index 283d7c2..7ae184d 100644 --- a/src/main/resources/taiga/taiga-gateway-configmap.yaml +++ b/src/main/resources/taiga/taiga-gateway-configmap.yaml @@ -12,7 +12,7 @@ data: # Frontend location / { - proxy_pass http://taiga-front-service/; + proxy_pass http://taiga-front/; proxy_pass_header Server; proxy_set_header Host $http_host; proxy_redirect off; @@ -22,7 +22,7 @@ data: # Api location /api { - proxy_pass http://taiga-back-service:8000/api; + proxy_pass http://taiga-back:8000/api; proxy_pass_header Server; proxy_set_header Host $http_host; proxy_redirect off; @@ -32,7 +32,7 @@ data: # Admin location /admin { - proxy_pass http://taiga-back-service:8000/admin; + proxy_pass http://taiga-back:8000/admin; proxy_pass_header Server; proxy_set_header Host $http_host; proxy_redirect off; @@ -64,13 +64,13 @@ data: proxy_set_header X-Scheme $scheme; proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_pass http://taiga-protected-service:8003/; + proxy_pass http://taiga-protected:8003/; proxy_redirect off; } # Events location /events { - proxy_pass http://taiga-events-service:8888/events; + proxy_pass http://taiga-events:8888/events; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; diff --git a/src/main/resources/taiga/taiga-gateway-deployment.yaml b/src/main/resources/taiga/taiga-gateway-deployment.yaml index dd9ab83..a3d4b49 100644 --- a/src/main/resources/taiga/taiga-gateway-deployment.yaml +++ b/src/main/resources/taiga/taiga-gateway-deployment.yaml @@ -26,6 +26,7 @@ spec: volumeMounts: - name: taiga-gateway-configmap mountPath: /etc/nginx/conf.d + readOnly: false - name: taiga-static mountPath: /taiga/static readOnly: false diff --git a/src/main/resources/taiga/taiga-gateway-service.yaml b/src/main/resources/taiga/taiga-gateway-service.yaml index cfcd524..441dedf 100644 --- a/src/main/resources/taiga/taiga-gateway-service.yaml +++ b/src/main/resources/taiga/taiga-gateway-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-gateway-service + name: taiga-gateway labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-gateway diff --git a/src/main/resources/taiga/taiga-protected-service.yaml b/src/main/resources/taiga/taiga-protected-service.yaml index d84f539..268d444 100644 --- a/src/main/resources/taiga/taiga-protected-service.yaml +++ b/src/main/resources/taiga/taiga-protected-service.yaml @@ -1,7 +1,7 @@ kind: Service apiVersion: v1 metadata: - name: taiga-protected-service + name: taiga-protected labels: app.kubernetes.part-of: c4k-taiga app.kubernetes.io/component: taiga-protected diff --git a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml index 359ac2b..d72223d 100644 --- a/src/main/resources/taiga/taiga-rabbitmq-secret.yaml +++ b/src/main/resources/taiga/taiga-rabbitmq-secret.yaml @@ -6,5 +6,6 @@ metadata: app.kubernetes.part-of: taiga data: # Rabbitmq settings - RABBITMQ_DEFAULT_USER: cmFiYml0 # ToDo: Evaluate if we need two different users and passes for rabbitmq + 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 a3968f7..3f55a79 100644 --- a/src/main/resources/taiga/taiga-secret.yaml +++ b/src/main/resources/taiga/taiga-secret.yaml @@ -14,7 +14,7 @@ data: EMAIL_HOST_PASSWORD: YXNkZmFzZGY= # Rabbitmq settings - RABBITMQ_USER: cmFiYml0 + RABBITMQ_USER: dGFpZ2E= RABBITMQ_PASS: cmFiYml0X3Bhc3M= # Django settings