Skip to content

Commit a9df188

Browse files
authored
Merge pull request #77 from JordanP/implicit_depends_on
Node pool create: add an implicit dependency on parent cluster
2 parents 2a39908 + 1b7276d commit a9df188

File tree

4 files changed

+4
-12
lines changed

4 files changed

+4
-12
lines changed

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" {

0 commit comments

Comments
 (0)