Skip to content

Commit fc43491

Browse files
authored
Merge branch 'master' into internal/remove-credentials-path
2 parents 4e8b4b5 + 5dc6786 commit fc43491

File tree

7 files changed

+9
-15
lines changed

7 files changed

+9
-15
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ The root module is generated by running `make generate`. Changes to this reposit
219219
### Requirements
220220
- [bundler](https://github.com/bundler/bundler)
221221
- [gcloud](https://cloud.google.com/sdk/install)
222-
- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.3.0
222+
- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.6.0
223223

224224
### Autogeneration of documentation from .tf files
225225
Run

autogen/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ The root module is generated by running `make generate`. Changes to this reposit
166166
### Requirements
167167
- [bundler](https://github.com/bundler/bundler)
168168
- [gcloud](https://cloud.google.com/sdk/install)
169-
- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.3.0
169+
- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.6.0
170170

171171
### Autogeneration of documentation from .tf files
172172
Run

autogen/cluster_regional.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ resource "google_container_node_pool" "pools" {
103103
name = "${lookup(var.node_pools[count.index], "name")}"
104104
project = "${var.project_id}"
105105
region = "${var.region}"
106-
cluster = "${var.name}"
106+
cluster = "${google_container_cluster.primary.name}"
107107
version = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_regional)}"
108108
initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
109109

@@ -144,8 +144,6 @@ resource "google_container_node_pool" "pools" {
144144
update = "30m"
145145
delete = "30m"
146146
}
147-
148-
depends_on = ["google_container_cluster.primary"]
149147
}
150148

151149
resource "null_resource" "wait_for_regional_cluster" {

autogen/cluster_zonal.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ resource "google_container_node_pool" "zonal_pools" {
103103
name = "${lookup(var.node_pools[count.index], "name")}"
104104
project = "${var.project_id}"
105105
zone = "${var.zones[0]}"
106-
cluster = "${var.name}"
106+
cluster = "${google_container_cluster.zonal_primary.name}"
107107
version = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_zonal)}"
108108
initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
109109

@@ -144,8 +144,6 @@ resource "google_container_node_pool" "zonal_pools" {
144144
update = "30m"
145145
delete = "30m"
146146
}
147-
148-
depends_on = ["google_container_cluster.zonal_primary"]
149147
}
150148

151149
resource "null_resource" "wait_for_zonal_cluster" {

cluster_regional.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "pools" {
9696
name = "${lookup(var.node_pools[count.index], "name")}"
9797
project = "${var.project_id}"
9898
region = "${var.region}"
99-
cluster = "${var.name}"
99+
cluster = "${google_container_cluster.primary.name}"
100100
version = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_regional)}"
101101
initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
102102

@@ -137,8 +137,6 @@ resource "google_container_node_pool" "pools" {
137137
update = "30m"
138138
delete = "30m"
139139
}
140-
141-
depends_on = ["google_container_cluster.primary"]
142140
}
143141

144142
resource "null_resource" "wait_for_regional_cluster" {

cluster_zonal.tf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ resource "google_container_node_pool" "zonal_pools" {
9696
name = "${lookup(var.node_pools[count.index], "name")}"
9797
project = "${var.project_id}"
9898
zone = "${var.zones[0]}"
99-
cluster = "${var.name}"
99+
cluster = "${google_container_cluster.zonal_primary.name}"
100100
version = "${lookup(var.node_pools[count.index], "auto_upgrade", false) ? "" : lookup(var.node_pools[count.index], "version", local.node_version_zonal)}"
101101
initial_node_count = "${lookup(var.node_pools[count.index], "initial_node_count", lookup(var.node_pools[count.index], "min_count", 1))}"
102102

@@ -137,8 +137,6 @@ resource "google_container_node_pool" "zonal_pools" {
137137
update = "30m"
138138
delete = "30m"
139139
}
140-
141-
depends_on = ["google_container_cluster.zonal_primary"]
142140
}
143141

144142
resource "null_resource" "wait_for_zonal_cluster" {

modules/private-cluster/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ The resources/services/activations/deletions that this module will create/trigge
88
- Activate network policy if `network_policy` is true
99
- Add `ip-masq-agent` configmap with provided `non_masquerade_cidrs` if `network_policy` is true
1010

11+
**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.
12+
1113
## Usage
1214
There are multiple examples included in the [examples](./examples/) folder but simple usage is as follows:
1315

@@ -225,7 +227,7 @@ The root module is generated by running `make generate`. Changes to this reposit
225227
### Requirements
226228
- [bundler](https://github.com/bundler/bundler)
227229
- [gcloud](https://cloud.google.com/sdk/install)
228-
- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.3.0
230+
- [terraform-docs](https://github.com/segmentio/terraform-docs/releases) 0.6.0
229231

230232
### Autogeneration of documentation from .tf files
231233
Run

0 commit comments

Comments
 (0)