make infra plan apply cleanly after import

johnstcn · johnstcn · commit 913599dbee9a · 2023-09-26T15:50:37.000+01:00
diff --git a/scaletest/terraform/infra/gcp_cluster.tf b/scaletest/terraform/infra/gcp_cluster.tf
@@ -41,6 +41,15 @@ resource "google_container_cluster" "primary" {
   workload_identity_config {
     workload_pool = "${data.google_project.project.project_id}.svc.id.goog"
   }
+
+
+  lifecycle {
+    ignore_changes = [
+      maintenance_policy,
+      release_channel,
+      remove_default_node_pool
+    ]
+  }
 }
 
 resource "google_container_node_pool" "coder" {
@@ -52,9 +61,6 @@ resource "google_container_node_pool" "coder" {
     min_node_count = 1
     max_node_count = var.nodepool_size_coder
   }
-  management {
-    auto_upgrade = false
-  }
   node_config {
     oauth_scopes = [
       "https://www.googleapis.com/auth/logging.write",
@@ -77,6 +83,9 @@ resource "google_container_node_pool" "coder" {
       disable-legacy-endpoints = "true"
     }
   }
+  lifecycle {
+    ignore_changes = [management[0].auto_repair, management[0].auto_upgrade, timeouts]
+  }
 }
 
 resource "google_container_node_pool" "workspaces" {
@@ -85,8 +94,8 @@ resource "google_container_node_pool" "workspaces" {
   project  = var.project_id
   cluster  = google_container_cluster.primary.name
   autoscaling {
-    min_node_count = 0
-    max_node_count = var.nodepool_size_workspaces
+    min_node_count       = 0
+    total_max_node_count = var.nodepool_size_workspaces
   }
   management {
     auto_upgrade = false
@@ -113,6 +122,9 @@ resource "google_container_node_pool" "workspaces" {
       disable-legacy-endpoints = "true"
     }
   }
+  lifecycle {
+    ignore_changes = [management[0].auto_repair, management[0].auto_upgrade, timeouts]
+  }
 }
 
 resource "google_container_node_pool" "misc" {
@@ -146,6 +158,9 @@ resource "google_container_node_pool" "misc" {
       disable-legacy-endpoints = "true"
     }
   }
+  lifecycle {
+    ignore_changes = [management[0].auto_repair, management[0].auto_upgrade, timeouts]
+  }
 }
 
 resource "null_resource" "cluster_kubeconfig" {
diff --git a/scaletest/terraform/infra/gcp_db.tf b/scaletest/terraform/infra/gcp_db.tf
@@ -32,6 +32,10 @@ resource "google_sql_database_instance" "db" {
       record_client_address   = false
     }
   }
+
+  lifecycle {
+    ignore_changes = [deletion_protection, timeouts]
+  }
 }
 
 resource "google_sql_database" "coder" {
@@ -40,6 +44,9 @@ resource "google_sql_database" "coder" {
   name     = "${var.name}-coder"
   # required for postgres, otherwise db fails to delete
   deletion_policy = "ABANDON"
+  lifecycle {
+    ignore_changes = [deletion_policy]
+  }
 }
 
 resource "random_password" "coder-postgres-password" {
@@ -58,6 +65,9 @@ resource "google_sql_user" "coder" {
   password = random_password.coder-postgres-password.result
   # required for postgres, otherwise user fails to delete
   deletion_policy = "ABANDON"
+  lifecycle {
+    ignore_changes = [deletion_policy, password]
+  }
 }
 
 resource "google_sql_user" "prometheus" {
@@ -68,6 +78,9 @@ resource "google_sql_user" "prometheus" {
   password = random_password.prometheus-postgres-password.result
   # required for postgres, otherwise user fails to delete
   deletion_policy = "ABANDON"
+  lifecycle {
+    ignore_changes = [deletion_policy, password]
+  }
 }
 
 locals {
diff --git a/scaletest/terraform/infra/gcp_vpc.tf b/scaletest/terraform/infra/gcp_vpc.tf
@@ -12,7 +12,7 @@ resource "google_compute_subnetwork" "subnet" {
   project       = var.project_id
   region        = var.region
   network       = google_compute_network.vpc.name
-  ip_cidr_range = "10.200.0.0/24"
+  ip_cidr_range = var.subnet_cidr
 }
 
 resource "google_compute_global_address" "sql_peering" {
diff --git a/scaletest/terraform/infra/vars.tf b/scaletest/terraform/infra/vars.tf
@@ -25,6 +25,11 @@ variable "zone" {
   default     = "us-east1-c"
 }
 
+variable "subnet_cidr" {
+  description = "CIDR range for the subnet."
+  default     = "10.200.0.0/24"
+}
+
 variable "k8s_version" {
   description = "Kubernetes version to provision."
   default     = "1.24"

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,15 @@ resource "google_container_cluster" "primary" {`
`41`	`41`	`workload_identity_config {`
`42`	`42`	`workload_pool = "${data.google_project.project.project_id}.svc.id.goog"`
`43`	`43`	`}`
	`44`	`+`
	`45`	`+`
	`46`	`+ lifecycle {`
	`47`	`+ ignore_changes = [`
	`48`	`+ maintenance_policy,`
	`49`	`+ release_channel,`
	`50`	`+ remove_default_node_pool`
	`51`	`+ ]`
	`52`	`+ }`
`44`	`53`	`}`
`45`	`54`
`46`	`55`	`resource "google_container_node_pool" "coder" {`
`@@ -52,9 +61,6 @@ resource "google_container_node_pool" "coder" {`
`52`	`61`	`min_node_count = 1`
`53`	`62`	`max_node_count = var.nodepool_size_coder`
`54`	`63`	`}`
`55`		`- management {`
`56`		`- auto_upgrade = false`
`57`		`- }`
`58`	`64`	`node_config {`
`59`	`65`	`oauth_scopes = [`
`60`	`66`	`"https://www.googleapis.com/auth/logging.write",`
`@@ -77,6 +83,9 @@ resource "google_container_node_pool" "coder" {`
`77`	`83`	`disable-legacy-endpoints = "true"`
`78`	`84`	`}`
`79`	`85`	`}`
	`86`	`+ lifecycle {`
	`87`	`+ ignore_changes = [management[0].auto_repair, management[0].auto_upgrade, timeouts]`
	`88`	`+ }`
`80`	`89`	`}`
`81`	`90`
`82`	`91`	`resource "google_container_node_pool" "workspaces" {`
`@@ -85,8 +94,8 @@ resource "google_container_node_pool" "workspaces" {`
`85`	`94`	`project = var.project_id`
`86`	`95`	`cluster = google_container_cluster.primary.name`
`87`	`96`	`autoscaling {`
`88`		`- min_node_count = 0`
`89`		`- max_node_count = var.nodepool_size_workspaces`
	`97`	`+ min_node_count = 0`
	`98`	`+ total_max_node_count = var.nodepool_size_workspaces`
`90`	`99`	`}`
`91`	`100`	`management {`
`92`	`101`	`auto_upgrade = false`
`@@ -113,6 +122,9 @@ resource "google_container_node_pool" "workspaces" {`
`113`	`122`	`disable-legacy-endpoints = "true"`
`114`	`123`	`}`
`115`	`124`	`}`
	`125`	`+ lifecycle {`
	`126`	`+ ignore_changes = [management[0].auto_repair, management[0].auto_upgrade, timeouts]`
	`127`	`+ }`
`116`	`128`	`}`
`117`	`129`
`118`	`130`	`resource "google_container_node_pool" "misc" {`
`@@ -146,6 +158,9 @@ resource "google_container_node_pool" "misc" {`
`146`	`158`	`disable-legacy-endpoints = "true"`
`147`	`159`	`}`
`148`	`160`	`}`
	`161`	`+ lifecycle {`
	`162`	`+ ignore_changes = [management[0].auto_repair, management[0].auto_upgrade, timeouts]`
	`163`	`+ }`
`149`	`164`	`}`
`150`	`165`
`151`	`166`	`resource "null_resource" "cluster_kubeconfig" {`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ resource "google_sql_database_instance" "db" {`
`32`	`32`	`record_client_address = false`
`33`	`33`	`}`
`34`	`34`	`}`
	`35`	`+`
	`36`	`+ lifecycle {`
	`37`	`+ ignore_changes = [deletion_protection, timeouts]`
	`38`	`+ }`
`35`	`39`	`}`
`36`	`40`
`37`	`41`	`resource "google_sql_database" "coder" {`
`@@ -40,6 +44,9 @@ resource "google_sql_database" "coder" {`
`40`	`44`	`name = "${var.name}-coder"`
`41`	`45`	`# required for postgres, otherwise db fails to delete`
`42`	`46`	`deletion_policy = "ABANDON"`
	`47`	`+ lifecycle {`
	`48`	`+ ignore_changes = [deletion_policy]`
	`49`	`+ }`
`43`	`50`	`}`
`44`	`51`
`45`	`52`	`resource "random_password" "coder-postgres-password" {`
`@@ -58,6 +65,9 @@ resource "google_sql_user" "coder" {`
`58`	`65`	`password = random_password.coder-postgres-password.result`
`59`	`66`	`# required for postgres, otherwise user fails to delete`
`60`	`67`	`deletion_policy = "ABANDON"`
	`68`	`+ lifecycle {`
	`69`	`+ ignore_changes = [deletion_policy, password]`
	`70`	`+ }`
`61`	`71`	`}`
`62`	`72`
`63`	`73`	`resource "google_sql_user" "prometheus" {`
`@@ -68,6 +78,9 @@ resource "google_sql_user" "prometheus" {`
`68`	`78`	`password = random_password.prometheus-postgres-password.result`
`69`	`79`	`# required for postgres, otherwise user fails to delete`
`70`	`80`	`deletion_policy = "ABANDON"`
	`81`	`+ lifecycle {`
	`82`	`+ ignore_changes = [deletion_policy, password]`
	`83`	`+ }`
`71`	`84`	`}`
`72`	`85`
`73`	`86`	`locals {`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ resource "google_compute_subnetwork" "subnet" {`
`12`	`12`	`project = var.project_id`
`13`	`13`	`region = var.region`
`14`	`14`	`network = google_compute_network.vpc.name`
`15`		`- ip_cidr_range = "10.200.0.0/24"`
	`15`	`+ ip_cidr_range = var.subnet_cidr`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`resource "google_compute_global_address" "sql_peering" {`