Merge pull request #279 from 20tab/feature/redis-url-secret

Support redis url secret

{{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
@@ -82,5 +83,5 @@ module "deployment" {
   extra_config_values = var.extra_config_values
   extra_secret_values = var.extra_secret_values
 
-  additional_secrets = var.use_redis ? ["database-url", "cache-url"] : ["database-url"]
+  additional_secrets = var.use_redis ? ["database-url", "redis-url"] : ["database-url"]
 }

{{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

{{cookiecutter.project_dirname}}/terraform/modules/kubernetes/deployment/main.tf

@@ -169,6 +169,10 @@ resource "kubernetes_deployment_v1" "main" {
               }
             }
           }
+          env {
+            name  = "CACHE_URL"
+            value = coalesce(var.cache_url, "$(REDIS_URL)?key_prefix=${var.environment_slug}")
+          }
         }
       }
     }

{{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)."

{{cookiecutter.project_dirname}}/terraform/other-k8s/main.tf

@@ -93,6 +93,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
@@ -110,5 +111,5 @@ module "deployment" {
   extra_config_values = var.extra_config_values
   extra_secret_values = var.extra_secret_values
 
-  additional_secrets = var.use_redis ? ["database-url", "cache-url"] : ["database-url"]
+  additional_secrets = var.use_redis ? ["database-url", "redis-url"] : ["database-url"]
 }

{{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)."