remove comments

extract ip ranges to variables remove psc subnet
FalkorDB · Feb 11, 2025 · ef9ab56 · ef9ab56
1 parent 19a064c
commit ef9ab56
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 36 deletions.
diff --git a/tofu/aws/3-application_plane/main.tf b/tofu/aws/3-application_plane/main.tf
@@ -103,18 +103,4 @@ module "aws-s3-bucket-access-logs" {
   providers = {
     aws = aws.app-plane-account
   }
-}
-
-# module "cloudtrail" {
-#   source  = "trussworks/cloudtrail/aws"
-#   version = "5.2.0"
-
-#   s3_bucket_name     = module.aws-s3-bucket.id
-#   log_retention_days = var.cloudtrail_retention_days
-
-#   providers = {
-#     aws = aws.app-plane-account
-#   }
-
-#   depends_on = [module.aws-s3-bucket, data.aws_iam_policy_document.cloudtrail_bucket_policy]
-# }
+}
diff --git a/tofu/gcp/observability_stack/control_plane/infra/main.tf b/tofu/gcp/observability_stack/control_plane/infra/main.tf
@@ -1,12 +1,3 @@
-locals {
-  // TODO: Change range to /24
-  ip_range_subnet   = "172.16.0.0/20"
-  ip_range_pods     = "172.16.16.0/20"
-  ip_range_services = "172.16.32.0/20"
-
-  ip_range_service_attachment = "172.16.48.0/24"
-}
-
 provider "google" {
   project = var.project_id
   region  = var.region
@@ -25,24 +16,18 @@ module "vpc" {
   subnets = [{
     subnet_name           = "observability-stack-subnet"
     subnet_region         = var.region
-    subnet_ip             = local.ip_range_subnet
+    subnet_ip             = var.ip_range_subnet
     subnet_private_access = true
-    },
-    {
-      subnet_name   = "observability-stack-service-attachment"
-      subnet_region = var.region
-      subnet_ip     = local.ip_range_service_attachment
-      purpose       = "PRIVATE_SERVICE_CONNECT"
   }]
 
   secondary_ranges = {
     "observability-stack-subnet" = [{
       range_name    = "pods"
-      ip_cidr_range = local.ip_range_pods
+      ip_cidr_range = var.ip_range_pods
       },
       {
         range_name    = "services"
-        ip_cidr_range = local.ip_range_services
+        ip_cidr_range = var.ip_range_services
     }],
   }
 
@@ -125,9 +110,6 @@ module "gke" {
   enable_private_nodes                 = true
   http_load_balancing                  = true
 
-  // TODO: Set master_ipv4_cidr_block
-  # master_ipv4_cidr_block               = local.ip_range_subnet
-
   default_max_pods_per_node = 110
 
   monitoring_enabled_components = ["SYSTEM_COMPONENTS"]

diff --git a/tofu/gcp/observability_stack/control_plane/infra/variables.tf b/tofu/gcp/observability_stack/control_plane/infra/variables.tf
@@ -5,3 +5,15 @@ variable "project_id" {
 variable "region" {
   type = string
 }
+
+variable "ip_range_subnet" {
+  type = string
+}
+
+variable "ip_range_pods" {
+  type = string
+}
+
+variable "ip_range_services" {
+  type = string
+}