Merge pull request terraform-google-modules#16 from pratikmallya/use_…

…data_source_networks Better way to access networks
WALTER-GROUP · Sep 26, 2018 · 911a232 · 911a232
2 parents cf8a38c + ebbe8e3
commit 911a232
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -26,8 +26,8 @@ resource "google_container_cluster" "primary" {
   region           = "${var.region}"
   additional_zones = "${var.zones}"
 
-  network            = "projects/${local.network_project_id}/global/networks/${var.network}"
-  subnetwork         = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
+  network            = "${data.google_compute_network.gke_network.self_link}"
+  subnetwork         = "${data.google_compute_subnetwork.gke_subnetwork.self_link}"
   min_master_version = "${local.kubernetes_version}"
 
   logging_service    = "${var.logging_service}"

diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -26,8 +26,8 @@ resource "google_container_cluster" "zonal_primary" {
   zone             = "${var.zones[0]}"
   additional_zones = "${slice(var.zones,1,length(var.zones))}"
 
-  network            = "projects/${local.network_project_id}/global/networks/${var.network}"
-  subnetwork         = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
+  network            = "${data.google_compute_network.gke_network.self_link}"
+  subnetwork         = "${data.google_compute_subnetwork.gke_subnetwork.self_link}"
   min_master_version = "${local.kubernetes_version}"
 
   logging_service    = "${var.logging_service}"

diff --git a/networks.tf b/networks.tf
@@ -0,0 +1,9 @@
+data "google_compute_network" "gke_network" {
+  name    = "${var.network}"
+  project = "${local.network_project_id}"
+}
+
+data "google_compute_subnetwork" "gke_subnetwork" {
+  name    = "${var.subnetwork}"
+  project = "${local.network_project_id}"
+}