From 590ec563549510ea8cc7706ac4d2560cb7c24b3d Mon Sep 17 00:00:00 2001 From: Ben Whaley Date: Thu, 19 Aug 2021 10:04:25 -0700 Subject: [PATCH 1/3] Bump tf to version 1.0 --- .circleci/config.yml | 8 ++++---- README.md | 2 +- examples/gke-private-cluster/main.tf | 4 ++-- examples/gke-public-cluster/main.tf | 4 ++-- main.tf | 4 ++-- modules/gke-cluster/main.tf | 4 ++-- modules/gke-service-account/main.tf | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 13f4867..310ac2e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,8 +8,8 @@ env: &env environment: GRUNTWORK_INSTALLER_VERSION: v0.0.30 TERRATEST_LOG_PARSER_VERSION: v0.30.4 - MODULE_CI_VERSION: v0.33.2 - TERRAFORM_VERSION: 0.14.8 + MODULE_CI_VERSION: v0.37.5 + TERRAFORM_VERSION: 1.0.4 TERRAGRUNT_VERSION: NONE PACKER_VERSION: NONE GOLANG_VERSION: 1.16 @@ -42,7 +42,7 @@ jobs: command: | pip install pre-commit==1.21.0 cfgv==2.0.1 zipp==1.1.0 yapf go get golang.org/x/tools/cmd/goimports - export GOPATH=~/go/bin && export PATH=$PATH:$GOPATH + export GOPATH=~/go/bin && export PATH=$PATH:$GOPATH pre-commit install pre-commit run --all-files @@ -69,7 +69,7 @@ jobs: tar -xvf helm.tar.gz chmod +x linux-amd64/helm sudo mv linux-amd64/helm /usr/local/bin/ - + # Install external dependencies - run: name: install gcloud dependencies diff --git a/README.md b/README.md index 661eb54..f04b58d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Maintained by Gruntwork.io](https://img.shields.io/badge/maintained%20by-gruntwork.io-%235849a6.svg)](https://gruntwork.io/?ref=repo_google_gke) [![GitHub tag (latest SemVer)](https://img.shields.io/github/tag/gruntwork-io/terraform-google-gke.svg?label=latest)](https://github.com/gruntwork-io/terraform-google-gke/releases/latest) -![Terraform Version](https://img.shields.io/badge/tf-%3E%3D0.14.0-blue.svg) +![Terraform Version](https://img.shields.io/badge/tf-%3E%3D1.0.x-blue.svg) # Google Kubernetes Engine (GKE) Module diff --git a/examples/gke-private-cluster/main.tf b/examples/gke-private-cluster/main.tf index 2f67005..9a6b27e 100644 --- a/examples/gke-private-cluster/main.tf +++ b/examples/gke-private-cluster/main.tf @@ -4,9 +4,9 @@ # --------------------------------------------------------------------------------------------------------------------- terraform { - # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting + # This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it - # forwards compatible with 0.14.x code. + # forwards compatible with 1.0.x code. required_version = ">= 0.12.26" required_providers { diff --git a/examples/gke-public-cluster/main.tf b/examples/gke-public-cluster/main.tf index e7f5234..e1839a9 100644 --- a/examples/gke-public-cluster/main.tf +++ b/examples/gke-public-cluster/main.tf @@ -5,9 +5,9 @@ # --------------------------------------------------------------------------------------------------------------------- terraform { - # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting + # This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it - # forwards compatible with 0.14.x code. + # forwards compatible with 1.0.x code. required_version = ">= 0.12.26" required_providers { diff --git a/main.tf b/main.tf index 6227e2d..0bcf0d0 100644 --- a/main.tf +++ b/main.tf @@ -5,9 +5,9 @@ # --------------------------------------------------------------------------------------------------------------------- terraform { - # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting + # This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it - # forwards compatible with 0.14.x code. + # forwards compatible with 1.0.x code. required_version = ">= 0.12.26" required_providers { diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf index 13154f2..fa38889 100644 --- a/modules/gke-cluster/main.tf +++ b/modules/gke-cluster/main.tf @@ -4,9 +4,9 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ terraform { - # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting + # This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it - # forwards compatible with 0.14.x code. + # forwards compatible with 1.0.x code. required_version = ">= 0.12.26" } diff --git a/modules/gke-service-account/main.tf b/modules/gke-service-account/main.tf index 95f7b18..35c0cf2 100644 --- a/modules/gke-service-account/main.tf +++ b/modules/gke-service-account/main.tf @@ -1,7 +1,7 @@ terraform { - # This module is now only being tested with Terraform 0.14.x. However, to make upgrading easier, we are setting + # This module is now only being tested with Terraform 1.0.x. However, to make upgrading easier, we are setting # 0.12.26 as the minimum version, as that version added support for required_providers with source URLs, making it - # forwards compatible with 0.14.x code. + # forwards compatible with 1.0.x code. required_version = ">= 0.12.26" } From b3b8ac2c39dd4a25f2c36566e8f0bc304781df2a Mon Sep 17 00:00:00 2001 From: Ben Whaley Date: Thu, 19 Aug 2021 10:23:08 -0700 Subject: [PATCH 2/3] Bump terraform-google-network version --- examples/gke-private-cluster/main.tf | 2 +- examples/gke-public-cluster/main.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/gke-private-cluster/main.tf b/examples/gke-private-cluster/main.tf index 9a6b27e..8dbd94c 100644 --- a/examples/gke-private-cluster/main.tf +++ b/examples/gke-private-cluster/main.tf @@ -168,7 +168,7 @@ module "gke_service_account" { # --------------------------------------------------------------------------------------------------------------------- module "vpc_network" { - source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.7.1" + source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.8.2" name_prefix = "${var.cluster_name}-network-${random_string.suffix.result}" project = var.project diff --git a/examples/gke-public-cluster/main.tf b/examples/gke-public-cluster/main.tf index e1839a9..5bfe269 100644 --- a/examples/gke-public-cluster/main.tf +++ b/examples/gke-public-cluster/main.tf @@ -160,7 +160,7 @@ resource "random_string" "suffix" { } module "vpc_network" { - source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.7.1" + source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.8.2" name_prefix = "${var.cluster_name}-network-${random_string.suffix.result}" project = var.project From 3da5d84091fb1bdce77df4bdcd514fef46d2fd5a Mon Sep 17 00:00:00 2001 From: Ben Whaley Date: Thu, 19 Aug 2021 11:28:50 -0700 Subject: [PATCH 3/3] Bump terraform-google-network version --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 0bcf0d0..dab4502 100644 --- a/main.tf +++ b/main.tf @@ -208,7 +208,7 @@ resource "random_string" "suffix" { } module "vpc_network" { - source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.7.1" + source = "github.com/gruntwork-io/terraform-google-network.git//modules/vpc-network?ref=v0.8.2" name_prefix = "${var.cluster_name}-network-${random_string.suffix.result}" project = var.project