From 8bf3e11f344a60286a5cc81af2b3ee69f4ae6b4b Mon Sep 17 00:00:00 2001 From: Natalia Strelkova Date: Tue, 14 Mar 2023 15:43:55 +0100 Subject: [PATCH 1/2] location and storage class added to GKE GCS buckets --- fast/stages/1-resman/branch-gke.tf | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/fast/stages/1-resman/branch-gke.tf b/fast/stages/1-resman/branch-gke.tf index 76777d8f..62f6a8b5 100644 --- a/fast/stages/1-resman/branch-gke.tf +++ b/fast/stages/1-resman/branch-gke.tf @@ -117,11 +117,13 @@ 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 + 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] @@ -129,11 +131,13 @@ module "branch-gke-dev-gcs" { } 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 + 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] From fe7725e7d06628c3eec61dc0db3bd119fadf51d1 Mon Sep 17 00:00:00 2001 From: Natalia Strelkova Date: Tue, 14 Mar 2023 14:48:04 +0000 Subject: [PATCH 2/2] formatting --- fast/stages/1-resman/branch-gke.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fast/stages/1-resman/branch-gke.tf b/fast/stages/1-resman/branch-gke.tf index 62f6a8b5..fe25a7be 100644 --- a/fast/stages/1-resman/branch-gke.tf +++ b/fast/stages/1-resman/branch-gke.tf @@ -124,7 +124,7 @@ module "branch-gke-dev-gcs" { prefix = var.prefix location = var.locations.gcs storage_class = local.gcs_storage_class - versioning = true + versioning = true iam = { "roles/storage.objectAdmin" = [module.branch-gke-dev-sa.0.iam_email] } @@ -138,7 +138,7 @@ module "branch-gke-prod-gcs" { prefix = var.prefix location = var.locations.gcs storage_class = local.gcs_storage_class - versioning = true + versioning = true iam = { "roles/storage.objectAdmin" = [module.branch-gke-prod-sa.0.iam_email] }