Skip to content

Commit b86457c

Browse files
daniel-citbharathkkb
authored andcommitted
fix: pin versions of terraform in the code to version 0.13.6 (terraform-google-modules#398)
1 parent 91ce3f8 commit b86457c

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

0-bootstrap/README-Jenkins.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
125125
### II. Create the SEED and CICD projects using Terraform
126126
127127
- Required information:
128-
- Terraform version 0.12.24 - See [Requirements](#requirements) section for more details.
128+
- Terraform version 0.13.6 - See [Requirements](#requirements) section for more details.
129129
- The `terraform.tfvars` file with all the necessary values.
130130
131131
1. Get the appropriate credentials: run the following command with an account that has the [necessary permissions](./modules/jenkins-agent/README.md#Permissions).
@@ -137,7 +137,7 @@ You arrived to these instructions because you are using the `jenkins_bootstrap`
137137
1. Run terraform commands.
138138
- After the credentials are configured, we will create the `cft-seed` project (which contains the GCS state bucket and Terraform custom service account) and the `prj-cicd` project (which contains the Jenkins Agent, its custom service account and where we will add VPN configuration)
139139
- **WARNING: Make sure you have commented-out the `cloudbuild_bootstrap` module and enabled the `jenkins_bootstrap` module in the `./main.tf` file**
140-
- **Use Terraform 0.12.24** to run the terraform script with the commands below
140+
- **Use Terraform 0.13.6** to run the terraform script with the commands below
141141
```
142142
terraform init
143143
terraform plan

0-bootstrap/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,5 @@ Currently, the bucket information is replaced in the state backends as a part of
9292
### Software
9393
9494
- [gcloud sdk](https://cloud.google.com/sdk/install) >= 206.0.0
95-
- [Terraform](https://www.terraform.io/downloads.html) >= 0.12.6
95+
- [Terraform](https://www.terraform.io/downloads.html) >= 0.13.6
9696
- You should use the same version in the manual steps during 0-bootstrap to avoid possible [Terraform State Snapshot Lock](https://github.com/hashicorp/terraform/issues/23290) errors caused by differences in terraform versions. This can usually be resolved with a version upgrade.

0-bootstrap/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ module "cloudbuild_bootstrap" {
115115
project_prefix = var.project_prefix
116116
cloud_source_repos = var.cloud_source_repos
117117
terraform_validator_release = "2021-01-21"
118-
terraform_version = "0.13.5"
119-
terraform_version_sha256sum = "f7b7a7b1bfbf5d78151cfe3d1d463140b5fd6a354e71a7de2b5644e652ca5147"
118+
terraform_version = "0.13.6"
119+
terraform_version_sha256sum = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
120120

121121
activate_apis = [
122122
"serviceusage.googleapis.com",

0-bootstrap/modules/jenkins-agent/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ module "jenkins_bootstrap" {
7979
| terraform\_sa\_email | Email for terraform service account. It must be supplied by the seed project | `string` | n/a | yes |
8080
| terraform\_sa\_name | Fully-qualified name of the terraform service account. It must be supplied by the seed project | `string` | n/a | yes |
8181
| terraform\_state\_bucket | Default state bucket, used in Cloud Build substitutions. It must be supplied by the seed project | `string` | n/a | yes |
82-
| terraform\_version | Default terraform version. | `string` | `"0.12.24"` | no |
83-
| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"602d2529aafdaa0f605c06adb7c72cfb585d8aa19b3f4d8d189b42589e27bf11"` | no |
82+
| terraform\_version | Default terraform version. | `string` | `"0.13.6"` | no |
83+
| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"` | no |
8484
| tunnel0\_bgp\_peer\_address | BGP peer address for tunnel 0 | `string` | n/a | yes |
8585
| tunnel0\_bgp\_session\_range | BGP session range for tunnel 0 | `string` | n/a | yes |
8686
| tunnel1\_bgp\_peer\_address | BGP peer address for tunnel 1 | `string` | n/a | yes |
@@ -105,8 +105,8 @@ module "jenkins_bootstrap" {
105105
### Software
106106

107107
- [gcloud sdk](https://cloud.google.com/sdk/install) >= 206.0.0
108-
- [Terraform](https://www.terraform.io/downloads.html) = 0.12.24
109-
- The scripts in this codebase use Terraform v0.12.24. You should use the same version in the manual steps to avoid [Terraform State Snapshot Lock](https://github.com/hashicorp/terraform/issues/23290) errors caused by differences in terraform versions.
108+
- [Terraform](https://www.terraform.io/downloads.html) = 0.13.6
109+
- The scripts in this codebase use Terraform v0.13.6. You should use the same version in the manual steps to avoid [Terraform State Snapshot Lock](https://github.com/hashicorp/terraform/issues/23290) errors caused by differences in terraform versions.
110110

111111
### Infrastructure
112112

0-bootstrap/modules/jenkins-agent/variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,11 @@ variable "folder_id" {
224224
variable "terraform_version" {
225225
description = "Default terraform version."
226226
type = string
227-
default = "0.12.24"
227+
default = "0.13.6"
228228
}
229229

230230
variable "terraform_version_sha256sum" {
231231
description = "sha256sum for default terraform version."
232232
type = string
233-
default = "602d2529aafdaa0f605c06adb7c72cfb585d8aa19b3f4d8d189b42589e27bf11"
233+
default = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
234234
}

3-networks/modules/base_shared_vpc/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12"
18+
required_version = ">= 0.13"
1919
}

3-networks/modules/restricted_shared_vpc/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
*/
1616

1717
terraform {
18-
required_version = ">= 0.12"
18+
required_version = ">= 0.13"
1919
}

4-projects/modules/infra_pipelines/cloudbuild_builder/cloudbuild.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ steps:
2727
- name: 'gcr.io/${PROJECT_ID}/terraform'
2828
args: ['version']
2929
substitutions:
30-
_TERRAFORM_VERSION: '0.12.29' # default value
31-
_TERRAFORM_VERSION_SHA256SUM: '872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d' # default value
30+
_TERRAFORM_VERSION: '0.13.6' # default value
31+
_TERRAFORM_VERSION_SHA256SUM: '55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9' # default value
3232
_TERRAFORM_VALIDATOR_RELEASE: '2020-09-24'
3333
images: ['gcr.io/${PROJECT_ID}/terraform']

test/bundle.hcl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
version = "0.13.5"
2+
version = "0.13.6"
33
}
44

55
providers {

0 commit comments

Comments
 (0)