diff --git a/infrastructure/variables.auto.tfvars b/infrastructure/variables.auto.tfvars index 990f8e1..6223bec 100644 --- a/infrastructure/variables.auto.tfvars +++ b/infrastructure/variables.auto.tfvars @@ -7,15 +7,9 @@ kubernetes = { image = "qmcgaw/gluetun:latest" exposed = false 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 - # requirements = { - # limits-cpu = "800Mi" - # limits-memory = "800Mi" - # requests-cpu = "800Mi" - # requests-memory = "800Mi" - # } + environment = { WIREGUARD_PRIVATE_KEY = { value_from = { @@ -34,9 +28,6 @@ kubernetes = { HTTPPROXY_LISTENING_ADDRESS = { value = "0.0.0.0:8888" } - # DNS_KEEP_NAMESERVER = { - # value = "on" - # } VPN_SERVICE_PROVIDER = { value = "protonvpn" } @@ -54,9 +45,6 @@ kubernetes = { value = "on" } - # WIREGUARD_ADDRESSES = { - # value = "10.2.0.2/32" - # } FIREWALL_INPUT_PORTS = { value = "8081,7878,9696,9091,51413,8080,6881,8989,8191,8888,8000" } @@ -64,19 +52,13 @@ kubernetes = { value = "ip2location" } - # HEALTH_TARGET_ADDRESS = { - # value = "protonvpn.com:80" - # } - # FIREWALL_OUTBOUND_SUBNETS = { - # value = "10.0.0.0/24" } - } } django = { - enabled = false + #enabled = false namespace = "django" domain_name = ["django", "admin", "redirect", "streaming", "stash", "simpsons", "kubernetes", "cloudmanager", "podcast"] image = "gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest" @@ -86,7 +68,6 @@ kubernetes = { username = "django_username" mountPath = "/var/lib/postgresql/data" } - #redis = {} secret_ref = ["django-bitwarden-credentials"] secret_import = ["9fc5a725-75f5-4bab-b595-b474017146c3"] requirements = { @@ -107,11 +88,6 @@ kubernetes = { ENVIRONMENT = { value = "PRODUCTION" } - #CELERY_BROKER_URL = { - # value = "redis://django-redis-svc:6379" - #} - #HTTP_PROXY = { - #value = "http://gluetun-svc.gluetun.svc:8888" } DB_PASSWORD = { value_from = { @@ -180,7 +156,6 @@ kubernetes = { service_port = [8000] domain_name = ["django-testing", "admin-testing", "redirect-testing", "streaming-testing", "stash-testing", "simpsons-testing", "kubernetes-testing", "cloudmanager-testing", "podcast-testing"] database = {} - #redis = {} requirements = { limits-cpu = "800m" limits-memory = "800Mi"