diff --git a/apps/taiga/taiga_ConfigMap.tf b/apps/taiga/taiga_ConfigMap.tf index eb813c2..f6cc10a 100644 --- a/apps/taiga/taiga_ConfigMap.tf +++ b/apps/taiga/taiga_ConfigMap.tf @@ -39,6 +39,11 @@ resource "kubectl_manifest" "cm_events" { labels: ${jsonencode(local.common_labels)} namespace: ${var.namespace} data: + start.sh: |- + #!/bin/sh + envsubst < /var/lib/env.template > /taiga-events/.env + chown -R taiga:taiga /taiga-events + exec su-exec taiga npm run start:production env.template: |- RABBITMQ_URL="amqp://$${RABBITMQ_USER}:$${RABBITMQ_PASS}@$${TAIGA_EVENTS_RABBITMQ_HOST}:5672/taiga" SECRET="$${TAIGA_SECRET_KEY}" diff --git a/apps/taiga/taiga_workload.tf b/apps/taiga/taiga_workload.tf index 3f6af9c..95331d9 100644 --- a/apps/taiga/taiga_workload.tf +++ b/apps/taiga/taiga_workload.tf @@ -18,6 +18,7 @@ resource "kubectl_manifest" "Deployment_taiga-events" { - name: taiga-events image: "${var.images.events.registry}/${var.images.events.repository}:${var.images.events.tag}" imagePullPolicy: ${var.images.events.pull_policy} + command: ["/bin/start.sh"] envFrom: - secretRef: name: ${kubectl_manifest.secret.name} @@ -59,12 +60,26 @@ resource "kubectl_manifest" "Deployment_taiga-events" { failureThreshold: 3 volumeMounts: - name: files - mountPath: /taiga-events/docker/env.template + mountPath: /var/lib/env.template subPath: env.template + - name: scripts + mountPath: /bin/start.sh + subPath: start.sh volumes: + - name: scripts + configMap: + name: ${kubectl_manifest.cm_events.name} + defaultMode: 0755 + items: + - key: start.sh + path: start.sh - name: files configMap: name: ${kubectl_manifest.cm_events.name} + defaultMode: 0644 + items: + - key: env.template + path: env.template EOF } # livenessProbe: