Skip to content

Commit

Permalink
Remove network datasource and make subnetwork conditional on firewall
Browse files Browse the repository at this point in the history 
Signed-off-by: Dev <Dev25@users.noreply.github.com>
  • Loading branch information
@Dev25
Dev25 committed Apr 22, 2020
1 parent 3f06a83 commit 8ffa5e8
Show file tree
Hide file tree
Showing 14 changed files with 21 additions and 63 deletions.
4 changes: 2 additions & 2 deletions autogen/main/main.tf.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
8 changes: 1 addition & 7 deletions autogen/main/networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

{{ autogeneration_note }}

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down
4 changes: 2 additions & 2 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-private-cluster-update-variant/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
8 changes: 1 addition & 7 deletions modules/beta-private-cluster-update-variant/networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

// This file was automatically generated from a template in ./autogen/main

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-private-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
8 changes: 1 addition & 7 deletions modules/beta-private-cluster/networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

// This file was automatically generated from a template in ./autogen/main

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down
4 changes: 2 additions & 2 deletions modules/beta-public-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
8 changes: 1 addition & 7 deletions modules/beta-public-cluster/networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

// This file was automatically generated from a template in ./autogen/main

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down
4 changes: 2 additions & 2 deletions modules/private-cluster-update-variant/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
8 changes: 1 addition & 7 deletions modules/private-cluster-update-variant/networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

// This file was automatically generated from a template in ./autogen/main

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down
4 changes: 2 additions & 2 deletions modules/private-cluster/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ locals {
// auto upgrade by defaults only for regional cluster as long it has multiple masters versus zonal clusters have only have a single master so upgrades are more dangerous.
default_auto_upgrade = var.regional ? true : false

cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.secondary_ip_range) : range.range_name => range.ip_cidr_range }
cluster_subnet_cidr = data.google_compute_subnetwork.gke_subnetwork.*.ip_cidr_range
cluster_alias_ranges_cidr = { for range in toset(data.google_compute_subnetwork.gke_subnetwork.*.secondary_ip_range) : range.range_name => range.ip_cidr_range }

cluster_network_policy = var.network_policy ? [{
enabled = true
Expand Down
8 changes: 1 addition & 7 deletions modules/private-cluster/networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

// This file was automatically generated from a template in ./autogen/main

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down
8 changes: 1 addition & 7 deletions networks.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,10 @@

// This file was automatically generated from a template in ./autogen/main

data "google_compute_network" "gke_network" {
provider = google

name = var.network
project = local.network_project_id
}

data "google_compute_subnetwork" "gke_subnetwork" {
provider = google

count = var.add_cluster_firewall_rules ? 1 : 0
name = var.subnetwork
region = local.region
project = local.network_project_id
Expand Down

0 comments on commit 8ffa5e8

Please sign in to comment.