Merge pull request #1542 from alphagov/samsimpson1/remove-shared-redis

Remove shared redis instances
alphagov · Dec 3, 2024 · 700ce24 · 700ce24
2 parents a936ef8 + 1a29825
commit 700ce24
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 106 deletions.
diff --git a/terraform/deployments/govuk-publishing-infrastructure/outputs.tf b/terraform/deployments/govuk-publishing-infrastructure/outputs.tf
@@ -1,7 +1,3 @@
-output "shared_redis_cluster_host" {
-  value = aws_route53_record.shared_redis_cluster.fqdn
-}
-
 output "eks_ingress_www_origin_security_group_name" {
   value = aws_security_group.eks_ingress_www_origin.name
 }
diff --git a/terraform/deployments/govuk-publishing-infrastructure/security.tf b/terraform/deployments/govuk-publishing-infrastructure/security.tf
@@ -13,30 +13,6 @@ data "aws_ec2_managed_prefix_list" "cloudfront" {
   name = "com.amazonaws.global.cloudfront.origin-facing"
 }
 
-#
-# Redis
-#
-
-resource "aws_security_group_rule" "shared_redis_cluster_to_any_any" {
-  description       = "Redis cluster sends requests to anywhere over any protocol"
-  type              = "egress"
-  from_port         = 0
-  to_port           = 0
-  protocol          = -1
-  cidr_blocks       = ["0.0.0.0/0"]
-  security_group_id = aws_security_group.shared_redis_cluster.id
-}
-
-resource "aws_security_group_rule" "shared_redis_cluster_from_any" {
-  description              = "Shared Redis cluster for EKS accepts requests from EKS nodes"
-  type                     = "ingress"
-  from_port                = 6379
-  to_port                  = 6379
-  protocol                 = "tcp"
-  security_group_id        = aws_security_group.shared_redis_cluster.id
-  source_security_group_id = data.tfe_outputs.cluster_infrastructure.nonsensitive_values.node_security_group_id
-}
-
 #
 # Frontend memcached
 #

diff --git a/terraform/deployments/govuk-publishing-infrastructure/shared_redis.tf b/terraform/deployments/govuk-publishing-infrastructure/shared_redis.tf
diff --git a/terraform/deployments/govuk-publishing-infrastructure/variables.tf b/terraform/deployments/govuk-publishing-infrastructure/variables.tf
@@ -19,11 +19,6 @@ variable "frontend_memcached_node_type" {
   description = "Instance type for the Frontend memcached."
 }
 
-variable "shared_redis_cluster_node_type" {
-  type        = string
-  description = "Instance type for the shared Redis cluster. t1 and t2 instances are not supported."
-}
-
 variable "licensify_documentdb_instance_count" {
   type        = number
   default     = 3

diff --git a/terraform/deployments/tfc-configuration/cdn-analytics.tf b/terraform/deployments/tfc-configuration/cdn-analytics.tf
@@ -20,8 +20,8 @@ module "cdn-analytics-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/chat.tf b/terraform/deployments/tfc-configuration/chat.tf
@@ -20,8 +20,8 @@ module "chat-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/cluster-infrastructure.tf b/terraform/deployments/tfc-configuration/cluster-infrastructure.tf
@@ -20,8 +20,8 @@ module "cluster-infrastructure-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/cluster-services.tf b/terraform/deployments/tfc-configuration/cluster-services.tf
@@ -19,8 +19,8 @@ module "cluster-services-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/datagovuk-infrastructure.tf b/terraform/deployments/tfc-configuration/datagovuk-infrastructure.tf
@@ -19,8 +19,8 @@ module "datagovuk-infrastructure-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/gcp-projects.tf b/terraform/deployments/tfc-configuration/gcp-projects.tf
@@ -22,7 +22,7 @@ module "gcp-ga4-analytics" {
   team_access = {
     "GOV.UK Production"            = "write"
     "Google Cloud Data Production" = "write"
-    "GOV.UK Non-Production"        = "read"
+    "GOV.UK Non-Production (r/o)"  = "read"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/govuk-publishing-infrastructure.tf b/terraform/deployments/tfc-configuration/govuk-publishing-infrastructure.tf
@@ -19,8 +19,8 @@ module "govuk-publishing-infrastructure-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/mobile-backend.tf b/terraform/deployments/tfc-configuration/mobile-backend.tf
@@ -84,8 +84,8 @@ module "mobile-backend-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/opensearch.tf b/terraform/deployments/tfc-configuration/opensearch.tf
@@ -19,8 +19,8 @@ module "opensearch-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/rds.tf b/terraform/deployments/tfc-configuration/rds.tf
@@ -20,8 +20,8 @@ module "rds-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [

diff --git a/terraform/deployments/tfc-configuration/variables-integration.tf b/terraform/deployments/tfc-configuration/variables-integration.tf
@@ -35,8 +35,7 @@ module "variable-set-integration" {
 
     publishing_service_domain = "integration.publishing.service.gov.uk"
 
-    frontend_memcached_node_type   = "cache.t4g.micro"
-    shared_redis_cluster_node_type = "cache.m6g.large"
+    frontend_memcached_node_type = "cache.t4g.micro"
 
     # Non-production-only access is sufficient to access tools in this cluster.
     github_read_write_team = "alphagov:gov-uk"

diff --git a/terraform/deployments/tfc-configuration/variables-production.tf b/terraform/deployments/tfc-configuration/variables-production.tf
@@ -33,9 +33,8 @@ module "variable-set-production" {
 
     publishing_service_domain = "publishing.service.gov.uk"
 
-    workers_instance_types         = ["m6i.8xlarge", "m6a.8xlarge"]
-    frontend_memcached_node_type   = "cache.r6g.large"
-    shared_redis_cluster_node_type = "cache.r6g.xlarge"
+    workers_instance_types       = ["m6i.8xlarge", "m6a.8xlarge"]
+    frontend_memcached_node_type = "cache.r6g.large"
 
     ckan_s3_organogram_bucket = "datagovuk-production-ckan-organogram"
   }

diff --git a/terraform/deployments/tfc-configuration/variables-staging.tf b/terraform/deployments/tfc-configuration/variables-staging.tf
@@ -34,8 +34,7 @@ module "variable-set-staging" {
 
     publishing_service_domain = "staging.publishing.service.gov.uk"
 
-    frontend_memcached_node_type   = "cache.t4g.medium"
-    shared_redis_cluster_node_type = "cache.r6g.large"
+    frontend_memcached_node_type = "cache.t4g.medium"
 
     desired_ha_replicas         = 2
     rds_backup_retention_period = 1

diff --git a/terraform/deployments/tfc-configuration/vpc.tf b/terraform/deployments/tfc-configuration/vpc.tf
@@ -20,8 +20,8 @@ module "vpc-integration" {
   }
 
   team_access = {
-    "GOV.UK Non-Production" = "write"
-    "GOV.UK Production"     = "write"
+    "GOV.UK Non-Production (r/o)" = "write"
+    "GOV.UK Production"           = "write"
   }
 
   variable_set_names = [