fix
This commit is contained in:
@@ -26,7 +26,6 @@ resource "kubectl_manifest" "cm_env_back" {
|
|||||||
ENABLE_JIRA_IMPORTER: "False"
|
ENABLE_JIRA_IMPORTER: "False"
|
||||||
ENABLE_TRELLO_IMPORTER: "False"
|
ENABLE_TRELLO_IMPORTER: "False"
|
||||||
OPENID_CONNECT_SCOPES: "openid email profile"
|
OPENID_CONNECT_SCOPES: "openid email profile"
|
||||||
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,6 +78,11 @@ resource "kubectl_manifest" "cm_env_front" {
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# awk '/taiga-events-rabbitmq/||/taiga-async-rabbitmq/' < /taiga-back/settings/config.py
|
||||||
|
# EVENTS_PUSH_BACKEND_URL = f"amqp://{ os.getenv('RABBITMQ_USER') }:{ os.getenv('RABBITMQ_PASS') }@taiga-events-rabbitmq:5672/taiga"
|
||||||
|
# CELERY_BROKER_URL = f"amqp://{ os.getenv('RABBITMQ_USER') }:{ os.getenv('RABBITMQ_PASS') }@taiga-async-rabbitmq:5672/taiga"
|
||||||
|
|
||||||
|
|
||||||
resource "kubectl_manifest" "cm_scripts" {
|
resource "kubectl_manifest" "cm_scripts" {
|
||||||
yaml_body = <<-EOF
|
yaml_body = <<-EOF
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
@@ -88,6 +92,32 @@ resource "kubectl_manifest" "cm_scripts" {
|
|||||||
labels: ${jsonencode(local.postcfg_all_labels)}
|
labels: ${jsonencode(local.postcfg_all_labels)}
|
||||||
namespace: ${var.namespace}
|
namespace: ${var.namespace}
|
||||||
data:
|
data:
|
||||||
|
back_entrypoint.sh: |-
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
python manage.py migrate
|
||||||
|
python manage.py loaddata initial_project_templates
|
||||||
|
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
|
||||||
|
echo Starting Taiga API...
|
||||||
|
exec gosu taiga gunicorn taiga.wsgi:application \
|
||||||
|
--name taiga_api \
|
||||||
|
--bind 0.0.0.0:8000 \
|
||||||
|
--workers 3 \
|
||||||
|
--worker-tmp-dir /dev/shm \
|
||||||
|
--log-level=info \
|
||||||
|
--access-logfile - \
|
||||||
|
"$@"
|
||||||
|
async_entrypoint.sh: |-
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
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
|
||||||
|
echo Starting Celery...
|
||||||
|
exec gosu taiga celery -A taiga.celery worker -B \
|
||||||
|
--concurrency 4 \
|
||||||
|
-l INFO \
|
||||||
|
"$@"
|
||||||
postconfig.py: |-
|
postconfig.py: |-
|
||||||
#!/usr/bin/env python
|
#!/usr/bin/env python
|
||||||
import time
|
import time
|
||||||
|
|||||||
@@ -82,24 +82,6 @@ resource "kubectl_manifest" "Deployment_taiga-events" {
|
|||||||
path: env.template
|
path: env.template
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
# livenessProbe:
|
|
||||||
# httpGet:
|
|
||||||
# path: /admin/login/
|
|
||||||
# port: 8000
|
|
||||||
# initialDelaySeconds: 20
|
|
||||||
# periodSeconds: 10
|
|
||||||
# timeoutSeconds: 5
|
|
||||||
# successThreshold: 1
|
|
||||||
# failureThreshold: 3
|
|
||||||
# readinessProbe:
|
|
||||||
# httpGet:
|
|
||||||
# path: /admin/login/
|
|
||||||
# port: 8000
|
|
||||||
# initialDelaySeconds: 5
|
|
||||||
# periodSeconds: 10
|
|
||||||
# timeoutSeconds: 1
|
|
||||||
# successThreshold: 1
|
|
||||||
# failureThreshold: 3
|
|
||||||
|
|
||||||
resource "kubectl_manifest" "Deployment_taiga-front" {
|
resource "kubectl_manifest" "Deployment_taiga-front" {
|
||||||
yaml_body = <<-EOF
|
yaml_body = <<-EOF
|
||||||
@@ -123,7 +105,10 @@ resource "kubectl_manifest" "Deployment_taiga-front" {
|
|||||||
imagePullPolicy: ${var.images.front.pull_policy}
|
imagePullPolicy: ${var.images.front.pull_policy}
|
||||||
env:
|
env:
|
||||||
- name: GITLAB_CLIENT_ID
|
- name: GITLAB_CLIENT_ID
|
||||||
value: gitlab-api-client-id
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: ${module.oauth2.secret_client_id_name}
|
||||||
|
key: ${module.oauth2.secret_client_id_key}
|
||||||
envFrom:
|
envFrom:
|
||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: ${kubectl_manifest.cm_env_front.name}
|
name: ${kubectl_manifest.cm_env_front.name}
|
||||||
@@ -177,6 +162,10 @@ resource "kubectl_manifest" "Deployment_taiga-protected" {
|
|||||||
ports:
|
ports:
|
||||||
- name: taiga-protected
|
- name: taiga-protected
|
||||||
containerPort: 8003
|
containerPort: 8003
|
||||||
|
livenessProbe:
|
||||||
|
initialDelaySeconds: 10
|
||||||
|
exec:
|
||||||
|
command: ["/bin/sh", "-c", "pidof -x gunicorn"]
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -200,6 +189,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
- name: taiga-back
|
- name: taiga-back
|
||||||
image: "${var.images.back.registry}/${var.images.back.repository}:${var.images.back.tag}"
|
image: "${var.images.back.registry}/${var.images.back.repository}:${var.images.back.tag}"
|
||||||
imagePullPolicy: ${var.images.back.pull_policy}
|
imagePullPolicy: ${var.images.back.pull_policy}
|
||||||
|
command: ["/bin/back_entrypoint.sh"]
|
||||||
env:
|
env:
|
||||||
- name: TAIGA_EVENTS_RABBITMQ_HOST
|
- name: TAIGA_EVENTS_RABBITMQ_HOST
|
||||||
value: ${kubectl_manifest.rabbit.name}
|
value: ${kubectl_manifest.rabbit.name}
|
||||||
@@ -216,9 +206,15 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
name: ${kubectl_manifest.rabbit_user_secret.name}
|
name: ${kubectl_manifest.rabbit_user_secret.name}
|
||||||
key: password
|
key: password
|
||||||
- name: GITLAB_API_CLIENT_ID
|
- name: GITLAB_API_CLIENT_ID
|
||||||
value: gitlab-api-client-id
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: ${module.oauth2.secret_client_id_name}
|
||||||
|
key: ${module.oauth2.secret_client_id_key}
|
||||||
- name: GITLAB_API_CLIENT_SECRET
|
- name: GITLAB_API_CLIENT_SECRET
|
||||||
value: gitlab-api-client-secret
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: ${module.oauth2.secret_client_secret_name}
|
||||||
|
key: ${module.oauth2.secret_client_secret_key}
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
@@ -233,6 +229,9 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
- name: taiga-back
|
- name: taiga-back
|
||||||
containerPort: 8000
|
containerPort: 8000
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- name: scripts
|
||||||
|
mountPath: /bin/back_entrypoint.sh
|
||||||
|
subPath: back_entrypoint.sh
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /taiga-back/static
|
mountPath: /taiga-back/static
|
||||||
subPath: static
|
subPath: static
|
||||||
@@ -260,8 +259,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
- name: taiga-async
|
- name: taiga-async
|
||||||
image: "${var.images.back.registry}/${var.images.back.repository}:${var.images.back.tag}"
|
image: "${var.images.back.registry}/${var.images.back.repository}:${var.images.back.tag}"
|
||||||
imagePullPolicy: ${var.images.back.pull_policy}
|
imagePullPolicy: ${var.images.back.pull_policy}
|
||||||
command:
|
command: ["/bin/async_entrypoint.sh"]
|
||||||
- /taiga-back/docker/async_entrypoint.sh
|
|
||||||
env:
|
env:
|
||||||
- name: RABBITMQ_USER
|
- name: RABBITMQ_USER
|
||||||
valueFrom:
|
valueFrom:
|
||||||
@@ -284,6 +282,9 @@ resource "kubectl_manifest" "Deployment_taiga-back" {
|
|||||||
- configMapRef:
|
- configMapRef:
|
||||||
name: ${kubectl_manifest.cm_env_back.name}
|
name: ${kubectl_manifest.cm_env_back.name}
|
||||||
volumeMounts:
|
volumeMounts:
|
||||||
|
- name: scripts
|
||||||
|
mountPath: /bin/async_entrypoint.sh
|
||||||
|
subPath: async_entrypoint.sh
|
||||||
- name: data
|
- name: data
|
||||||
mountPath: /taiga-back/static
|
mountPath: /taiga-back/static
|
||||||
subPath: static
|
subPath: static
|
||||||
@@ -306,6 +307,15 @@ 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: scripts
|
||||||
|
configMap:
|
||||||
|
name: ${kubectl_manifest.cm_scripts.name}
|
||||||
|
defaultMode: 0755
|
||||||
|
items:
|
||||||
|
- key: back_entrypoint.sh
|
||||||
|
path: back_entrypoint.sh
|
||||||
|
- key: async_entrypoint.sh
|
||||||
|
path: async_entrypoint.sh
|
||||||
- name: data
|
- name: data
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: ${kubectl_manifest.pvc.name}
|
claimName: ${kubectl_manifest.pvc.name}
|
||||||
|
|||||||
Reference in New Issue
Block a user