Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Adds support for labels #96

Merged
merged 10 commits into from
Jun 27, 2022
Merged

feat!: Adds support for labels #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bdf4dbf
Adds support for labels
May 20, 2022
09637a2
Merge branch 'master' into label-support
bharathkkb Jun 16, 2022
5505339
Add provider_meta
Jun 21, 2022
a18c53c
forwarding rule does not need beta provider
Jun 22, 2022
3a79610
Use provider version 4.26
Jun 22, 2022
2a60503
Upgrade GCP/lb/google to 3.1
Jun 22, 2022
2e239a3
bump provider versions
Jun 22, 2022
f66baf4
bump test setup providers
Jun 22, 2022
387ea26
Update instance_template module to allow provider v4
Jun 23, 2022
af5db6e
Update project factory module to allow provider v4
Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion examples/minimal/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 3.62.0"
version = "~> 4.26.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.26.0"
}
random = {
source = "hashicorp/random"
Expand Down
2 changes: 1 addition & 1 deletion examples/simple/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "gce-lb-fr" {
source = "GoogleCloudPlatform/lb/google"
version = "~> 2.3"
version = "~> 3.1"
region = var.region
network = var.network
project = var.project
Expand Down
12 changes: 6 additions & 6 deletions examples/simple/mig.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "instance_template1" {
source = "terraform-google-modules/vm/google//modules/instance_template"
version = "~> 6.2.0"
version = "~> 7.8.0"
project_id = var.project
subnetwork = var.subnetwork
subnetwork_project = var.subnetwork_project
Expand All @@ -27,7 +27,7 @@ module "instance_template1" {

module "instance_template2" {
source = "terraform-google-modules/vm/google//modules/instance_template"
version = "~> 6.2.0"
version = "~> 7.8.0"
project_id = var.project
subnetwork = var.subnetwork
subnetwork_project = var.subnetwork_project
Expand All @@ -38,7 +38,7 @@ module "instance_template2" {

module "instance_template3" {
source = "terraform-google-modules/vm/google//modules/instance_template"
version = "~> 6.2.0"
version = "~> 7.8.0"
project_id = var.project
subnetwork = var.subnetwork
subnetwork_project = var.subnetwork_project
Expand All @@ -49,7 +49,7 @@ module "instance_template3" {

module "mig1" {
source = "terraform-google-modules/vm/google//modules/mig"
version = "~> 6.2.0"
version = "~> 7.8.0"
project_id = var.project
subnetwork_project = var.subnetwork_project
region = var.region
Expand All @@ -61,7 +61,7 @@ module "mig1" {

module "mig2" {
source = "terraform-google-modules/vm/google//modules/mig"
version = "~> 6.2.0"
version = "~> 7.8.0"
project_id = var.project
subnetwork_project = var.subnetwork_project
region = var.region
Expand All @@ -72,7 +72,7 @@ module "mig2" {

module "mig3" {
source = "terraform-google-modules/vm/google//modules/mig"
version = "~> 6.2.0"
version = "~> 7.8.0"
project_id = var.project
subnetwork_project = var.subnetwork_project
region = var.region
Expand Down
6 changes: 5 additions & 1 deletion examples/simple/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,11 @@ terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "~> 3.62.0"
version = "~> 4.26.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "~> 4.26.0"
}
random = {
source = "hashicorp/random"
Expand Down
1 change: 1 addition & 0 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ resource "google_compute_forwarding_rule" "default" {
ports = var.ports
all_ports = var.all_ports
service_label = var.service_label
labels = var.labels
}

resource "google_compute_region_backend_service" "default" {
Expand Down
2 changes: 1 addition & 1 deletion test/setup/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

module "project-ci-lb-internal" {
source = "terraform-google-modules/project-factory/google"
version = "~> 10.2"
version = "~> 13.0"

name = "ci-int-lb-internal"
random_project_id = true
Expand Down
4 changes: 2 additions & 2 deletions test/setup/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ terraform {
}

provider "google" {
version = "~> 3.62"
version = "~> 4.26"
}

provider "google-beta" {
version = "~> 3.62"
version = "~> 4.26"
}
6 changes: 6 additions & 0 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,9 @@ variable "firewall_enable_logging" {
default = false
type = bool
}

variable "labels" {
description = "The labels to attach to resources created by this module."
default = {}
type = map(string)
}
11 changes: 9 additions & 2 deletions versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,22 @@
terraform {
required_version = ">= 0.13"
required_providers {

google = {
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
version = ">= 4.26, < 5.0"
}

google-beta = {
source = "hashicorp/google-beta"
version = ">= 4.26, < 5.0"
}
}

provider_meta "google" {
willroberts marked this conversation as resolved.
Show resolved Hide resolved
module_name = "blueprints/terraform/terraform-google-lb-internal/v4.6.0"
}

provider_meta "google-beta" {
module_name = "blueprints/terraform/terraform-google-lb-internal/v4.6.0"
}
}