Skip to content

Commit 16dd047

Browse files
q2wq2w
authored
chore: Update version for terraform-google-modules/vm/google//modules/instance_template (#441)
1 parent 13602f7 commit 16dd047

File tree

14 files changed

+924
-747
lines changed

14 files changed

+924
-747
lines changed

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ docker_test_lint:
7676
.PHONY: docker_generate_docs
7777
docker_generate_docs:
7878
docker run --rm -it \
79+
-e ENABLE_BPMETADATA \
7980
-v "$(CURDIR)":/workspace \
8081
$(REGISTRY_URL)/${DOCKER_IMAGE_DEVELOPER_TOOLS}:${DOCKER_TAG_VERSION_DEVELOPER_TOOLS} \
8182
/bin/bash -c 'source /usr/local/bin/task_helper_functions.sh && generate_docs'

‎examples/cdn-policy/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module "cloud-nat" {
5151

5252
module "mig_template" {
5353
source = "terraform-google-modules/vm/google//modules/instance_template"
54-
version = "~> 8.0"
54+
version = "~> 11.1"
5555
network = google_compute_network.default.self_link
5656
subnetwork = google_compute_subnetwork.default.self_link
5757
project_id = var.project_id
@@ -69,7 +69,7 @@ module "mig_template" {
6969

7070
module "mig" {
7171
source = "terraform-google-modules/vm/google//modules/mig"
72-
version = "~> 8.0"
72+
version = "~> 11.1"
7373
project_id = var.project_id
7474
instance_template = module.mig_template.self_link
7575
region = local.region

‎examples/certificate-map/mig.tf‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ data "template_file" "group1-startup-script" {
2424

2525
module "mig1_template" {
2626
source = "terraform-google-modules/vm/google//modules/instance_template"
27-
version = "~> 7.9"
27+
version = "~> 11.1"
2828
network = google_compute_network.default.self_link
2929
subnetwork = google_compute_subnetwork.group1.self_link
3030
service_account = {
@@ -43,7 +43,7 @@ module "mig1_template" {
4343

4444
module "mig1" {
4545
source = "terraform-google-modules/vm/google//modules/mig"
46-
version = "7.9.0"
46+
version = "~> 11.1"
4747
instance_template = module.mig1_template.self_link
4848
region = var.group1_region
4949
hostname = "${var.network_name}-group1"
@@ -52,6 +52,4 @@ module "mig1" {
5252
name = "http",
5353
port = 80
5454
}]
55-
network = google_compute_network.default.self_link
56-
subnetwork = google_compute_subnetwork.group1.self_link
5755
}

‎examples/cross-project-mig-backend/mig.tf‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ resource "google_compute_shared_vpc_service_project" "service" {
9191

9292
module "mig_template" {
9393
source = "terraform-google-modules/vm/google//modules/instance_template"
94-
version = "~> 7.9"
94+
version = "~> 11.1"
9595
project_id = var.project_id_1
9696
network = google_compute_network.default.self_link
9797
subnetwork = "${var.network_name}-${var.region}"
@@ -111,7 +111,7 @@ module "mig_template" {
111111

112112
module "mig" {
113113
source = "terraform-google-modules/vm/google//modules/mig"
114-
version = "~> 7.9"
114+
version = "~> 11.1"
115115
project_id = var.project_id_1
116116
instance_template = module.mig_template.self_link
117117
region = var.region
@@ -121,8 +121,6 @@ module "mig" {
121121
name = "http",
122122
port = 80
123123
}]
124-
network = google_compute_network.default.self_link
125-
subnetwork = google_compute_subnetwork.default.self_link
126124
depends_on = [
127125
google_compute_subnetwork.default,
128126
google_compute_shared_vpc_service_project.service

‎examples/https-redirect/main.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,15 +60,17 @@ data "template_file" "group-startup-script" {
6060

6161
module "mig_template" {
6262
source = "terraform-google-modules/vm/google//modules/instance_template"
63-
version = "~> 7.9"
63+
version = "~> 11.1"
6464
network = google_compute_network.default.self_link
6565
subnetwork = google_compute_subnetwork.default.self_link
6666
service_account = {
6767
email = ""
6868
scopes = ["cloud-platform"]
6969
}
70-
name_prefix = var.network_name
71-
startup_script = data.template_file.group-startup-script.rendered
70+
name_prefix = var.network_name
71+
source_image_family = "ubuntu-2004-lts"
72+
source_image_project = "ubuntu-os-cloud"
73+
startup_script = data.template_file.group-startup-script.rendered
7274
tags = [
7375
var.network_name,
7476
module.cloud-nat.router_name
@@ -77,7 +79,7 @@ module "mig_template" {
7779

7880
module "mig" {
7981
source = "terraform-google-modules/vm/google//modules/mig"
80-
version = "~> 7.9"
82+
version = "~> 11.1"
8183
instance_template = module.mig_template.self_link
8284
region = var.region
8385
hostname = var.network_name
@@ -86,8 +88,6 @@ module "mig" {
8688
name = "http",
8789
port = 80
8890
}]
89-
network = google_compute_network.default.self_link
90-
subnetwork = google_compute_subnetwork.default.self_link
9191
}
9292

9393
# [START cloudloadbalancing_ext_http_gce_http_redirect]

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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 = "~> 7.9"
63+
version = "~> 11.1"
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 = "~> 7.9"
80+
version = "~> 11.1"
8181
instance_template = module.mig_template.self_link
8282
region = var.region
8383
hostname = var.network_name
@@ -86,8 +86,6 @@ module "mig" {
8686
name = "http",
8787
port = 80
8888
}]
89-
network = google_compute_network.default.self_link
90-
subnetwork = google_compute_subnetwork.default.self_link
9189
}
9290

9391
module "gce-lb-http" {

‎examples/multi-backend-multi-mig-bucket-https-lb/mig.tf‎

Lines changed: 6 additions & 12 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 = "~> 7.9"
43+
version = "~> 11.1"
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 = "~> 7.9"
62+
version = "~> 11.1"
6363
instance_template = module.mig1_template.self_link
6464
region = var.group1_region
6565
hostname = "${var.network_name}-group1"
@@ -68,13 +68,11 @@ module "mig1" {
6868
name = "http",
6969
port = 80
7070
}]
71-
network = google_compute_network.default.self_link
72-
subnetwork = google_compute_subnetwork.group1.self_link
7371
}
7472

7573
module "mig2_template" {
7674
source = "terraform-google-modules/vm/google//modules/instance_template"
77-
version = "~> 7.9"
75+
version = "~> 11.1"
7876
network = google_compute_network.default.self_link
7977
subnetwork = google_compute_subnetwork.group2.self_link
8078
service_account = {
@@ -93,7 +91,7 @@ module "mig2_template" {
9391

9492
module "mig2" {
9593
source = "terraform-google-modules/vm/google//modules/mig"
96-
version = "~> 7.9"
94+
version = "~> 11.1"
9795
instance_template = module.mig2_template.self_link
9896
region = var.group2_region
9997
hostname = "${var.network_name}-group2"
@@ -102,14 +100,12 @@ module "mig2" {
102100
name = "http",
103101
port = 80
104102
}]
105-
network = google_compute_network.default.self_link
106-
subnetwork = google_compute_subnetwork.group2.self_link
107103
}
108104

109105

110106
module "mig3_template" {
111107
source = "terraform-google-modules/vm/google//modules/instance_template"
112-
version = "~> 7.9"
108+
version = "~> 11.1"
113109
network = google_compute_network.default.self_link
114110
subnetwork = google_compute_subnetwork.group3.self_link
115111
service_account = {
@@ -128,7 +124,7 @@ module "mig3_template" {
128124

129125
module "mig3" {
130126
source = "terraform-google-modules/vm/google//modules/mig"
131-
version = "~> 7.9"
127+
version = "~> 11.1"
132128
instance_template = module.mig3_template.self_link
133129
region = var.group3_region
134130
hostname = "${var.network_name}-group3"
@@ -137,6 +133,4 @@ module "mig3" {
137133
name = "http",
138134
port = 80
139135
}]
140-
network = google_compute_network.default.self_link
141-
subnetwork = google_compute_subnetwork.group3.self_link
142136
}

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

Lines changed: 4 additions & 8 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 = "~> 7.9"
35+
version = "~> 11.1"
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 = "~> 7.9"
54+
version = "~> 11.1"
5555
instance_template = module.mig1_template.self_link
5656
region = var.group1_region
5757
hostname = "${var.network_prefix}-group1"
@@ -60,13 +60,11 @@ module "mig1" {
6060
name = "http",
6161
port = 80
6262
}]
63-
network = google_compute_network.default.self_link
64-
subnetwork = google_compute_subnetwork.group1.self_link
6563
}
6664

6765
module "mig2_template" {
6866
source = "terraform-google-modules/vm/google//modules/instance_template"
69-
version = "~> 7.9"
67+
version = "~> 11.1"
7068
network = google_compute_network.default.self_link
7169
subnetwork = google_compute_subnetwork.group2.self_link
7270
service_account = {
@@ -83,7 +81,7 @@ module "mig2_template" {
8381

8482
module "mig2" {
8583
source = "terraform-google-modules/vm/google//modules/mig"
86-
version = "~> 7.9"
84+
version = "~> 11.1"
8785
instance_template = module.mig2_template.self_link
8886
region = var.group2_region
8987
hostname = "${var.network_prefix}-group2"
@@ -92,6 +90,4 @@ module "mig2" {
9290
name = "http",
9391
port = 80
9492
}]
95-
network = google_compute_network.default.self_link
96-
subnetwork = google_compute_subnetwork.group2.self_link
9793
}

‎examples/multiple-certs/mig.tf‎

Lines changed: 14 additions & 16 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 = "~> 7.9"
43+
version = "~> 11.1"
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 = "7.9.0"
62+
version = "~> 11.1"
6363
instance_template = module.mig1_template.self_link
6464
region = var.group1_region
6565
hostname = "${var.network_name}-group1"
@@ -68,21 +68,21 @@ module "mig1" {
6868
name = "http",
6969
port = 80
7070
}]
71-
network = google_compute_network.default.self_link
72-
subnetwork = google_compute_subnetwork.group1.self_link
7371
}
7472

7573
module "mig2_template" {
7674
source = "terraform-google-modules/vm/google//modules/instance_template"
77-
version = "~> 7.9"
75+
version = "~> 11.1"
7876
network = google_compute_network.default.self_link
7977
subnetwork = google_compute_subnetwork.group2.self_link
8078
service_account = {
8179
email = ""
8280
scopes = ["cloud-platform"]
8381
}
84-
name_prefix = "${var.network_name}-group2"
85-
startup_script = data.template_file.group2-startup-script.rendered
82+
name_prefix = "${var.network_name}-group2"
83+
startup_script = data.template_file.group2-startup-script.rendered
84+
source_image_family = "ubuntu-2004-lts"
85+
source_image_project = "ubuntu-os-cloud"
8686
tags = [
8787
"${var.network_name}-group2",
8888
module.cloud-nat-group2.router_name
@@ -91,7 +91,7 @@ module "mig2_template" {
9191

9292
module "mig2" {
9393
source = "terraform-google-modules/vm/google//modules/mig"
94-
version = "~> 7.9"
94+
version = "~> 11.1"
9595
instance_template = module.mig2_template.self_link
9696
region = var.group2_region
9797
hostname = "${var.network_name}-group2"
@@ -100,22 +100,22 @@ module "mig2" {
100100
name = "http",
101101
port = 80
102102
}]
103-
network = google_compute_network.default.self_link
104-
subnetwork = google_compute_subnetwork.group2.self_link
105103
}
106104

107105

108106
module "mig3_template" {
109107
source = "terraform-google-modules/vm/google//modules/instance_template"
110-
version = "~> 7.9"
108+
version = "~> 11.1"
111109
network = google_compute_network.default.self_link
112110
subnetwork = google_compute_subnetwork.group3.self_link
113111
service_account = {
114112
email = ""
115113
scopes = ["cloud-platform"]
116114
}
117-
name_prefix = "${var.network_name}-group3"
118-
startup_script = data.template_file.group3-startup-script.rendered
115+
name_prefix = "${var.network_name}-group3"
116+
startup_script = data.template_file.group3-startup-script.rendered
117+
source_image_family = "ubuntu-2004-lts"
118+
source_image_project = "ubuntu-os-cloud"
119119
tags = [
120120
"${var.network_name}-group3",
121121
module.cloud-nat-group2.router_name
@@ -124,7 +124,7 @@ module "mig3_template" {
124124

125125
module "mig3" {
126126
source = "terraform-google-modules/vm/google//modules/mig"
127-
version = "~> 7.9"
127+
version = "~> 11.1"
128128
instance_template = module.mig3_template.self_link
129129
region = var.group3_region
130130
hostname = "${var.network_name}-group3"
@@ -133,7 +133,5 @@ module "mig3" {
133133
name = "http",
134134
port = 80
135135
}]
136-
network = google_compute_network.default.self_link
137-
subnetwork = google_compute_subnetwork.group3.self_link
138136
}
139137

‎examples/shared-vpc/mig.tf‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module "cloud-nat" {
5555

5656
module "mig_template" {
5757
source = "terraform-google-modules/vm/google//modules/instance_template"
58-
version = "~> 7.9"
58+
version = "~> 11.1"
5959
network = google_compute_network.default.self_link
6060
subnetwork = var.subnetwork
6161
subnetwork_project = var.host_project
@@ -70,7 +70,7 @@ module "mig_template" {
7070

7171
module "mig" {
7272
source = "terraform-google-modules/vm/google//modules/mig"
73-
version = "~> 7.9"
73+
version = "~> 11.1"
7474
instance_template = module.mig_template.self_link
7575
region = var.region
7676
hostname = var.network
@@ -79,6 +79,4 @@ module "mig" {
7979
name = "http",
8080
port = 80
8181
}]
82-
network = google_compute_network.default.self_link
83-
subnetwork = google_compute_subnetwork.default.self_link
8482
}

0 commit comments

Comments
 (0)