Skip to content
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

upgrade module version #93

Merged
merged 5 commits into from
Feb 22, 2021
Merged

upgrade module version #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d7e5615
upgrade module version
ericyz Feb 18, 2021
1d10ce9
update readme
ericyz Feb 18, 2021
f9b2021
update
ericyz Feb 22, 2021
09a54da
update terraform sha256sum
ericyz Feb 22, 2021
f14ee56
update docs
ericyz Feb 22, 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
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 @@ -54,7 +54,7 @@ resource "google_folder_iam_member" "tmp_project_creator" {

module "seed_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 10.0.1"
version = "~> 10.1.1"
name = local.seed_project_id
random_project_id = true
disable_services_on_destroy = false
Expand Down
4 changes: 2 additions & 2 deletions modules/cloudbuild/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ Functional examples and sample Cloud Build definitions are included in the [exam
| terraform\_sa\_name | Fully-qualified name of the terraform service account. | `string` | n/a | yes |
| terraform\_state\_bucket | Default state bucket, used in Cloud Build substitutions. | `string` | n/a | yes |
| terraform\_validator\_release | Default terraform-validator release. | `string` | `"2020-09-24"` | no |
| terraform\_version | Default terraform version. | `string` | `"0.12.29"` | no |
| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d"` | no |
| terraform\_version | Default terraform version. | `string` | `"0.13.6"` | no |
| terraform\_version\_sha256sum | sha256sum for default terraform version. | `string` | `"55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"` | no |

## Outputs

Expand Down
4 changes: 2 additions & 2 deletions modules/cloudbuild/cloudbuild_builder/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
FROM gcr.io/cloud-builders/gcloud-slim

# Use ARG so that values can be overriden by user/cloudbuild
ARG TERRAFORM_VERSION=0.12.29
ARG TERRAFORM_VERSION_SHA256SUM=872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d
ARG TERRAFORM_VERSION=0.13.6
ARG TERRAFORM_VERSION_SHA256SUM=55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9
ARG TERRAFORM_VALIDATOR_RELEASE=2020-09-24

ENV ENV_TERRAFORM_VERSION=$TERRAFORM_VERSION
Expand Down
4 changes: 2 additions & 2 deletions modules/cloudbuild/cloudbuild_builder/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ steps:
- name: 'gcr.io/${PROJECT_ID}/terraform'
args: ['version']
substitutions:
_TERRAFORM_VERSION: '0.12.29' # default value
_TERRAFORM_VERSION_SHA256SUM: '872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d' # default value
_TERRAFORM_VERSION: '0.13.6' # default value
_TERRAFORM_VERSION_SHA256SUM: '55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9' # default value
_TERRAFORM_VALIDATOR_RELEASE: '2020-09-24'
images: ['gcr.io/${PROJECT_ID}/terraform']
2 changes: 1 addition & 1 deletion modules/cloudbuild/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ data "google_organization" "org" {

module "cloudbuild_project" {
source = "terraform-google-modules/project-factory/google"
version = "~> 10.0.1"
version = "~> 10.1.1"
name = local.cloudbuild_project_id
random_project_id = true
disable_services_on_destroy = false
Expand Down
4 changes: 2 additions & 2 deletions modules/cloudbuild/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,13 +134,13 @@ variable "folder_id" {
variable "terraform_version" {
description = "Default terraform version."
type = string
default = "0.12.29"
default = "0.13.6"
}

variable "terraform_version_sha256sum" {
description = "sha256sum for default terraform version."
type = string
default = "872245d9c6302b24dc0d98a1e010aef1e4ef60865a2d1f60102c8ad03e9d5a1d"
default = "55f2db00b05675026be9c898bdd3e8230ff0c5c78dd12d743ca38032092abfc9"
}

variable "terraform_validator_release" {
Expand Down
2 changes: 1 addition & 1 deletion terraform.example.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*/

organization_id = "000000000000"
org_id = "000000000000"

billing_account = "000000-000000-000000"

Expand Down