File tree Expand file tree Collapse file tree 11 files changed +59
-22
lines changed
preemptible_and_regular_instance_templates Expand file tree Collapse file tree 11 files changed +59
-22
lines changed Original file line number Diff line number Diff line change 1818# Make will use bash instead of sh
1919SHELL := /usr/bin/env bash
2020
21- DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.12.2
21+ DOCKER_TAG_VERSION_DEVELOPER_TOOLS := 0.13
2222DOCKER_IMAGE_DEVELOPER_TOOLS := cft/developer-tools
2323REGISTRY_URL := gcr.io/cloud-foundation-cicd
2424
Original file line number Diff line number Diff line change @@ -8,9 +8,9 @@ This is a collection of opinionated submodules that can be used as building bloc
88
99## Compatibility
1010
11- This module is meant for use with Terraform 0.12 . If you haven't [ upgraded] ( https://www.terraform.io/upgrade-guides/0-12 .html )
12- and need a Terraform 0.11 .x-compatible version of this module, the last released version intended for
13- Terraform 0.11 .x is [ 0.2 .0] ( https://registry.terraform.io/modules/terraform-google-modules/vm/google/0.2 .0 ) .
11+ This module is meant for use with Terraform 0.13 . If you haven't [ upgraded] ( https://www.terraform.io/upgrade-guides/0-13 .html )
12+ and need a Terraform 0.12 .x-compatible version of this module, the last released version intended for
13+ Terraform 0.12 .x is [ 5.1 .0] ( https://registry.terraform.io/modules/terraform-google-modules/vm/google/5.1 .0 ) .
1414
1515
1616## Examples
Original file line number Diff line number Diff line change 1515 */
1616
1717terraform {
18- required_version = " >=0.12.6, <0.14 "
18+ required_version = ">=0.13.0 "
1919 required_providers {
20- google = " >= 2.7, <4.0"
21- google-beta = " >= 2.7, <4.0"
20+ google = ">= 3.43, <4.0"
21+ google-beta = ">= 3.43, <4.0"
22+ }
23+ provider_meta "google" {
24+ module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v6.0.0"
25+ }
26+ provider_meta "google-beta" {
27+ module_name = "blueprints/terraform/terraform-google-vm:{% if mig %}mig{% else %}mig_with_percent{% endif %}/v6.0.0"
2228 }
2329}
Original file line number Diff line number Diff line change @@ -246,4 +246,4 @@ tags:
246246- ' integration'
247247substitutions :
248248 _DOCKER_IMAGE_DEVELOPER_TOOLS : ' cft/developer-tools'
249- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS : ' 0.12.2 '
249+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS : ' 0.13 '
Original file line number Diff line number Diff line change 2121- ' lint'
2222substitutions :
2323 _DOCKER_IMAGE_DEVELOPER_TOOLS : ' cft/developer-tools'
24- _DOCKER_TAG_VERSION_DEVELOPER_TOOLS : ' 0.12.2 '
24+ _DOCKER_TAG_VERSION_DEVELOPER_TOOLS : ' 0.13 '
Original file line number Diff line number Diff line change 1515 */
1616
1717terraform {
18- required_version = " >=0.12.7, <0.14 "
18+ required_version = " >=0.13.0 "
1919 required_providers {
20- google = " >= 2.7, <4.0"
20+ google = " >= 3.43, <4.0"
21+ }
22+ provider_meta "google" {
23+ module_name = " blueprints/terraform/terraform-google-vm:compute_instance/v6.0.0"
2124 }
2225}
Original file line number Diff line number Diff line change 1515 */
1616
1717terraform {
18- required_version = " >=0.12.6, <0.14 "
18+ required_version = " >=0.13.0 "
1919 required_providers {
20- google = " >= 2.7, <4.0"
20+ google = " >= 3.43, <4.0"
21+ }
22+ provider_meta "google" {
23+ module_name = " blueprints/terraform/terraform-google-vm:instance_template/v6.0.0"
2124 }
2225}
Original file line number Diff line number Diff line change 1515 */
1616
1717terraform {
18- required_version = " >=0.12.6, <0.14 "
18+ required_version = " >=0.13.0 "
1919 required_providers {
20- google = " >= 2.7, <4.0"
21- google-beta = " >= 2.7, <4.0"
20+ google = " >= 3.43, <4.0"
21+ google-beta = " >= 3.43, <4.0"
22+ }
23+ provider_meta "google" {
24+ module_name = " blueprints/terraform/terraform-google-vm:mig/v6.0.0"
25+ }
26+ provider_meta "google-beta" {
27+ module_name = " blueprints/terraform/terraform-google-vm:mig/v6.0.0"
2228 }
2329}
Original file line number Diff line number Diff line change 1515 */
1616
1717terraform {
18- required_version = " >=0.12.6, <0.14 "
18+ required_version = " >=0.13.0 "
1919 required_providers {
20- google = " >= 2.7, <4.0"
21- google-beta = " >= 2.7, <4.0"
20+ google = " >= 3.43, <4.0"
21+ google-beta = " >= 3.43, <4.0"
22+ }
23+ provider_meta "google" {
24+ module_name = " blueprints/terraform/terraform-google-vm:mig_with_percent/v6.0.0"
25+ }
26+ provider_meta "google-beta" {
27+ module_name = " blueprints/terraform/terraform-google-vm:mig_with_percent/v6.0.0"
2228 }
2329}
Original file line number Diff line number Diff line change 1515 */
1616
1717terraform {
18- required_version = " >=0.12.6, <0.14"
18+ required_version = " >=0.13.0"
19+ required_providers {
20+ google = " >= 3.43, <4.0"
21+ google-beta = " >= 3.43, <4.0"
22+ }
23+ provider_meta "google" {
24+ module_name = " blueprints/terraform/terraform-google-vm:preemptible_and_regular_instance_templates/v6.0.0"
25+ }
26+ provider_meta "google-beta" {
27+ module_name = " blueprints/terraform/terraform-google-vm:preemptible_and_regular_instance_templates/v6.0.0"
28+ }
1929}
You can’t perform that action at this time.
0 commit comments