Merge branch 'terraform-google-modules:master' into master

bankoncloud · Aug 8, 2021 · e52db1f · e52db1f
2 parents 4034e47 + 27a31a6
commit e52db1f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/0-bootstrap/main.tf b/0-bootstrap/main.tf
@@ -31,7 +31,7 @@ resource "google_folder" "bootstrap" {
 
 module "seed_bootstrap" {
   source                         = "terraform-google-modules/bootstrap/google"
-  version                        = "~> 2.1"
+  version                        = "~> 3.0"
   org_id                         = var.org_id
   folder_id                      = google_folder.bootstrap.id
   project_id                     = "${var.project_prefix}-b-seed"
@@ -102,7 +102,7 @@ resource "google_billing_account_iam_member" "tf_billing_admin" {
 // Comment-out the cloudbuild_bootstrap module and its outputs if you want to use Jenkins instead of Cloud Build
 module "cloudbuild_bootstrap" {
   source                      = "terraform-google-modules/bootstrap/google//modules/cloudbuild"
-  version                     = "~> 2.3"
+  version                     = "~> 3.0"
   org_id                      = var.org_id
   folder_id                   = google_folder.bootstrap.id
   project_id                  = "${var.project_prefix}-b-cicd"

diff --git a/0-bootstrap/versions.tf b/0-bootstrap/versions.tf
@@ -21,15 +21,6 @@ terraform {
       source  = "hashicorp/google"
       version = ">= 3.50"
     }
-    null = {
-      source  = "hashicorp/null"
-      version = "~> 2.1"
-    }
-
-    random = {
-      source  = "hashicorp/random"
-      version = "~> 2.3"
-    }
   }
 
   provider_meta "google" {