Commit f4c61243 authored by John Skarbek's avatar John Skarbek

Merge branch 'jts/bump-storage-buckets-version' into 'master'

Bumps the storage-buckets version

See merge request !871
parents d62fc7a8 1e0a85c5
...@@ -1705,7 +1705,7 @@ module "gitlab_object_storage" { ...@@ -1705,7 +1705,7 @@ module "gitlab_object_storage" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
gcs_service_account_email = "${var.gcs_service_account_email}" gcs_service_account_email = "${var.gcs_service_account_email}"
gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}" gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.2.0" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.3.0"
} }
resource "google_kms_key_ring_iam_binding" "bootstrap" { resource "google_kms_key_ring_iam_binding" "bootstrap" {
......
...@@ -1758,7 +1758,7 @@ module "gitlab_object_storage" { ...@@ -1758,7 +1758,7 @@ module "gitlab_object_storage" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
gcs_service_account_email = "${var.gcs_service_account_email}" gcs_service_account_email = "${var.gcs_service_account_email}"
gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}" gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.2.0" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.3.0"
} }
resource "google_kms_key_ring_iam_binding" "bootstrap" { resource "google_kms_key_ring_iam_binding" "bootstrap" {
......
...@@ -253,7 +253,7 @@ module "storage" { ...@@ -253,7 +253,7 @@ module "storage" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
gcs_service_account_email = "${var.gcs_service_account_email}" gcs_service_account_email = "${var.gcs_service_account_email}"
gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}" gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.2.0" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.3.0"
} }
################################## ##################################
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment