Merge branch 'master' into master

GoogleCloudPlatform · Mar 14, 2023 · c7ca432 · c7ca432
2 parents b313900 + 8f141e3
commit c7ca432
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/fast/stages/1-resman/branch-gke.tf b/fast/stages/1-resman/branch-gke.tf
@@ -117,24 +117,28 @@ module "branch-gke-prod-sa" {
 }
 
 module "branch-gke-dev-gcs" {
-  source     = "../../../modules/gcs"
-  count      = var.fast_features.gke ? 1 : 0
-  project_id = var.automation.project_id
-  name       = "dev-resman-gke-0"
-  prefix     = var.prefix
-  versioning = true
+  source        = "../../../modules/gcs"
+  count         = var.fast_features.gke ? 1 : 0
+  project_id    = var.automation.project_id
+  name          = "dev-resman-gke-0"
+  prefix        = var.prefix
+  location      = var.locations.gcs
+  storage_class = local.gcs_storage_class
+  versioning    = true
   iam = {
     "roles/storage.objectAdmin" = [module.branch-gke-dev-sa.0.iam_email]
   }
 }
 
 module "branch-gke-prod-gcs" {
-  source     = "../../../modules/gcs"
-  count      = var.fast_features.gke ? 1 : 0
-  project_id = var.automation.project_id
-  name       = "prod-resman-gke-0"
-  prefix     = var.prefix
-  versioning = true
+  source        = "../../../modules/gcs"
+  count         = var.fast_features.gke ? 1 : 0
+  project_id    = var.automation.project_id
+  name          = "prod-resman-gke-0"
+  prefix        = var.prefix
+  location      = var.locations.gcs
+  storage_class = local.gcs_storage_class
+  versioning    = true
   iam = {
     "roles/storage.objectAdmin" = [module.branch-gke-prod-sa.0.iam_email]
   }