vynil/domain-incoming
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-05-27 13:38:35 +02:00
parent 1fe6463056
commit b0ae1a723a
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/taiga/taiga_ConfigMap.tf
View File

@@ -98,6 +98,10 @@ resource "kubectl_manifest" "cm_scripts" {
set -euo pipefail set -euo pipefail
python manage.py migrate python manage.py migrate
python manage.py loaddata initial_project_templates python manage.py loaddata initial_project_templates
if [ -f /etc/local-ca/ca.crt ];then
cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/
/usr/sbin/update-ca-certificates
fi
chown -R taiga:taiga /taiga-back chown -R taiga:taiga /taiga-back
sed -i "s/taiga-events-rabbitmq/{ os.getenv('TAIGA_EVENTS_RABBITMQ_HOST') }/;s/taiga-async-rabbitmq/{ os.getenv('TAIGA_ASYNC_RABBITMQ_HOST') }/" /taiga-back/settings/config.py sed -i "s/taiga-events-rabbitmq/{ os.getenv('TAIGA_EVENTS_RABBITMQ_HOST') }/;s/taiga-async-rabbitmq/{ os.getenv('TAIGA_ASYNC_RABBITMQ_HOST') }/" /taiga-back/settings/config.py
echo Starting Taiga API... echo Starting Taiga API...
@@ -113,6 +117,10 @@ resource "kubectl_manifest" "cm_scripts" {
#!/usr/bin/env bash #!/usr/bin/env bash
set -euo pipefail set -euo pipefail
chown -R taiga:taiga /taiga-back chown -R taiga:taiga /taiga-back
if [ -f /etc/local-ca/ca.crt ];then
cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/
/usr/sbin/update-ca-certificates
fi
sed -i "s/taiga-events-rabbitmq/{ os.getenv('TAIGA_EVENTS_RABBITMQ_HOST') }/;s/taiga-async-rabbitmq/{ os.getenv('TAIGA_ASYNC_RABBITMQ_HOST') }/" /taiga-back/settings/config.py sed -i "s/taiga-events-rabbitmq/{ os.getenv('TAIGA_EVENTS_RABBITMQ_HOST') }/;s/taiga-async-rabbitmq/{ os.getenv('TAIGA_ASYNC_RABBITMQ_HOST') }/" /taiga-back/settings/config.py
echo Starting Celery... echo Starting Celery...
exec gosu taiga celery -A taiga.celery worker -B \ exec gosu taiga celery -A taiga.celery worker -B \

11
apps/taiga/taiga_workload.tf
View File

@@ -187,7 +187,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
namespace: ${var.namespace} namespace: ${var.namespace}
annotations: annotations:
configmap.reloader.stakater.com/reload: "${kubectl_manifest.cm_env_back.name},${kubectl_manifest.cm_scripts.name},${kubectl_manifest.cm_nginx.name}" configmap.reloader.stakater.com/reload: "${kubectl_manifest.cm_env_back.name},${kubectl_manifest.cm_scripts.name},${kubectl_manifest.cm_nginx.name}"
secret.reloader.stakater.com/reload: "${kubectl_manifest.rabbit_user_secret.name},${module.oauth2.secret_client_id_name},${var.instance}-${var.component}-pg-app,${kubectl_manifest.secret.name}" secret.reloader.stakater.com/reload: "${kubectl_manifest.rabbit_user_secret.name},${module.oauth2.secret_client_id_name},${module.ingress.secret_name},${var.instance}-${var.component}-pg-app,${kubectl_manifest.secret.name}"
spec: spec:
selector: selector:
matchLabels: ${jsonencode(local.back_labels)} matchLabels: ${jsonencode(local.back_labels)}
@@ -249,6 +249,9 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
- name: data - name: data
mountPath: /taiga-back/media mountPath: /taiga-back/media
subPath: media subPath: media
- name: certs
mountPath: /etc/local-ca
readOnly: true
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/v1/ path: /api/v1/
@@ -302,6 +305,8 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
- name: data - name: data
mountPath: /taiga-back/media mountPath: /taiga-back/media
subPath: media subPath: media
- name: certs
mountPath: /opt/certs
- name: nginx - name: nginx
image: "${var.images.nginx.registry}/${var.images.nginx.repository}:${var.images.nginx.tag}" image: "${var.images.nginx.registry}/${var.images.nginx.repository}:${var.images.nginx.tag}"
imagePullPolicy: ${var.images.nginx.pull_policy} imagePullPolicy: ${var.images.nginx.pull_policy}
@@ -318,6 +323,10 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
- name: taiga-conf - name: taiga-conf
mountPath: /etc/nginx/conf.d/ mountPath: /etc/nginx/conf.d/
volumes: volumes:
- name: certs
secret:
secretName: "${module.ingress.secret_name}"
defaultMode: 0444
- name: scripts - name: scripts
configMap: configMap:
name: ${kubectl_manifest.cm_scripts.name} name: ${kubectl_manifest.cm_scripts.name}