Skip to content

Commit 8571f61

Browse files
ChandranshuRao14ChandranshuRao14
authored
Fix: Rolled back to basic path routing for networks (#434)
* rolled back network data source * increase timeouts to 45m
1 parent 2016e01 commit 8571f61

File tree

13 files changed

+56
-256
lines changed

13 files changed

+56
-256
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ resource "google_container_cluster" "primary" {
3434
location = local.location
3535
node_locations = local.node_locations
3636
cluster_ipv4_cidr = var.cluster_ipv4_cidr
37-
network = data.google_compute_network.gke_network.self_link
37+
network = "projects/${local.network_project_id}/global/networks/${var.network}"
3838

3939
dynamic "network_policy" {
4040
for_each = local.cluster_network_policy
@@ -55,7 +55,7 @@ resource "google_container_cluster" "primary" {
5555
}
5656
{% endif %}
5757

58-
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
58+
subnetwork = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
5959

6060
{% if beta_cluster %}
6161
min_master_version = var.release_channel != null ? null : local.master_version
@@ -189,9 +189,9 @@ resource "google_container_cluster" "primary" {
189189
}
190190

191191
timeouts {
192-
create = "30m"
193-
update = "30m"
194-
delete = "30m"
192+
create = "45m"
193+
update = "45m"
194+
delete = "45m"
195195
}
196196

197197
node_pool {
@@ -486,9 +486,9 @@ resource "google_container_node_pool" "pools" {
486486
}
487487

488488
timeouts {
489-
create = "30m"
490-
update = "30m"
491-
delete = "30m"
489+
create = "45m"
490+
update = "45m"
491+
delete = "45m"
492492
}
493493
}
494494

‎autogen/main/networks.tf.tmpl‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎cluster.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
3030
location = local.location
3131
node_locations = local.node_locations
3232
cluster_ipv4_cidr = var.cluster_ipv4_cidr
33-
network = data.google_compute_network.gke_network.self_link
33+
network = "projects/${local.network_project_id}/global/networks/${var.network}"
3434

3535
dynamic "network_policy" {
3636
for_each = local.cluster_network_policy
@@ -42,7 +42,7 @@ resource "google_container_cluster" "primary" {
4242
}
4343

4444

45-
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
45+
subnetwork = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
4646

4747
min_master_version = local.master_version
4848

@@ -101,9 +101,9 @@ resource "google_container_cluster" "primary" {
101101
}
102102

103103
timeouts {
104-
create = "30m"
105-
update = "30m"
106-
delete = "30m"
104+
create = "45m"
105+
update = "45m"
106+
delete = "45m"
107107
}
108108

109109
node_pool {
@@ -218,9 +218,9 @@ resource "google_container_node_pool" "pools" {
218218
}
219219

220220
timeouts {
221-
create = "30m"
222-
update = "30m"
223-
delete = "30m"
221+
create = "45m"
222+
update = "45m"
223+
delete = "45m"
224224
}
225225
}
226226

‎modules/beta-private-cluster-update-variant/cluster.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
3030
location = local.location
3131
node_locations = local.node_locations
3232
cluster_ipv4_cidr = var.cluster_ipv4_cidr
33-
network = data.google_compute_network.gke_network.self_link
33+
network = "projects/${local.network_project_id}/global/networks/${var.network}"
3434

3535
dynamic "network_policy" {
3636
for_each = local.cluster_network_policy
@@ -49,7 +49,7 @@ resource "google_container_cluster" "primary" {
4949
}
5050
}
5151

52-
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
52+
subnetwork = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
5353

5454
min_master_version = var.release_channel != null ? null : local.master_version
5555

@@ -169,9 +169,9 @@ resource "google_container_cluster" "primary" {
169169
}
170170

171171
timeouts {
172-
create = "30m"
173-
update = "30m"
174-
delete = "30m"
172+
create = "45m"
173+
update = "45m"
174+
delete = "45m"
175175
}
176176

177177
node_pool {
@@ -438,9 +438,9 @@ resource "google_container_node_pool" "pools" {
438438
}
439439

440440
timeouts {
441-
create = "30m"
442-
update = "30m"
443-
delete = "30m"
441+
create = "45m"
442+
update = "45m"
443+
delete = "45m"
444444
}
445445
}
446446

‎modules/beta-private-cluster-update-variant/networks.tf‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
3030
location = local.location
3131
node_locations = local.node_locations
3232
cluster_ipv4_cidr = var.cluster_ipv4_cidr
33-
network = data.google_compute_network.gke_network.self_link
33+
network = "projects/${local.network_project_id}/global/networks/${var.network}"
3434

3535
dynamic "network_policy" {
3636
for_each = local.cluster_network_policy
@@ -49,7 +49,7 @@ resource "google_container_cluster" "primary" {
4949
}
5050
}
5151

52-
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
52+
subnetwork = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
5353

5454
min_master_version = var.release_channel != null ? null : local.master_version
5555

@@ -169,9 +169,9 @@ resource "google_container_cluster" "primary" {
169169
}
170170

171171
timeouts {
172-
create = "30m"
173-
update = "30m"
174-
delete = "30m"
172+
create = "45m"
173+
update = "45m"
174+
delete = "45m"
175175
}
176176

177177
node_pool {
@@ -365,9 +365,9 @@ resource "google_container_node_pool" "pools" {
365365
}
366366

367367
timeouts {
368-
create = "30m"
369-
update = "30m"
370-
delete = "30m"
368+
create = "45m"
369+
update = "45m"
370+
delete = "45m"
371371
}
372372
}
373373

‎modules/beta-private-cluster/networks.tf‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎modules/beta-public-cluster/cluster.tf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
3030
location = local.location
3131
node_locations = local.node_locations
3232
cluster_ipv4_cidr = var.cluster_ipv4_cidr
33-
network = data.google_compute_network.gke_network.self_link
33+
network = "projects/${local.network_project_id}/global/networks/${var.network}"
3434

3535
dynamic "network_policy" {
3636
for_each = local.cluster_network_policy
@@ -49,7 +49,7 @@ resource "google_container_cluster" "primary" {
4949
}
5050
}
5151

52-
subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
52+
subnetwork = "projects/${local.network_project_id}/regions/${var.region}/subnetworks/${var.subnetwork}"
5353

5454
min_master_version = var.release_channel != null ? null : local.master_version
5555

@@ -169,9 +169,9 @@ resource "google_container_cluster" "primary" {
169169
}
170170

171171
timeouts {
172-
create = "30m"
173-
update = "30m"
174-
delete = "30m"
172+
create = "45m"
173+
update = "45m"
174+
delete = "45m"
175175
}
176176

177177
node_pool {
@@ -352,9 +352,9 @@ resource "google_container_node_pool" "pools" {
352352
}
353353

354354
timeouts {
355-
create = "30m"
356-
update = "30m"
357-
delete = "30m"
355+
create = "45m"
356+
update = "45m"
357+
delete = "45m"
358358
}
359359
}
360360

‎modules/beta-public-cluster/networks.tf‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)