Skip to content

Commit

Permalink
chore: update test regions (#1745)
Browse files Browse the repository at this point in the history 
Co-authored-by: Andrew Peabody <andrewpeabody@google.com>
  • Loading branch information
@bharathkkb @apeabody
bharathkkb and apeabody committed Sep 22, 2023
1 parent b34f946 commit b887cdb
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 30 deletions.
2 changes: 1 addition & 1 deletion test/fixtures/simple_regional/example.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/simple_regional/network.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
56 changes: 28 additions & 28 deletions test/integration/simple_regional/testdata/TestSimpleRegional.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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": {
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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
Expand All @@ -327,5 +327,5 @@
"workloadIdentityConfig": {
"workloadPool": "PROJECT_ID.svc.id.goog"
},
"zone": "us-central1"
}
"zone": "us-west1"
}

0 comments on commit b887cdb

Please sign in to comment.