feat: Allow global access to internal loadbalancers with var.global_a…

…ccess (#34)
terraform-google-modules · May 27, 2020 · 4c0a9cf · 4c0a9cf
1 parent eb96515
commit 4c0a9cf
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 15 deletions.
diff --git a/examples/minimal/main.tf b/examples/minimal/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider google {
-  version = "~> 2.20"
+  version = "~> 3.14.0"
 }
 
 provider "random" {
@@ -64,7 +64,7 @@ resource "google_compute_subnetwork" "test" {
 }
 
 module "test_ilb" {
-  source = "../../"
+  source       = "../../"
   project      = var.project_id
   network      = google_compute_network.test.name
   subnetwork   = google_compute_subnetwork.test.name

diff --git a/examples/simple/main.tf b/examples/simple/main.tf
@@ -15,7 +15,7 @@
  */
 
 provider "google" {
-  version = "~> 2.20"
+  version = "~> 3.14.0"
 }
 
 module "gce-lb-fr" {
@@ -30,7 +30,7 @@ module "gce-lb-fr" {
 }
 
 module "gce-ilb" {
-  source = "../../"
+  source       = "../../"
   project      = var.project
   region       = var.region
   name         = "group-ilb"

diff --git a/examples/simple/mig.tf b/examples/simple/mig.tf
@@ -16,7 +16,7 @@
 
 module "instance_template1" {
   source             = "terraform-google-modules/vm/google//modules/instance_template"
-  version            = "~> 1.1"
+  version            = "~> 2.1.0"
   project_id         = var.project
   subnetwork         = var.subnetwork
   subnetwork_project = var.subnetwork_project
@@ -27,7 +27,7 @@ module "instance_template1" {
 
 module "instance_template2" {
   source             = "terraform-google-modules/vm/google//modules/instance_template"
-  version            = "~> 1.1"
+  version            = "~> 2.1.0"
   project_id         = var.project
   subnetwork         = var.subnetwork
   subnetwork_project = var.subnetwork_project
@@ -38,7 +38,7 @@ module "instance_template2" {
 
 module "instance_template3" {
   source             = "terraform-google-modules/vm/google//modules/instance_template"
-  version            = "~> 1.1"
+  version            = "~> 2.1.0"
   project_id         = var.project
   subnetwork         = var.subnetwork
   subnetwork_project = var.subnetwork_project
@@ -49,7 +49,7 @@ module "instance_template3" {
 
 module "mig1" {
   source             = "terraform-google-modules/vm/google//modules/mig"
-  version            = "~> 1.1"
+  version            = "~> 2.1.0"
   project_id         = var.project
   subnetwork_project = var.subnetwork_project
   region             = var.region
@@ -61,7 +61,7 @@ module "mig1" {
 
 module "mig2" {
   source             = "terraform-google-modules/vm/google//modules/mig"
-  version            = "~> 1.1"
+  version            = "~> 2.1.0"
   project_id         = var.project
   subnetwork_project = var.subnetwork_project
   region             = var.region
@@ -72,7 +72,7 @@ module "mig2" {
 
 module "mig3" {
   source             = "terraform-google-modules/vm/google//modules/mig"
-  version            = "~> 1.1"
+  version            = "~> 2.1.0"
   project_id         = var.project
   subnetwork_project = var.subnetwork_project
   region             = var.region

diff --git a/main.tf b/main.tf
@@ -33,6 +33,7 @@ resource "google_compute_forwarding_rule" "default" {
   region                = var.region
   network               = data.google_compute_network.network.self_link
   subnetwork            = data.google_compute_subnetwork.network.self_link
+  allow_global_access   = var.global_access
   load_balancing_scheme = "INTERNAL"
   backend_service       = google_compute_region_backend_service.default.self_link
   ip_address            = var.ip_address

diff --git a/test/fixtures/minimal/main.tf b/test/fixtures/minimal/main.tf
@@ -15,7 +15,7 @@
  */
 
 module "example" {
-  source          = "../../../examples/minimal"
-  region          = var.region
-  project_id      = var.project_id
+  source     = "../../../examples/minimal"
+  region     = var.region
+  project_id = var.project_id
 }
diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -16,7 +16,7 @@
 
 module "project-ci-lb-internal" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 3.0"
+  version = "~> 4.0"
 
   name              = "ci-int-lb-internal"
   random_project_id = "true"

diff --git a/test/setup/versions.tf b/test/setup/versions.tf
@@ -19,7 +19,7 @@ terraform {
 }
 
 provider "google" {
-  version = "~> 2.13.0"
+  version = "~> 3.14.0"
 }
 
 provider "google-beta" {

diff --git a/variables.tf b/variables.tf
@@ -24,6 +24,12 @@ variable "region" {
   default     = "us-central1"
 }
 
+variable "global_access" {
+  description = "Allow all regions on the same VPC network access."
+  type        = bool
+  default     = false
+}
+
 variable "network" {
   description = "Name of the network to create resources in."
   default     = "default"