remove -service suffix

This commit is contained in:
erik 2023-08-22 13:12:15 +02:00
parent 068694e57a
commit e6fbd6d5dc
15 changed files with 32 additions and 19 deletions

View file

@ -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
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

View file

@ -22,6 +22,6 @@ spec:
path: "/"
backend:
service:
name: taiga-gateway-service
name: taiga-gateway
port:
number: 80

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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";

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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=

View file

@ -14,7 +14,7 @@ data:
EMAIL_HOST_PASSWORD: YXNkZmFzZGY=
# Rabbitmq settings
RABBITMQ_USER: cmFiYml0
RABBITMQ_USER: dGFpZ2E=
RABBITMQ_PASS: cmFiYml0X3Bhc3M=
# Django settings