Skip to content

Commit

Permalink
Fix: Rolled back to basic path routing for networks (#434)
Browse files Browse the repository at this point in the history 
* rolled back network data source

* increase timeouts to 45m
  • Loading branch information
@ChandranshuRao14
ChandranshuRao14 committed Feb 19, 2020
1 parent 2016e01 commit 8571f61
Show file tree
Hide file tree
Showing 13 changed files with 56 additions and 256 deletions.
16 changes: 8 additions & 8 deletions autogen/main/cluster.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ resource "google_container_cluster" "primary" {
location = local.location
node_locations = local.node_locations
cluster_ipv4_cidr = var.cluster_ipv4_cidr
network = data.google_compute_network.gke_network.self_link
network = "projects/${local.network_project_id}/global/networks/${var.network}"

dynamic "network_policy" {
for_each = local.cluster_network_policy
Expand All @@ -55,7 +55,7 @@ resource "google_container_cluster" "primary" {
}
{% endif %}

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

{% if beta_cluster %}
min_master_version = var.release_channel != null ? null : local.master_version
Expand Down Expand Up @@ -189,9 +189,9 @@ resource "google_container_cluster" "primary" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}

node_pool {
Expand Down Expand Up @@ -486,9 +486,9 @@ resource "google_container_node_pool" "pools" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}
}

Expand Down
40 changes: 0 additions & 40 deletions autogen/main/networks.tf.tmpl
View file

This file was deleted.

16 changes: 8 additions & 8 deletions cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
location = local.location
node_locations = local.node_locations
cluster_ipv4_cidr = var.cluster_ipv4_cidr
network = data.google_compute_network.gke_network.self_link
network = "projects/${local.network_project_id}/global/networks/${var.network}"

dynamic "network_policy" {
for_each = local.cluster_network_policy
Expand All @@ -42,7 +42,7 @@ resource "google_container_cluster" "primary" {
}


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

min_master_version = local.master_version

Expand Down Expand Up @@ -101,9 +101,9 @@ resource "google_container_cluster" "primary" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}

node_pool {
Expand Down Expand Up @@ -218,9 +218,9 @@ resource "google_container_node_pool" "pools" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}
}

Expand Down
16 changes: 8 additions & 8 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
location = local.location
node_locations = local.node_locations
cluster_ipv4_cidr = var.cluster_ipv4_cidr
network = data.google_compute_network.gke_network.self_link
network = "projects/${local.network_project_id}/global/networks/${var.network}"

dynamic "network_policy" {
for_each = local.cluster_network_policy
Expand All @@ -49,7 +49,7 @@ resource "google_container_cluster" "primary" {
}
}

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

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

Expand Down Expand Up @@ -169,9 +169,9 @@ resource "google_container_cluster" "primary" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}

node_pool {
Expand Down Expand Up @@ -438,9 +438,9 @@ resource "google_container_node_pool" "pools" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}
}

Expand Down
32 changes: 0 additions & 32 deletions modules/beta-private-cluster-update-variant/networks.tf
View file

This file was deleted.

16 changes: 8 additions & 8 deletions modules/beta-private-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
location = local.location
node_locations = local.node_locations
cluster_ipv4_cidr = var.cluster_ipv4_cidr
network = data.google_compute_network.gke_network.self_link
network = "projects/${local.network_project_id}/global/networks/${var.network}"

dynamic "network_policy" {
for_each = local.cluster_network_policy
Expand All @@ -49,7 +49,7 @@ resource "google_container_cluster" "primary" {
}
}

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

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

Expand Down Expand Up @@ -169,9 +169,9 @@ resource "google_container_cluster" "primary" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}

node_pool {
Expand Down Expand Up @@ -365,9 +365,9 @@ resource "google_container_node_pool" "pools" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}
}

Expand Down
32 changes: 0 additions & 32 deletions modules/beta-private-cluster/networks.tf
View file

This file was deleted.

16 changes: 8 additions & 8 deletions modules/beta-public-cluster/cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource "google_container_cluster" "primary" {
location = local.location
node_locations = local.node_locations
cluster_ipv4_cidr = var.cluster_ipv4_cidr
network = data.google_compute_network.gke_network.self_link
network = "projects/${local.network_project_id}/global/networks/${var.network}"

dynamic "network_policy" {
for_each = local.cluster_network_policy
Expand All @@ -49,7 +49,7 @@ resource "google_container_cluster" "primary" {
}
}

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

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

Expand Down Expand Up @@ -169,9 +169,9 @@ resource "google_container_cluster" "primary" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}

node_pool {
Expand Down Expand Up @@ -352,9 +352,9 @@ resource "google_container_node_pool" "pools" {
}

timeouts {
create = "30m"
update = "30m"
delete = "30m"
create = "45m"
update = "45m"
delete = "45m"
}
}

Expand Down
32 changes: 0 additions & 32 deletions modules/beta-public-cluster/networks.tf
View file

This file was deleted.

Loading

0 comments on commit 8571f61

Please sign in to comment.