Merge pull request #36 from sparkfabrik/redis_max_memory

refs platfom/1713: Redis Max Memory Variable

Author: Monska85

README.md

@@ -114,6 +114,7 @@ Then perform the following commands on the root folder:
 | postgresql\_tier | (Required) The machine type to use.Postgres supports only shared-core machine types, and custom machine types such as db-custom-2-13312 | `string` | `"db-custom-2-8192"` | no |
 | postgresql\_version | (Required) The PostgreSQL version to use. Supported values for Gitlab POSTGRES\_12, POSTGRES\_13. Default: POSTGRES\_12 | `string` | `"POSTGRES_12"` | no |
 | project\_id | GCP Project to deploy resources | `string` | n/a | yes |
+| redis\_maxmemory\_gb | Set a Max memory usage limit for Redis specified in GiB. | `number` | `0.8` | no |
 | redis\_size | Redis memory size in GiB. | `number` | `1` | no |
 | redis\_tier | The service tier of the instance. Must be one of these values BASIC and STANDARD\_HA | `string` | `"STANDARD_HA"` | no |
 | region | GCP region to deploy resources to | `string` | `"europe-west1"` | no |

main.tf

@@ -83,7 +83,8 @@ module "project_services" {
     "redis.googleapis.com",
     "secretmanager.googleapis.com",
     "containerfilesystem.googleapis.com",
-    "storagetransfer.googleapis.com"
+    "storagetransfer.googleapis.com",
+    "storage.googleapis.com",
   ]
 }
 
@@ -235,15 +236,17 @@ resource "google_sql_database" "gitlabhq_production" {
 
 # Redis
 resource "google_redis_instance" "gitlab" {
+  display_name       = "GitLab Redis"
   name               = "gitlab"
   tier               = var.redis_tier
   memory_size_gb     = var.redis_size
   region             = var.region
   authorized_network = google_compute_network.gitlab.self_link
+  redis_configs = {
+    "maxmemory-gb" = var.redis_maxmemory_gb
+  }
 
   depends_on = [module.project_services.project_id]
-
-  display_name = "GitLab Redis"
 }
 
 # Cloud Storage
@@ -343,7 +346,7 @@ module "gke" {
   istio_auth = var.gke_istio_auth
 
   cluster_autoscaling = var.gke_cluster_autoscaling
-  
+
   node_pools = [
     {
       name                       = "gitlab"

variables.tf

@@ -115,6 +115,12 @@ variable "redis_size" {
   default     = 1
 }
 
+variable "redis_maxmemory_gb" {
+  type        = number
+  description = "Set a Max memory usage limit for Redis specified in GiB."
+  default     = 0.8
+}
+
 ##################
 #  GCS SECTION   #
 ##################