From ba6dd951b7987540e61ee0e93ccbb62ea505d0c6 Mon Sep 17 00:00:00 2001
From: "Mengye (Max) Gong" <8364575+gongmax@users.noreply.github.com>
Date: Thu, 25 May 2023 16:07:34 -0700
Subject: [PATCH] Remove zonal test clusters, and create regional clusters with
 release channel (#3186)

* Use regional standard cluster for e2e test

* Remove zonal test clusters, and create regional clusters with release channel

* fix
---
 build/terraform/e2e/gke-standard/module.tf |  2 +-
 build/terraform/e2e/module.tf              | 18 ++++--------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/build/terraform/e2e/gke-standard/module.tf b/build/terraform/e2e/gke-standard/module.tf
index d91c85b246..04e4953cc8 100644
--- a/build/terraform/e2e/gke-standard/module.tf
+++ b/build/terraform/e2e/gke-standard/module.tf
@@ -43,7 +43,7 @@ module "gke_cluster" {
   source = "../../../../install/terraform/modules/gke"
 
   cluster = {
-    "name"                 = var.overrideName != "" ? var.overrideName : format("gke-standard-e2e-test-cluster-%s", replace(var.kubernetesVersion, ".", "-"))
+    "name"                 = var.overrideName != "" ? var.overrideName : format("standard-e2e-test-cluster-%s", replace(var.kubernetesVersion, ".", "-"))
     "location"             = var.location
     "releaseChannel"       = var.releaseChannel
     "machineType"          = "e2-standard-4"
diff --git a/build/terraform/e2e/module.tf b/build/terraform/e2e/module.tf
index 225da9591d..a562a82daa 100644
--- a/build/terraform/e2e/module.tf
+++ b/build/terraform/e2e/module.tf
@@ -34,18 +34,8 @@ terraform {
 }
 
 variable "project" {}
-variable "kubernetes_versions_standard" {
-  description = "Create standard e2e test clusters with these k8s versions in these zones"
-  type        = map(list(string))
-  default     = {
-    "1.24" = ["us-west1-c", "UNSPECIFIED"]
-    "1.25" = ["us-central1-c", "UNSPECIFIED"]
-    "1.26" = ["asia-east1-c", "RAPID"]
-  }
-}
-
-variable "kubernetes_versions_autopilot" {
-  description = "Create Autopilot e2e test clusters with these k8s versions in these regions"
+variable "kubernetes_versions" {
+  description = "Create e2e test clusters with these k8s versions in these regions"
   type        = map(list(string))
   default     = {
     "1.24" = ["us-west1", "REGULAR"]
@@ -55,7 +45,7 @@ variable "kubernetes_versions_autopilot" {
 }
 
 module "gke_standard_cluster" {
-  for_each = var.kubernetes_versions_standard
+  for_each = var.kubernetes_versions
   source = "./gke-standard"
   project = var.project
   kubernetesVersion = each.key
@@ -64,7 +54,7 @@ module "gke_standard_cluster" {
 }
 
 module "gke_autopilot_cluster" {
-  for_each = var.kubernetes_versions_autopilot
+  for_each = var.kubernetes_versions
   source = "./gke-autopilot"
   project = var.project
   kubernetesVersion = each.key