From 7e8e229a6388924e532f42bac4aafd868d75cdb9 Mon Sep 17 00:00:00 2001 From: pierre Date: Mon, 29 Jun 2026 10:52:38 +0100 Subject: [PATCH] adding files --- module.tf | 2 +- variables.auto.tfvars | 183 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 174 insertions(+), 11 deletions(-) diff --git a/module.tf b/module.tf index 25afd0a..580c95c 100644 --- a/module.tf +++ b/module.tf @@ -17,7 +17,7 @@ provider "kubernetes" { provider "bitwarden-secrets" { api_url = "https://bitwarden.tryton.geeraert.eu/api" identity_url = "https://bitwarden.tryton.geeraert.eu/identity" - access_token = "0.7720f24b-4328-41ef-b70b-b419018270a3.nhBoRMSkfrlxqJVZ9W0W1g3lNFrmfI:35muVQz2mO3coR46bIZgcQ==" + access_token = "0.9f4b7c5f-e6e7-4eff-929e-b474016a2b9c.bMRELajGGb7qMuXXvzgCCJdDfxfTCS:mFDT7tHSi43KJSnkwvTSYg==" organization_id = "a6361589-badd-4bde-9cb4-af8901161c0d" } diff --git a/variables.auto.tfvars b/variables.auto.tfvars index 49566d7..fedf209 100644 --- a/variables.auto.tfvars +++ b/variables.auto.tfvars @@ -1,6 +1,6 @@ kubernetes = { bookstack = { - #enabled = false + #enabled = false replicas = 01 image = "linuxserver/bookstack:latest" service_port = [80, 443] @@ -58,6 +58,42 @@ kubernetes = { } + minecraft = { + enabled = false + image = "itzg/minecraft-server" + service_port = [25565] + service_type = "LoadBalancer" + + environment = { + EULA = { + value = "TRUE" + } + ONLINE_MODE = { + value = "FALSE" + } + VERSION = { + value = "1.21.8" + } + } + + + #requirements = { + # limits-cpu = "1000m" + # limits-memory = "1Gi" + # requests-cpu = "500m" + # requests-memory = "400Mi" + #} + pvc = { + minecraft-volume = { + name = "minecraft" + pvc_size = "1Gi" + pvc = true + mount_path = "/data" + } + } + + } + stirling = { enabled = false @@ -157,9 +193,9 @@ kubernetes = { gluetun = { # enabled = false dns_nameservers = "1.1.1.1" - replicas = 01 - image = "qmcgaw/gluetun:latest" - service_port = [8888] + replicas = 01 + image = "qmcgaw/gluetun:latest" + service_port = [8888] #extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/gluetun/gluetun-secret-netherlandNL-FREE-280.yaml"] secret_import = ["5527ba11-07e3-415b-8d1f-b3ee0154eb56", "b0d22160-d81a-4702-a3dd-b40e0168d617", "643dbe99-ace0-4ef5-8a2e-b44f014dccb0"] security_context = true @@ -1504,9 +1540,9 @@ kubernetes = { username = "django_username" mountPath = "/var/lib/postgresql/data" } - redis = {} - - + redis = {} + secret_ref = ["django-bitwarden-credentials"] + secret_import = ["9fc5a725-75f5-4bab-b595-b474017146c3"] requirements = { limits-cpu = "800m" limits-memory = "800Mi" @@ -1589,7 +1625,8 @@ kubernetes = { #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"] + command = ["celery", "--workdir=django_code/", "-A", "core", "worker"] + secret_ref = ["django-bitwarden-credentials"] pvc = { #kubeconfig-secret = { # secret = true @@ -1631,9 +1668,11 @@ kubernetes = { requests-memory = "300Mi" } extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/django/kubeconfig-testing.secret.yaml"] + secret_ref = ["django-bitwarden-credentials"] + secret_import = ["68dce7aa-8e5f-4483-9083-b474016e34fc"] environment = { ALLOWED_HOSTS = { - value = "django-testing.tryton.geeraert.eu,redirect.tryton.geeraert.eu" + value = "django-testing.tryton.geeraert.eu,redirect.tryton.geeraert.eu,redirect-testing.tryton.geeraert.eu,job-testing.tryton.geeraert.eu" } DEBUG = { value = "true" @@ -2452,7 +2491,7 @@ kubernetes = { } } overleaf = { - #enabled = false + enabled = false #image = "sharelatex/sharelatex:6.1.2" image = "tuetenk0pp/sharelatex-full:latest" replicas = 1 @@ -2626,4 +2665,128 @@ kubernetes = { } } + opencloud = { + enabled = false + replicas = 01 + image = "opencloudeu/opencloud-rolling:latest" + service_port = [9200] + #domain_name = "opencloud" + + environment = { + #IDM_CREATE_DEMO_USERS = { + # value = "false" + #} + OC_INSECURE = { + value = "true" + } + OC_DOMAIN = { + value = "https://opencloud.tryton.geeraert.eu" + } + OC_URL = { + value = "https://opencloud.tryton.geeraert.eu" + } + + INITIAL_ADMIN_PASSWORD = { + value = "admin" } + } + pvc = { + opencloud-config = { + name = "opencloud-config" + pvc = true + pvc_size = "2Gi" + mount_path = "/etc/opencloud/" + } + opencloud-data = { + name = "opencloud-data" + pvc = true + pvc_size = "2Gi" + mount_path = "/var/lib/opencloud" + } + + } + } + + owncloud = { + #enabled = false + replicas = 01 + image = "owncloud/server" + service_port = [8080] + domain_name = "owncloud" + database = { + "engine" = "mysql" + "image" = "lscr.io/linuxserver/mariadb" + "port" = 3306 + "mountPath" = "/config" + name = "owncloud" + } + redis = { + image = "redis" } + environment = { + OWNCLOUD_DOMAIN = { + value = "owncloud.tryton.geeraert.eu" + } + OWNCLOUD_TRUSTED_DOMAINS = { + value = "owncloud.tryton.geeraert.eu" + } + OWNCLOUD_DB_TYPE = { + value = "mysql" + } + OWNCLOUD_DB_NAME = { + value_from = { + secret_key_ref = { + name = "owncloud-db-terraform" + key = "DB_DATABASE_NAME" + } + } + } + OWNCLOUD_DB_USERNAME = { + value_from = { + secret_key_ref = { + name = "owncloud-db-terraform" + key = "DB_USERNAME" + } + } + } + OWNCLOUD_DB_PASSWORD = { + value_from = { + secret_key_ref = { + name = "owncloud-db-terraform" + key = "DB_PASSWORD" + } + } + } + OWNCLOUD_DB_HOST = { + value_from = { + secret_key_ref = { + name = "owncloud-db-terraform" + key = "DB_HOST" + } + } + } + OWNCLOUD_ADMIN_USERNAME = { + value = "admin" + } + OWNCLOUD_ADMIN_PASSWORD = { + value = "admin" + } + OWNCLOUD_MYSQL_UTF8MB4 = { + value = true + } + OWNCLOUD_REDIS_ENABLED = { + value = true + } + OWNCLOUD_REDIS_HOST = { + value = "owncloud-redis-svc" + } + } + pvc = { + owncloud-file = { + name = "owncloud-file" + pvc = true + pvc_size = "2Gi" + mount_path = "/mnt/data" + } + + } + } }