Skip to content

feat: update TPG version constraints to allow 4.0 #98

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

Merged
merged 6 commits into from
Nov 25, 2021
Merged

feat: update TPG version constraints to allow 4.0 #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1751a91
feat: update TPG version constraints to allow 4.0
cloud-foundation-bot Nov 17, 2021
7064919
Temporarily uses master branch of VM module
jackwhelpton Nov 24, 2021
5e9e755
Applies fmt
jackwhelpton Nov 24, 2021
9f8ae99
Removes erroneous restriction on random version
jackwhelpton Nov 24, 2021
c9bb7d6
Prepares for next release of VM module
jackwhelpton Nov 24, 2021
a0cd201
Uses VM module version 7.3 or higher
jackwhelpton Nov 24, 2021
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
8 changes: 5 additions & 3 deletions examples/bastion_group/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
* limitations under the License.
*/
terraform {
required_version = ">=0.13"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 4.0"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = "~> 4.0"
}
random = {
source = "hashicorp/random"
Expand Down
2 changes: 1 addition & 1 deletion examples/iap_tunneling/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ resource "google_service_account" "vm_sa" {
# A testing VM to allow OS Login + IAP tunneling.
module "instance_template" {
source = "terraform-google-modules/vm/google//modules/instance_template"
version = "1.1.0"
version = "~> 7.3"

project_id = var.project
machine_type = "n1-standard-1"
Expand Down
5 changes: 3 additions & 2 deletions examples/iap_tunneling/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@
* limitations under the License.
*/
terraform {
required_version = ">=0.13"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 4.0"
}
}
}
8 changes: 5 additions & 3 deletions examples/simple_example/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
* limitations under the License.
*/
terraform {
required_version = ">=0.13"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 4.0"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = "~> 4.0"
}
random = {
source = "hashicorp/random"
Expand Down
8 changes: 5 additions & 3 deletions examples/two_service_example/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,15 @@
* limitations under the License.
*/
terraform {
required_version = ">=0.13"
required_version = ">= 0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = "~> 4.0"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = "~> 4.0"
}
random = {
source = "hashicorp/random"
Expand Down
2 changes: 1 addition & 1 deletion main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource "google_service_account" "bastion_host" {

module "instance_template" {
source = "terraform-google-modules/vm/google//modules/instance_template"
version = "~> 6.0"
version = "~> 7.3"

name_prefix = var.name_prefix
project_id = var.project
Expand Down
2 changes: 1 addition & 1 deletion modules/bastion-group/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ module "iap_bastion" {

module "mig" {
source = "terraform-google-modules/vm/google//modules/mig"
version = "~> 6.0"
version = "~> 7.3"

project_id = var.project
region = var.region
Expand Down
6 changes: 4 additions & 2 deletions modules/bastion-group/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,12 @@ terraform {
required_version = ">=0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
}
google-beta = {
source = "hashicorp/google-beta"
source = "hashicorp/google-beta"
version = ">= 3.53, < 5.0"
}
random = {
source = "hashicorp/random"
Expand Down
3 changes: 2 additions & 1 deletion modules/iap-tunneling/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ terraform {
required_version = ">=0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
}
}
provider_meta "google" {
Expand Down
3 changes: 2 additions & 1 deletion versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ terraform {
required_version = ">=0.13"
required_providers {
google = {
source = "hashicorp/google"
source = "hashicorp/google"
version = ">= 3.53, < 5.0"
}
random = {
source = "hashicorp/random"
Expand Down