Allow cache url override

20tab · Mar 31, 2023 · f81ec11 · f81ec11
1 parent 89a8283
commit f81ec11
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 3 deletions.
diff --git a/{{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/main.tf b/{{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/main.tf
@@ -65,6 +65,7 @@ module "deployment" {
 
   media_storage = var.media_storage
 
+  cache_url                       = var.cache_url
   django_admins                   = var.django_admins
   django_additional_allowed_hosts = var.django_additional_allowed_hosts
   django_default_from_email       = var.django_default_from_email

diff --git a/{{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/variables.tf b/{{cookiecutter.project_dirname}}/terraform/digitalocean-k8s/variables.tf
@@ -1,3 +1,10 @@
+variable "cache_url" {
+  type        = string
+  description = "A Django cache URL override."
+  default     = ""
+  sensitive   = true
+}
+
 variable "digitalocean_token" {
   description = "The Digital Ocean access token."
   type        = string

diff --git a/{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/main.tf b/{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/main.tf
@@ -132,11 +132,11 @@ resource "kubernetes_deployment_v1" "main" {
           name  = var.service_slug
           resources {
             limits = {
-              cpu = var.service_limits_cpu
+              cpu    = var.service_limits_cpu
               memory = var.service_limits_memory
             }
             requests = {
-              cpu = var.service_requests_cpu
+              cpu    = var.service_requests_cpu
               memory = var.service_requests_memory
             }
           }
@@ -171,7 +171,7 @@ resource "kubernetes_deployment_v1" "main" {
           }
           env {
             name  = "CACHE_URL"
-            value = "$(REDIS_URL)?key_prefix=${var.environment_slug}"
+            value = coalesce(var.cache_url, "$(REDIS_URL)?key_prefix=${var.environment_slug}")
           }
         }
       }

diff --git a/{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/variables.tf b/{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/variables.tf
@@ -4,6 +4,13 @@ variable "additional_secrets" {
   default     = []
 }
 
+variable "cache_url" {
+  type        = string
+  description = "A Django cache URL override."
+  default     = ""
+  sensitive   = true
+}
+
 variable "django_additional_allowed_hosts" {
   type        = string
   description = "Additional entries of the DJANGO_ALLOWED_HOSTS environment variable ('127.0.0.1', 'localhost', the service slug and the project host are included by default)."

diff --git a/{{cookiecutter.project_dirname}}/terraform/other-k8s/main.tf b/{{cookiecutter.project_dirname}}/terraform/other-k8s/main.tf
@@ -101,6 +101,7 @@ module "deployment" {
 
   media_persistent_volume_claim_name = var.media_storage == "local" ? kubernetes_persistent_volume_claim_v1.media[0].metadata[0].name : ""
 
+  cache_url                       = var.cache_url
   django_admins                   = var.django_admins
   django_additional_allowed_hosts = var.django_additional_allowed_hosts
   django_default_from_email       = var.django_default_from_email

diff --git a/{{cookiecutter.project_dirname}}/terraform/other-k8s/variables.tf b/{{cookiecutter.project_dirname}}/terraform/other-k8s/variables.tf
@@ -1,3 +1,10 @@
+variable "cache_url" {
+  type        = string
+  description = "A Django cache URL override."
+  default     = ""
+  sensitive   = true
+}
+
 variable "django_additional_allowed_hosts" {
   type        = string
   description = "Additional entries of the DJANGO_ALLOWED_HOSTS environment variable ('127.0.0.1', 'localhost', the service slug and the project host are included by default)."