Skip to content

Commit 447611b

Browse files
cloud-foundation-botJamesDuncanNz
cloud-foundation-bot
and
JamesDuncanNz
authored
feat!: add Terraform 0.13 constraint and module attribution (#157)
* feat!: add Terraform 0.13 constraint and module attribution * Updated Cloud Nat and VM module versions. Co-authored-by: James Duncan <[email protected]>
1 parent a98025b commit 447611b

File tree

20 files changed

+136
-56
lines changed

20 files changed

+136
-56
lines changed

‎README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,10 @@ Modular Global HTTP Load Balancer for GCE using forwarding rules.
1919

2020
## Compatibility
2121

22-
This module is meant for use with Terraform 0.12. If you haven't [upgraded](https://www.terraform.io/upgrade-guides/0-12.html) and
23-
need a Terraform 0.11.x-compatible version of this module, the last released version intended for Terraform 0.11.x is
24-
[1.0.10](https://registry.terraform.io/modules/GoogleCloudPlatform/lb-http/google/1.0.10).
22+
This module is meant for use with Terraform 0.13. If you haven't
23+
[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
24+
0.12.x-compatible version of this module, the last released version
25+
intended for Terraform 0.12.x is [v4.5.0](https://registry.terraform.io/modules/terraform-google-modules/-lb-http/google/v4.5.0).
2526

2627
## Usage
2728

‎autogen/README.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ behind a Cloud Load Balancer.
3535

3636
## Compatibility
3737

38-
This module is meant for use with Terraform 0.12. If you haven't [upgraded](https://www.terraform.io/upgrade-guides/0-12.html) and
39-
need a Terraform 0.11.x-compatible version of this module, the last released version intended for Terraform 0.11.x is
40-
[1.0.10](https://registry.terraform.io/modules/GoogleCloudPlatform/lb-http/google/1.0.10).
38+
This module is meant for use with Terraform 0.13. If you haven't
39+
[upgraded](https://www.terraform.io/upgrade-guides/0-13.html) and need a Terraform
40+
0.12.x-compatible version of this module, the last released version
41+
intended for Terraform 0.12.x is [v4.5.0](https://registry.terraform.io/modules/terraform-google-modules/-lb-http/google/v4.5.0).
4142

4243
## Usage
4344

‎autogen/versions.tf.tmpl‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* Copyright 2020 Google LLC
2+
* Copyright 2021 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -15,9 +15,37 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12.6"
18+
required_version = ">= 0.13"
1919
required_providers {
20-
google = ">= 3.32, <4.0.0"
21-
google-beta = ">= 3.32, <4.0.0"
20+
21+
google = {
22+
source = "hashicorp/google"
23+
version = "~> 3.53"
24+
}
25+
google-beta = {
26+
source = "hashicorp/google-beta"
27+
version = "~> 3.53"
28+
}
29+
}
30+
31+
provider_meta "google" {
32+
{% if serverless %}
33+
module_name = "blueprints/terraform/terraform-google-lb-http:serverless_negs/v1.0.0"
34+
{% elif dynamic_backends %}
35+
module_name = "blueprints/terraform/terraform-google-lb-http:dynamic_backends/v1.0.0"
36+
{% else %}
37+
module_name = "blueprints/terraform/terraform-google-lb-http/v1.0.0"
38+
{% endif %}
2239
}
40+
41+
provider_meta "google-beta" {
42+
{% if serverless %}
43+
module_name = "blueprints/terraform/terraform-google-lb-http:serverless_negs/v1.0.0"
44+
{% elif dynamic_backends %}
45+
module_name = "blueprints/terraform/terraform-google-lb-http:dynamic_backends/v1.0.0"
46+
{% else %}
47+
module_name = "blueprints/terraform/terraform-google-lb-http/v1.0.0"
48+
{% endif %}
49+
}
50+
2351
}

‎examples/https-gke/gke-node-port/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,12 +118,12 @@ resource "kubernetes_replication_controller" "nginx" {
118118
name = "nginx"
119119

120120
resources {
121-
limits {
121+
limits = {
122122
cpu = "0.5"
123123
memory = "512Mi"
124124
}
125125

126-
requests {
126+
requests = {
127127
cpu = "250m"
128128
memory = "50Mi"
129129
}

‎examples/https-redirect/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ resource "google_compute_router" "default" {
4343

4444
module "cloud-nat" {
4545
source = "terraform-google-modules/cloud-nat/google"
46-
version = "1.0.0"
46+
version = "1.4.0"
4747
router = google_compute_router.default.name
4848
project_id = var.project
4949
region = var.region
@@ -60,7 +60,7 @@ data "template_file" "group-startup-script" {
6060

6161
module "mig_template" {
6262
source = "terraform-google-modules/vm/google//modules/instance_template"
63-
version = "1.0.0"
63+
version = "6.2.0"
6464
network = google_compute_network.default.self_link
6565
subnetwork = google_compute_subnetwork.default.self_link
6666
service_account = {
@@ -77,7 +77,7 @@ module "mig_template" {
7777

7878
module "mig" {
7979
source = "terraform-google-modules/vm/google//modules/mig"
80-
version = "1.0.0"
80+
version = "6.2.0"
8181
instance_template = module.mig_template.self_link
8282
region = var.region
8383
hostname = var.network_name

‎examples/mig-nat-http-lb/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ resource "google_compute_router" "default" {
4343

4444
module "cloud-nat" {
4545
source = "terraform-google-modules/cloud-nat/google"
46-
version = "1.0.0"
46+
version = "1.4.0"
4747
router = google_compute_router.default.name
4848
project_id = var.project
4949
region = var.region
@@ -60,7 +60,7 @@ data "template_file" "group-startup-script" {
6060

6161
module "mig_template" {
6262
source = "terraform-google-modules/vm/google//modules/instance_template"
63-
version = "1.0.0"
63+
version = "6.2.0"
6464
network = google_compute_network.default.self_link
6565
subnetwork = google_compute_subnetwork.default.self_link
6666
service_account = {
@@ -77,7 +77,7 @@ module "mig_template" {
7777

7878
module "mig" {
7979
source = "terraform-google-modules/vm/google//modules/mig"
80-
version = "1.0.0"
80+
version = "6.2.0"
8181
instance_template = module.mig_template.self_link
8282
region = var.region
8383
hostname = var.network_name

‎examples/multi-mig-http-lb/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ resource "google_compute_router" "group1" {
3636

3737
module "cloud-nat-group1" {
3838
source = "terraform-google-modules/cloud-nat/google"
39-
version = "1.0.0"
39+
version = "1.4.0"
4040
router = google_compute_router.group1.name
4141
project_id = var.project
4242
region = var.group1_region
@@ -60,7 +60,7 @@ resource "google_compute_router" "group2" {
6060

6161
module "cloud-nat-group2" {
6262
source = "terraform-google-modules/cloud-nat/google"
63-
version = "1.0.0"
63+
version = "1.4.0"
6464
router = google_compute_router.group2.name
6565
project_id = var.project
6666
region = var.group2_region

‎examples/multi-mig-http-lb/mig.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ data "template_file" "group-startup-script" {
3232

3333
module "mig1_template" {
3434
source = "terraform-google-modules/vm/google//modules/instance_template"
35-
version = "1.0.0"
35+
version = "6.2.0"
3636
network = google_compute_network.default.self_link
3737
subnetwork = google_compute_subnetwork.group1.self_link
3838
service_account = {
@@ -51,7 +51,7 @@ module "mig1_template" {
5151

5252
module "mig1" {
5353
source = "terraform-google-modules/vm/google//modules/mig"
54-
version = "1.0.0"
54+
version = "6.2.0"
5555
instance_template = module.mig1_template.self_link
5656
region = var.group1_region
5757
hostname = "${var.network_prefix}-group1"
@@ -66,7 +66,7 @@ module "mig1" {
6666

6767
module "mig2_template" {
6868
source = "terraform-google-modules/vm/google//modules/instance_template"
69-
version = "1.0.0"
69+
version = "6.2.0"
7070
network = google_compute_network.default.self_link
7171
subnetwork = google_compute_subnetwork.group2.self_link
7272
service_account = {
@@ -83,7 +83,7 @@ module "mig2_template" {
8383

8484
module "mig2" {
8585
source = "terraform-google-modules/vm/google//modules/mig"
86-
version = "1.0.0"
86+
version = "6.2.0"
8787
instance_template = module.mig2_template.self_link
8888
region = var.group2_region
8989
hostname = "${var.network_prefix}-group2"

‎examples/multiple-certs/main.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ resource "google_compute_router" "group1" {
4444

4545
module "cloud-nat-group1" {
4646
source = "terraform-google-modules/cloud-nat/google"
47-
version = "1.0.0"
47+
version = "1.4.0"
4848
router = google_compute_router.group1.name
4949
project_id = var.project
5050
region = var.group1_region
@@ -68,7 +68,7 @@ resource "google_compute_router" "group2" {
6868

6969
module "cloud-nat-group2" {
7070
source = "terraform-google-modules/cloud-nat/google"
71-
version = "1.0.0"
71+
version = "1.4.0"
7272
router = google_compute_router.group2.name
7373
project_id = var.project
7474
region = var.group2_region
@@ -92,7 +92,7 @@ resource "google_compute_router" "group3" {
9292

9393
module "cloud-nat-group3" {
9494
source = "terraform-google-modules/cloud-nat/google"
95-
version = "1.0.0"
95+
version = "1.4.0"
9696
router = google_compute_router.group3.name
9797
project_id = var.project
9898
region = var.group3_region

‎examples/multiple-certs/mig.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data "template_file" "group3-startup-script" {
4040

4141
module "mig1_template" {
4242
source = "terraform-google-modules/vm/google//modules/instance_template"
43-
version = "1.0.0"
43+
version = "6.2.0"
4444
network = google_compute_network.default.self_link
4545
subnetwork = google_compute_subnetwork.group1.self_link
4646
service_account = {
@@ -59,7 +59,7 @@ module "mig1_template" {
5959

6060
module "mig1" {
6161
source = "terraform-google-modules/vm/google//modules/mig"
62-
version = "1.0.0"
62+
version = "6.2.0"
6363
instance_template = module.mig1_template.self_link
6464
region = var.group1_region
6565
hostname = "${var.network_name}-group1"
@@ -74,7 +74,7 @@ module "mig1" {
7474

7575
module "mig2_template" {
7676
source = "terraform-google-modules/vm/google//modules/instance_template"
77-
version = "1.0.0"
77+
version = "6.2.0"
7878
network = google_compute_network.default.self_link
7979
subnetwork = google_compute_subnetwork.group2.self_link
8080
service_account = {
@@ -91,7 +91,7 @@ module "mig2_template" {
9191

9292
module "mig2" {
9393
source = "terraform-google-modules/vm/google//modules/mig"
94-
version = "1.0.0"
94+
version = "6.2.0"
9595
instance_template = module.mig2_template.self_link
9696
region = var.group2_region
9797
hostname = "${var.network_name}-group2"
@@ -107,7 +107,7 @@ module "mig2" {
107107

108108
module "mig3_template" {
109109
source = "terraform-google-modules/vm/google//modules/instance_template"
110-
version = "1.0.0"
110+
version = "6.2.0"
111111
network = google_compute_network.default.self_link
112112
subnetwork = google_compute_subnetwork.group3.self_link
113113
service_account = {
@@ -124,7 +124,7 @@ module "mig3_template" {
124124

125125
module "mig3" {
126126
source = "terraform-google-modules/vm/google//modules/mig"
127-
version = "1.0.0"
127+
version = "6.2.0"
128128
instance_template = module.mig3_template.self_link
129129
region = var.group3_region
130130
hostname = "${var.network_name}-group3"

0 commit comments

Comments
 (0)