From 0ba6b7fcdcf03301a73335f03d6279b8b7145ddb Mon Sep 17 00:00:00 2001 From: Vedant Pareek Date: Tue, 19 Nov 2024 16:28:16 +0530 Subject: [PATCH 1/3] Updating network variables, versions --- gcn.tf | 4 ++-- versions.tf | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gcn.tf b/gcn.tf index b5adec4..0889be2 100644 --- a/gcn.tf +++ b/gcn.tf @@ -3,7 +3,7 @@ module "network" { count = var.shim || var.shared_vpc ? 0 : 1 source = "terraform-google-modules/network/google" - version = "7.3.0" + version = "9.3.0" description = "Truefoundry network for ${var.cluster_name}" project_id = var.project_id network_name = local.network_name @@ -84,7 +84,7 @@ resource "time_sleep" "wait_2_mins" { module "cloud_router" { count = var.shim || var.shared_vpc ? 0 : 1 source = "terraform-google-modules/cloud-router/google" - version = "6.0.1" + version = "6.2.0" description = "Truefoundry NAT router for ${var.cluster_name}" name = local.router_name project = var.project_id diff --git a/versions.tf b/versions.tf index 48fe88a..ae1e095 100644 --- a/versions.tf +++ b/versions.tf @@ -1,13 +1,13 @@ terraform { - required_version = ">= 1.4" + required_version = "~> 1.4" required_providers { google = { source = "hashicorp/google" - version = "4.81.0" + version = "~> 6.0" } time = { source = "hashicorp/time" - version = "0.12.1" + version = "~> 0.12" } } } \ No newline at end of file From c80ea21da499ed70e75abff6038b527341d5ce67 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Tue, 19 Nov 2024 10:59:20 +0000 Subject: [PATCH 2/3] terraform-docs: automated action --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index b04b06c..6cf82b7 100644 --- a/README.md +++ b/README.md @@ -6,28 +6,28 @@ Truefoundry Google Cloud Network Module | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.4 | -| [google](#requirement\_google) | 4.81.0 | -| [time](#requirement\_time) | 0.12.1 | +| [terraform](#requirement\_terraform) | ~> 1.4 | +| [google](#requirement\_google) | ~> 6.0 | +| [time](#requirement\_time) | ~> 0.12 | ## Providers | Name | Version | |------|---------| -| [time](#provider\_time) | 0.12.1 | +| [time](#provider\_time) | ~> 0.12 | ## Modules | Name | Source | Version | |------|--------|---------| -| [cloud\_router](#module\_cloud\_router) | terraform-google-modules/cloud-router/google | 6.0.1 | -| [network](#module\_network) | terraform-google-modules/network/google | 7.3.0 | +| [cloud\_router](#module\_cloud\_router) | terraform-google-modules/cloud-router/google | 6.2.0 | +| [network](#module\_network) | terraform-google-modules/network/google | 9.3.0 | ## Resources | Name | Type | |------|------| -| [time_sleep.wait_2_mins](https://registry.terraform.io/providers/hashicorp/time/0.12.1/docs/resources/sleep) | resource | +| [time_sleep.wait_2_mins](https://registry.terraform.io/providers/hashicorp/time/latest/docs/resources/sleep) | resource | ## Inputs From 45b130aca6b55e60fe0fd023bb557a401a6e8030 Mon Sep 17 00:00:00 2001 From: Vedant Pareek Date: Tue, 19 Nov 2024 16:33:46 +0530 Subject: [PATCH 3/3] Updating workflow version --- .github/workflows/lint_clean.yaml | 2 +- .github/workflows/terraform-docs.yaml | 2 +- .github/workflows/terraform-scan.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint_clean.yaml b/.github/workflows/lint_clean.yaml index 3a9bb33..038235f 100644 --- a/.github/workflows/lint_clean.yaml +++ b/.github/workflows/lint_clean.yaml @@ -6,4 +6,4 @@ on: jobs: fmt_and_lint: name: Terraform fmt and tflint - uses: truefoundry/github-workflows-public/.github/workflows/terraform-lint-format.yml@v0.1.1 \ No newline at end of file + uses: truefoundry/github-workflows-public/.github/workflows/terraform-lint-format.yml@v0.1.5 \ No newline at end of file diff --git a/.github/workflows/terraform-docs.yaml b/.github/workflows/terraform-docs.yaml index 1c9aab4..e8db82e 100644 --- a/.github/workflows/terraform-docs.yaml +++ b/.github/workflows/terraform-docs.yaml @@ -5,6 +5,6 @@ on: jobs: terraform-docs-generator: name: Generate terraform docs - uses: truefoundry/github-workflows-public/.github/workflows/terraform-doc-generator.yml@v0.1.1 + uses: truefoundry/github-workflows-public/.github/workflows/terraform-doc-generator.yml@v0.1.5 with: commit_ref: ${{ github.event.pull_request.head.ref }} \ No newline at end of file diff --git a/.github/workflows/terraform-scan.yaml b/.github/workflows/terraform-scan.yaml index afa6279..faccc84 100644 --- a/.github/workflows/terraform-scan.yaml +++ b/.github/workflows/terraform-scan.yaml @@ -5,6 +5,6 @@ on: jobs: terraform-scan: name: Vulnerability scanning - uses: truefoundry/github-workflows-public/.github/workflows/terraform-scan.yml@v0.1.1 + uses: truefoundry/github-workflows-public/.github/workflows/terraform-scan.yml@v0.1.5 secrets: snyk_token: ${{ secrets.SNYK_TOKEN }} \ No newline at end of file