chore: upgrade test-org to TPGv6

GoogleCloudPlatform · Sep 23, 2024 · f272b55 · f272b55
1 parent 17331bb
commit f272b55
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 136 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/bigquery_external_data.tf b/infra/terraform/test-org/org/bigquery_external_data.tf
@@ -21,7 +21,7 @@ resource "google_folder" "ci_bq_external_data_folder" {
 
 module "ci_bq_external_data_project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 14.0"
+  version = "~> 17.0"
 
   name            = "ci-bq-external-data-project"
   project_id      = "ci-bq-external-data-project"

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 = "~> 4.0"
+  version = "~> 5.0"
 
   parent = "organizations/${local.org_id}"
 
@@ -30,7 +30,7 @@ module "folders-root" {
 
 module "folders-ci" {
   source  = "terraform-google-modules/folders/google"
-  version = "~> 4.0"
+  version = "~> 5.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 = "~> 4.0"
+  version = "~> 5.0"
 
   parent    = "folders/${replace(local.folders["ci-projects"], "folders/", "")}"
   names     = ["ci-bpt"]

diff --git a/infra/terraform/test-org/org/gsuite.tf b/infra/terraform/test-org/org/gsuite.tf
@@ -50,7 +50,7 @@ resource "google_folder" "ci_gsuite_sa_folder" {
 
 module "ci_gsuite_sa_project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 14.0"
+  version = "~> 17.0"
 
   name            = "ci-gsuite-sa-project"
   project_id      = "ci-gsuite-sa-project"

diff --git a/infra/terraform/test-org/org/iam.tf b/infra/terraform/test-org/org/iam.tf
@@ -17,7 +17,7 @@
 
 module "admin_bindings" {
   source  = "terraform-google-modules/iam/google//modules/folders_iam"
-  version = "~> 7.4"
+  version = "~> 8.0"
 
   folders = [local.folders["ci-projects"]]
 
@@ -38,7 +38,7 @@ module "admin_bindings" {
 
 module "ci_bindings" {
   source  = "terraform-google-modules/iam/google//modules/folders_iam"
-  version = "~> 7.4"
+  version = "~> 8.0"
 
   folders = [local.folders["ci-projects"]]
 
@@ -59,7 +59,7 @@ module "ci_bindings" {
 
 module "ci_folders_folder_bindings" {
   source  = "terraform-google-modules/iam/google//modules/folders_iam"
-  version = "~> 7.4"
+  version = "~> 8.0"
 
   folders = [local.ci_folders["ci-folders"]]
 

diff --git a/infra/terraform/test-org/org/projects.tf b/infra/terraform/test-org/org/projects.tf
@@ -16,7 +16,7 @@
 
 module "ci_media_cdn_vod_project" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 14.0"
+  version = "~> 17.0"
 
   name            = "ci-media-cdn-vod-project"
   project_id      = "ci-media-cdn-vod-project"

diff --git a/infra/terraform/test-org/org/prow.tf b/infra/terraform/test-org/org/prow.tf
@@ -36,10 +36,11 @@ provider "kubernetes" {
 
 module "prow-int-sa-wi" {
   source     = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
-  version    = "~> 29.0"
+  version    = "~> 33.0"
   name       = "int-test-sa"
   namespace  = local.test_ns
   project_id = local.prow_project_id
+  roles      = ["roles/artifactregistry.reader"]
 }
 
 resource "kubernetes_config_map" "test-constants" {

diff --git a/infra/terraform/test-org/org/versions.tf b/infra/terraform/test-org/org/versions.tf
@@ -23,11 +23,11 @@ terraform {
     }
     google = {
       source  = "hashicorp/google"
-      version = ">= 3.19, < 6"
+      version = ">= 3.19, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 3.19, < 6"
+      version = ">= 3.19, < 7"
     }
     null = {
       source  = "hashicorp/null"