From 2fc3e0d54351c506e7e8356331d8d3e1d3171975 Mon Sep 17 00:00:00 2001 From: pierre Date: Tue, 2 Dec 2025 15:09:23 +0000 Subject: [PATCH] adding celery for django --- module.tf | 10 +++++----- variables.auto.tfvars | 20 +++++++++++++++++++- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/module.tf b/module.tf index a58c5f0..9b4d989 100644 --- a/module.tf +++ b/module.tf @@ -22,7 +22,7 @@ variable "kubernetes" { annotations_fileType = optional(string) existing_pvc = optional(bool, false) mount_path = string - sub_path = optional(string) + sub_path = optional(string) }))) environment = optional(map(object({ name = optional(string) @@ -82,8 +82,8 @@ locals { namespace = coalesce(value.namespace, value.connected_namespace, key) }] if value.enabled == true && value.pvc != null ]) - - # group duplicates instead of throwing an error + + # group duplicates instead of throwing an error pvc_map_grouped = { for p in local.pvc_list : p.key => p... @@ -349,7 +349,7 @@ resource "kubernetes_deployment_v1" "automatic" { content { mount_path = volume_mount.value.mount_path name = "${volume_mount.value.name}-pvc" - sub_path = volume_mount.value.sub_path != null ? volume_mount.value.sub_path : "" + sub_path = volume_mount.value.sub_path != null ? volume_mount.value.sub_path : "" } } @@ -570,7 +570,7 @@ resource "kubernetes_deployment_v1" "database-automatic" { name = "${each.key}-db-pvc" } - command = try([each.value.database.command],[]) + command = try([each.value.database.command], []) #command = [try(each.value.database.command,"")] dynamic "env" { diff --git a/variables.auto.tfvars b/variables.auto.tfvars index d63208c..d2b7348 100644 --- a/variables.auto.tfvars +++ b/variables.auto.tfvars @@ -1559,6 +1559,8 @@ kubernetes = { database = { image = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0" } + redis = {} + requirements = { limits-cpu = "800m" @@ -1630,6 +1632,22 @@ kubernetes = { } } } + celery-worker = { + #enabled = false + connected_namespace = "django" + image = "gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest" + command = ["celery","--workdir=django_code/", "-A", "django_code", "worker"] + environment = { + CELERY_BROKER_URL = { + value = "redis://django-redis-svc:6379" + } + CELERY_IMPORTS = { + value = "stash_management.apps" } + } + PYTHONPATH = { + value = "/code/django_code/" } + } + keycloak = { enabled = false name = "keycloak" @@ -2088,7 +2106,7 @@ kubernetes = { replicas = 0 name = "bitwarden-admin" image = "bitwarden/admin:2024.5.0" - extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/config.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/uid.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/bitwarden-identity-cert-password.secret.yml","/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/identity-svc.svc.yaml"] + extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/config.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/global.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/mssql.override.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/uid.env.configmap.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/bitwarden-identity-cert-password.secret.yml", "/opt/kubernetes/Terraform_kube/external_manifests/bitwarden/identity-svc.svc.yaml"] service_port = [5000] config_map_ref = ["global.env", "uid.env", "global.override.env"] environment = {}