chore(deps): bump test-org for TPG v5 (#2067)

GoogleCloudPlatform · Dec 28, 2023 · 2a59d86 · 2a59d86
1 parent 6308566
commit 2a59d86
Show file tree

Hide file tree

Showing 4 changed files with 128 additions and 118 deletions.
diff --git a/infra/terraform/test-org/org/.terraform.lock.hcl b/infra/terraform/test-org/org/.terraform.lock.hcl
diff --git a/infra/terraform/test-org/org/folders.tf b/infra/terraform/test-org/org/folders.tf
@@ -16,7 +16,7 @@
 
 module "folders-root" {
   source  = "terraform-google-modules/folders/google"
-  version = "~> 3.1"
+  version = "~> 4.0"
 
   parent = "organizations/${local.org_id}"
 
@@ -30,7 +30,7 @@ module "folders-root" {
 
 module "folders-ci" {
   source  = "terraform-google-modules/folders/google"
-  version = "~> 3.1"
+  version = "~> 4.0"
 
   parent = "folders/${replace(local.folders["ci-projects"], "folders/", "")}"
 
@@ -41,7 +41,7 @@ module "folders-ci" {
 
 module "bpt_ci_folder" {
   source  = "terraform-google-modules/folders/google"
-  version = "~> 3.1"
+  version = "~> 4.0"
 
   parent    = "folders/${replace(local.folders["ci-projects"], "folders/", "")}"
   names     = ["ci-bpt"]

diff --git a/infra/terraform/test-org/org/prow.tf b/infra/terraform/test-org/org/prow.tf
@@ -36,7 +36,7 @@ provider "kubernetes" {
 
 module "prow-int-sa-wi" {
   source     = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
-  version    = "~> 26.0"
+  version    = "~> 29.0"
   name       = "int-test-sa"
   namespace  = local.test_ns
   project_id = local.prow_project_id

diff --git a/infra/terraform/test-org/org/versions.tf b/infra/terraform/test-org/org/versions.tf
@@ -18,23 +18,32 @@ terraform {
   required_version = ">= 1.4.4"
   required_providers {
     external = {
-      version = ">= 1.2, < 3.0"
+      source  = "hashicorp/external"
+      version = ">= 1.2, < 3"
     }
     google = {
+      source  = "hashicorp/google"
       version = ">= 3.19, < 6"
     }
     google-beta = {
+      source  = "hashicorp/google-beta"
       version = ">= 3.19, < 6"
     }
     null = {
-      version = ">= 2.1, < 4.0"
+      source  = "hashicorp/null"
+      version = ">= 2.1, < 4"
     }
     random = {
-      version = ">= 2.3.1, < 4.0"
+      source  = "hashicorp/random"
+      version = ">= 2.3.1, < 4"
     }
     github = {
       source  = "integrations/github"
       version = "~> 5.0"
     }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = ">= 2.13, < 3"
+    }
   }
 }