Merge branch 'master' into internal/remove-credentials-path

terraform-google-modules · Mar 27, 2019 · fc43491 · fc43491
2 parents 4e8b4b5 + 5dc6786
commit fc43491
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -219,7 +219,7 @@ The root module is generated by running `make generate`. Changes to this reposit
 ### Requirements
 - [bundler](https://github.com/bundler/bundler)
 - [gcloud](https://cloud.google.com/sdk/install)
-- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.3.0
+- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.6.0
 
 ### Autogeneration of documentation from .tf files
 Run

diff --git a/autogen/README.md b/autogen/README.md
@@ -166,7 +166,7 @@ The root module is generated by running `make generate`. Changes to this reposit
 ### Requirements
 - [bundler](https://github.com/bundler/bundler)
 - [gcloud](https://cloud.google.com/sdk/install)
-- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.3.0
+- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.6.0
 
 ### Autogeneration of documentation from .tf files
 Run

diff --git a/autogen/cluster_regional.tf b/autogen/cluster_regional.tf
@@ -103,7 +103,7 @@ resource "google_container_node_pool" "pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   region             = "${var.region}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_regional)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -144,8 +144,6 @@ resource "google_container_node_pool" "pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.primary"]
 }
 
 resource "null_resource" "wait_for_regional_cluster" {

diff --git a/autogen/cluster_zonal.tf b/autogen/cluster_zonal.tf
@@ -103,7 +103,7 @@ resource "google_container_node_pool" "zonal_pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   zone               = "${var.zones[0]}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.zonal_primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_zonal)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -144,8 +144,6 @@ resource "google_container_node_pool" "zonal_pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.zonal_primary"]
 }
 
 resource "null_resource" "wait_for_zonal_cluster" {

diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   region             = "${var.region}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_regional)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -137,8 +137,6 @@ resource "google_container_node_pool" "pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.primary"]
 }
 
 resource "null_resource" "wait_for_regional_cluster" {

diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "zonal_pools" {
   name               = "${lookup(var.node_pools[count.index], "name")}"
   project            = "${var.project_id}"
   zone               = "${var.zones[0]}"
-  cluster            = "${var.name}"
+  cluster            = "${google_container_cluster.zonal_primary.name}"
   version            = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_zonal)}"
   initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
 
@@ -137,8 +137,6 @@ resource "google_container_node_pool" "zonal_pools" {
     update = "30m"
     delete = "30m"
   }
-
-  depends_on = ["google_container_cluster.zonal_primary"]
 }
 
 resource "null_resource" "wait_for_zonal_cluster" {

diff --git a/modules/private-cluster/README.md b/modules/private-cluster/README.md
@@ -8,6 +8,8 @@ The resources/services/activations/deletions that this module will create/trigge
 - Activate network policy if `network_policy` is true
 - Add `ip-masq-agent` configmap with provided `non_masquerade_cidrs` if `network_policy` is true
 
+**Note**: You must run Terraform from a VM on the same VPC as your cluster, otherwise there will be issues connecting to the GKE master.
+
 ## Usage
 There are multiple examples included in the [examples](./examples/) folder but simple usage is as follows:
 
@@ -225,7 +227,7 @@ The root module is generated by running `make generate`. Changes to this reposit
 ### Requirements
 - [bundler](https://github.com/bundler/bundler)
 - [gcloud](https://cloud.google.com/sdk/install)
-- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.3.0
+- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.6.0
 
 ### Autogeneration of documentation from .tf files
 Run