align tests

Signed-off-by: drfaust92 <[email protected]>

Author: DrFaust92

examples/node_pool/main.tf

@@ -63,7 +63,7 @@ module "gke" {
 
   additional_ip_ranges_config = [
     {
-      subnetwork           = "projects/${var.project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
+      subnetwork           = "projects/${var.project_id}/regions/${var.region}/subnetworks/${var.additional_ip_pod_range_subnetwork}"
       pod_ipv4_range_names = [var.additional_ip_pod_range]
     }
   ]

examples/node_pool/variables.tf

@@ -48,6 +48,10 @@ variable "ip_range_services" {
   description = "The secondary ip range to use for services"
 }
 
+variable "additional_ip_pod_range_subnetwork" {
+  description = "The subnetwork to host the additional pod range in"
+}
+
 variable "additional_ip_pod_range" {
   description = "The secondary ip range to use for pods in the additional range"
 }

test/fixtures/node_pool/example.tf

@@ -21,16 +21,17 @@ locals {
 module "example" {
   source = "../../../examples/node_pool"
 
-  project_id                     = var.project_ids[0]
-  cluster_name_suffix            = "-${random_string.suffix.result}"
-  region                         = "europe-west4"
-  zones                          = ["europe-west4-b"]
-  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
-  ip_range_services              = google_compute_subnetwork.main.secondary_ip_range[1].range_name
-  additional_ip_pod_range        = google_compute_subnetwork.main.secondary_ip_range[2].range_name
-  compute_engine_service_account = local.compute_engine_service_account
+  project_id                         = var.project_ids[0]
+  cluster_name_suffix                = "-${random_string.suffix.result}"
+  region                             = "europe-west4"
+  zones                              = ["europe-west4-b"]
+  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
+  ip_range_services                  = google_compute_subnetwork.main.secondary_ip_range[1].range_name
+  additional_ip_pod_range_subnetwork = google_compute_subnetwork.secondary.name
+  additional_ip_pod_range            = google_compute_subnetwork.secondary.secondary_ip_range[0].range_name
+  compute_engine_service_account     = local.compute_engine_service_account
 
   cluster_autoscaling = {
     enabled             = true

test/fixtures/node_pool/network.tf

@@ -50,3 +50,15 @@ resource "google_compute_subnetwork" "main" {
     ip_cidr_range = "172.16.0.0/18"
   }
 }
+
+resource "google_compute_subnetwork" "secondary" {
+  name          = "cft-gke-test-2-${random_string.suffix.result}"
+  ip_cidr_range = "10.1.0.0/17"
+  region        = "europe-west4"
+  network       = google_compute_network.main.self_link
+
+  secondary_ip_range {
+    range_name    = "test2"
+    ip_cidr_range = "172.18.0.0/18"
+  }
+}

test/integration/node_pool/testdata/TestNodePool.json

@@ -93,8 +93,8 @@
     "useIpAliases": true,
     "additionalIpRangesConfigs": [
       {
-        "subnetwork": "projects/PROJECT_ID/regions/europe-west4/subnetworks/cft-gke-test-RANDOM_STRING",
-        "podIpv4RangeNames": ["test"]
+        "subnetwork": "projects/PROJECT_ID/regions/europe-west4/subnetworks/cft-gke-test-2-RANDOM_STRING",
+        "podIpv4RangeNames": ["test2"]
       }
     ]
   },