From 9978f0ef3f5b5b4f42858fb7c39a2c260bd684e6 Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Tue, 7 May 2024 12:43:46 +0200
Subject: [PATCH] terraform, gcp: declare regional_cluster explicitly only when
 false

---
 terraform/gcp/projects/2i2c-uk.tfvars               | 5 ++---
 terraform/gcp/projects/catalystproject-latam.tfvars | 1 -
 terraform/gcp/projects/cluster.tfvars.template      | 3 ---
 terraform/gcp/projects/hhmi.tfvars                  | 3 ---
 terraform/gcp/projects/leap.tfvars                  | 5 ++---
 terraform/gcp/projects/linked-earth.tfvars          | 5 ++---
 terraform/gcp/projects/pangeo-hubs.tfvars           | 3 +--
 terraform/gcp/projects/qcl.tfvars                   | 5 ++---
 8 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/terraform/gcp/projects/2i2c-uk.tfvars b/terraform/gcp/projects/2i2c-uk.tfvars
index 97b6e2f9e7..680626e8e8 100644
--- a/terraform/gcp/projects/2i2c-uk.tfvars
+++ b/terraform/gcp/projects/2i2c-uk.tfvars
@@ -1,9 +1,8 @@
 prefix     = "two-eye-two-see-uk"
 project_id = "two-eye-two-see-uk"
 
-zone             = "europe-west2-b"
-region           = "europe-west2"
-regional_cluster = true
+zone   = "europe-west2-b"
+region = "europe-west2"
 
 k8s_versions = {
   min_master_version : "1.27.4-gke.900",
diff --git a/terraform/gcp/projects/catalystproject-latam.tfvars b/terraform/gcp/projects/catalystproject-latam.tfvars
index a1665d0204..8282fab8bd 100644
--- a/terraform/gcp/projects/catalystproject-latam.tfvars
+++ b/terraform/gcp/projects/catalystproject-latam.tfvars
@@ -2,7 +2,6 @@ prefix                = "latam"
 project_id            = "catalystproject-392106"
 region                = "southamerica-east1"
 zone                  = "southamerica-east1-c"
-regional_cluster      = true
 enable_network_policy = true
 
 k8s_versions = {
diff --git a/terraform/gcp/projects/cluster.tfvars.template b/terraform/gcp/projects/cluster.tfvars.template
index 661b2b3790..69e741d0fe 100644
--- a/terraform/gcp/projects/cluster.tfvars.template
+++ b/terraform/gcp/projects/cluster.tfvars.template
@@ -11,9 +11,6 @@ project_id = "{{ project_id }}"
 zone   = "{{ cluster_region }}"
 region = "{{ cluster_region }}"
 
-# Default to a HA cluster for reliability
-regional_cluster = true
-
 # TODO: Before applying this, identify a k8s version to specify. Pick the latest
 #       k8s version from GKE's regular release channel. Look at the output
 #       called `regular_channel_latest_k8s_versions` as seen when using
diff --git a/terraform/gcp/projects/hhmi.tfvars b/terraform/gcp/projects/hhmi.tfvars
index 71e7431642..2e559b7313 100644
--- a/terraform/gcp/projects/hhmi.tfvars
+++ b/terraform/gcp/projects/hhmi.tfvars
@@ -4,9 +4,6 @@ project_id = "hhmi-398911"
 zone   = "us-west2-b"
 region = "us-west2"
 
-# Default to a HA cluster for reliability
-regional_cluster = true
-
 core_node_machine_type = "n2-highmem-4"
 
 k8s_versions = {
diff --git a/terraform/gcp/projects/leap.tfvars b/terraform/gcp/projects/leap.tfvars
index bc151a8296..95e1ccd678 100644
--- a/terraform/gcp/projects/leap.tfvars
+++ b/terraform/gcp/projects/leap.tfvars
@@ -12,9 +12,8 @@ k8s_versions = {
 }
 
 # GPUs not available in us-central1-b
-zone             = "us-central1-c"
-region           = "us-central1"
-regional_cluster = true
+zone   = "us-central1-c"
+region = "us-central1"
 
 # Multi-tenant cluster, network policy is required to enforce separation between hubs
 enable_network_policy = true
diff --git a/terraform/gcp/projects/linked-earth.tfvars b/terraform/gcp/projects/linked-earth.tfvars
index 86678d6f2f..cb006e5af7 100644
--- a/terraform/gcp/projects/linked-earth.tfvars
+++ b/terraform/gcp/projects/linked-earth.tfvars
@@ -1,9 +1,8 @@
 prefix     = "linked-earth"
 project_id = "linked-earth-hubs"
 
-zone             = "us-central1-c"
-region           = "us-central1"
-regional_cluster = true
+zone   = "us-central1-c"
+region = "us-central1"
 
 k8s_versions = {
   min_master_version : "1.27.4-gke.900",
diff --git a/terraform/gcp/projects/pangeo-hubs.tfvars b/terraform/gcp/projects/pangeo-hubs.tfvars
index ddcd8bd49b..c02b14be9e 100644
--- a/terraform/gcp/projects/pangeo-hubs.tfvars
+++ b/terraform/gcp/projects/pangeo-hubs.tfvars
@@ -23,6 +23,7 @@ project_id             = "pangeo-integration-te-3eea"
 billing_project_id     = "pangeo-integration-te-3eea"
 zone                   = "us-central1-b"
 region                 = "us-central1"
+regional_cluster       = false
 core_node_machine_type = "n2-highmem-4"
 enable_private_cluster = true
 
@@ -40,8 +41,6 @@ enable_network_policy = true
 enable_filestore      = true
 filestore_capacity_gb = 4608
 
-regional_cluster = false
-
 
 user_buckets = {
   "scratch-staging" : {
diff --git a/terraform/gcp/projects/qcl.tfvars b/terraform/gcp/projects/qcl.tfvars
index 47ba0d99f0..dec9a0acf1 100644
--- a/terraform/gcp/projects/qcl.tfvars
+++ b/terraform/gcp/projects/qcl.tfvars
@@ -1,9 +1,8 @@
 prefix     = "qcl"
 project_id = "qcl-hub"
 
-zone             = "europe-west1-d"
-region           = "europe-west1"
-regional_cluster = true
+zone   = "europe-west1-d"
+region = "europe-west1"
 
 k8s_versions = {
   min_master_version : "1.27.4-gke.900",