From 90c7cc75ac944fb992537f4fd44a4b0c86a996e1 Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Fri, 22 Sep 2023 18:21:55 -0500 Subject: [PATCH] chore: update test regions (#1745) Co-authored-by: Andrew Peabody --- test/fixtures/simple_regional/example.tf | 2 +- test/fixtures/simple_regional/network.tf | 2 +- .../testdata/TestSimpleRegional.json | 56 +++++++++---------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/test/fixtures/simple_regional/example.tf b/test/fixtures/simple_regional/example.tf index cab3eeb2e7..f1b32dc0d1 100644 --- a/test/fixtures/simple_regional/example.tf +++ b/test/fixtures/simple_regional/example.tf @@ -19,7 +19,7 @@ module "example" { project_id = var.project_ids[0] cluster_name_suffix = "-${random_string.suffix.result}" - region = var.region + region = "us-west1" network = google_compute_network.main.name subnetwork = google_compute_subnetwork.main.name ip_range_pods = google_compute_subnetwork.main.secondary_ip_range[0].range_name diff --git a/test/fixtures/simple_regional/network.tf b/test/fixtures/simple_regional/network.tf index 94bb29e63c..abdd03b596 100644 --- a/test/fixtures/simple_regional/network.tf +++ b/test/fixtures/simple_regional/network.tf @@ -32,7 +32,7 @@ resource "google_compute_network" "main" { resource "google_compute_subnetwork" "main" { name = "cft-gke-test-${random_string.suffix.result}" ip_cidr_range = "10.0.0.0/17" - region = var.region + region = "us-west1" network = google_compute_network.main.self_link secondary_ip_range { diff --git a/test/integration/simple_regional/testdata/TestSimpleRegional.json b/test/integration/simple_regional/testdata/TestSimpleRegional.json index 31d14b4180..f90d32d500 100644 --- a/test/integration/simple_regional/testdata/TestSimpleRegional.json +++ b/test/integration/simple_regional/testdata/TestSimpleRegional.json @@ -45,12 +45,12 @@ "id": "8e4011253bcb4fbc943f88ae797f124f0f001ed95cc94b229231d68b8a44e20b", "initialClusterVersion": "1.27.3-gke.100", "instanceGroupUrls": [ - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-a/instanceGroupManagers/gke-simple-regional-clus-default-pool-209983a6-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-c/instanceGroupManagers/gke-simple-regional-clus-default-pool-6094c28c-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-f/instanceGroupManagers/gke-simple-regional-clus-default-pool-a9225012-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-a/instanceGroupManagers/gke-simple-regional--default-node-poo-8fb4fd0f-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-c/instanceGroupManagers/gke-simple-regional--default-node-poo-24ffed9f-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-f/instanceGroupManagers/gke-simple-regional--default-node-poo-1d2dc357-grp" + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-a/instanceGroupManagers/gke-simple-regional-clus-default-pool-209983a6-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-c/instanceGroupManagers/gke-simple-regional-clus-default-pool-6094c28c-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-f/instanceGroupManagers/gke-simple-regional-clus-default-pool-a9225012-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-a/instanceGroupManagers/gke-simple-regional--default-node-poo-8fb4fd0f-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-c/instanceGroupManagers/gke-simple-regional--default-node-poo-24ffed9f-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-f/instanceGroupManagers/gke-simple-regional--default-node-poo-1d2dc357-grp" ], "ipAllocationPolicy": { "clusterIpv4Cidr": "192.168.0.0/18", @@ -66,11 +66,11 @@ }, "labelFingerprint": "a9dc16a7", "legacyAbac": {}, - "location": "us-central1", + "location": "us-west1", "locations": [ - "us-central1-a", - "us-central1-c", - "us-central1-f" + "us-west1-a", + "us-west1-c", + "us-west1-f" ], "loggingConfig": { "componentConfig": { @@ -116,7 +116,7 @@ "defaultSnatStatus": {}, "network": "projects/PROJECT_ID/global/networks/cft-gke-test-44kc", "serviceExternalIpsConfig": {}, - "subnetwork": "projects/PROJECT_ID/regions/us-central1/subnetworks/cft-gke-test-44kc" + "subnetwork": "projects/PROJECT_ID/regions/us-west1/subnetworks/cft-gke-test-44kc" }, "nodeConfig": { "diskSizeGb": 100, @@ -192,14 +192,14 @@ }, "etag": "3bb00743-9dbf-4e92-9512-1e64fb8f1b8a", "instanceGroupUrls": [ - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-a/instanceGroupManagers/gke-simple-regional-clus-default-pool-209983a6-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-c/instanceGroupManagers/gke-simple-regional-clus-default-pool-6094c28c-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-f/instanceGroupManagers/gke-simple-regional-clus-default-pool-a9225012-grp" + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-a/instanceGroupManagers/gke-simple-regional-clus-default-pool-209983a6-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-c/instanceGroupManagers/gke-simple-regional-clus-default-pool-6094c28c-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-f/instanceGroupManagers/gke-simple-regional-clus-default-pool-a9225012-grp" ], "locations": [ - "us-central1-a", - "us-central1-c", - "us-central1-f" + "us-west1-a", + "us-west1-c", + "us-west1-f" ], "management": { "autoRepair": true, @@ -216,7 +216,7 @@ "podRange": "cft-gke-test-pods-44kc" }, "podIpv4CidrSize": 24, - "selfLink": "https://container.googleapis.com/v1/projects/PROJECT_ID/locations/us-central1/clusters/CLUSTER_NAME/nodePools/default-pool", + "selfLink": "https://container.googleapis.com/v1/projects/PROJECT_ID/locations/us-west1/clusters/CLUSTER_NAME/nodePools/default-pool", "status": "RUNNING", "upgradeSettings": { "maxSurge": 1, @@ -269,14 +269,14 @@ "etag": "c1cb03bd-8b4e-4a06-9c4e-213b87aa86a3", "initialNodeCount": 1, "instanceGroupUrls": [ - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-a/instanceGroupManagers/gke-simple-regional--default-node-poo-8fb4fd0f-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-c/instanceGroupManagers/gke-simple-regional--default-node-poo-24ffed9f-grp", - "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-central1-f/instanceGroupManagers/gke-simple-regional--default-node-poo-1d2dc357-grp" + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-a/instanceGroupManagers/gke-simple-regional--default-node-poo-8fb4fd0f-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-c/instanceGroupManagers/gke-simple-regional--default-node-poo-24ffed9f-grp", + "https://www.googleapis.com/compute/v1/projects/PROJECT_ID/zones/us-west1-f/instanceGroupManagers/gke-simple-regional--default-node-poo-1d2dc357-grp" ], "locations": [ - "us-central1-a", - "us-central1-c", - "us-central1-f" + "us-west1-a", + "us-west1-c", + "us-west1-f" ], "management": { "autoRepair": true, @@ -293,7 +293,7 @@ "podRange": "cft-gke-test-pods-44kc" }, "podIpv4CidrSize": 24, - "selfLink": "https://container.googleapis.com/v1/projects/PROJECT_ID/locations/us-central1/clusters/CLUSTER_NAME/nodePools/default-node-pool", + "selfLink": "https://container.googleapis.com/v1/projects/PROJECT_ID/locations/us-west1/clusters/CLUSTER_NAME/nodePools/default-node-pool", "status": "RUNNING", "upgradeSettings": { "maxSurge": 1, @@ -316,7 +316,7 @@ "mode": "BASIC", "vulnerabilityMode": "VULNERABILITY_MODE_UNSPECIFIED" }, - "selfLink": "https://container.googleapis.com/v1/projects/PROJECT_ID/locations/us-central1/clusters/CLUSTER_NAME", + "selfLink": "https://container.googleapis.com/v1/projects/PROJECT_ID/locations/us-west1/clusters/CLUSTER_NAME", "servicesIpv4Cidr": "192.168.64.0/18", "shieldedNodes": { "enabled": true @@ -327,5 +327,5 @@ "workloadIdentityConfig": { "workloadPool": "PROJECT_ID.svc.id.goog" }, - "zone": "us-central1" -} \ No newline at end of file + "zone": "us-west1" +}