Unverified Commit 538e6487 authored by Yun Guo's avatar Yun Guo

update version

parent 5ecd3d9a
......@@ -384,9 +384,21 @@ variable "gcs_postgres_backup_service_account" {
# Service account used to do automated backup testing
# in https://gitlab.com/gitlab-restore/postgres-dr
variable "gcs_postgres_restore_service_account" {
type = "string"
default = "postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com"
variable "postgres_backup_bucket_obj_viewers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-dr.iam.gserviceaccount.com"
]
}
variable "postgres_backup_bucket_bucket_readers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-dr.iam.gserviceaccount.com"
]
}
variable "gcs_postgres_backup_kms_key_id" {
......
......@@ -498,9 +498,22 @@ variable "gcs_postgres_backup_service_account" {
# Service account used to do automated backup testing
# in https://gitlab.com/gitlab-restore/postgres-gprd
variable "gcs_postgres_restore_service_account" {
type = "string"
default = "postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com"
variable "postgres_backup_bucket_obj_viewers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-production.iam.gserviceaccount.com",
"disaster-recovery@gitlab-production.iam.gserviceaccount.com"
]
}
variable "postgres_backup_bucket_bucket_readers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-production.iam.gserviceaccount.com",
"disaster-recovery@gitlab-production.iam.gserviceaccount.com"
]
}
variable "gcs_postgres_backup_kms_key_id" {
......
......@@ -496,6 +496,22 @@ variable "gcs_postgres_restore_service_account" {
default = "postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com"
}
variable "postgres_backup_bucket_obj_viewers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-staging-1.iam.gserviceaccount.com"
]
}
variable "postgres_backup_bucket_bucket_readers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-staging-1.iam.gserviceaccount.com"
]
}
variable "gcs_postgres_backup_kms_key_id" {
type = "string"
default = "projects/gitlab-staging-1/locations/global/keyRings/gitlab-secrets/cryptoKeys/gstg-postgres-wal-archive"
......
......@@ -989,9 +989,9 @@ module "gke-runner" {
module "postgres-backup" {
environment = "${var.environment}"
gcs_postgres_backup_service_account = "${var.gcs_postgres_backup_service_account}"
restore_service_account = "${var.gcs_postgres_restore_service_account}"
kms_key_id = "${var.gcs_postgres_backup_kms_key_id}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/database-backup-bucket.git?ref=v1.0.0"
obj_viewers = "${var.postgres_backup_bucket_obj_viewers}"
bucket_readers = "${var.postgres_backup_bucket_bucket_readers}" kms_key_id = "${var.gcs_postgres_backup_kms_key_id}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/database-backup-bucket.git?ref=v1.0.2"
retention_days = "${var.postgres_backup_retention_days}"
}
......
......@@ -253,9 +253,20 @@ variable "gcs_postgres_backup_service_account" {
default = "postgres-wal-archive@gitlab-ops.iam.gserviceaccount.com"
}
variable "gcs_postgres_restore_service_account" {
type = "string"
default = "postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com"
variable "postgres_backup_bucket_obj_viewers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-ops.iam.gserviceaccount.com"
]
}
variable "postgres_backup_bucket_bucket_readers" {
type = "list"
default = [
"postgres-automated-backup-test@gitlab-restore.iam.gserviceaccount.com",
"postgres-wal-archive@gitlab-ops.iam.gserviceaccount.com"
]
}
variable "gcs_postgres_backup_kms_key_id" {
......
......@@ -443,9 +443,10 @@ module "postgres-dr-delayed" {
module "postgres-backup" {
environment = "${var.environment}"
gcs_postgres_backup_service_account = "${var.gcs_postgres_backup_service_account}"
restore_service_account = "${var.gcs_postgres_restore_service_account}"
obj_viewers = "${var.postgres_backup_bucket_obj_viewers}"
bucket_readers = "${var.postgres_backup_bucket_bucket_readers}"
kms_key_id = "${var.gcs_postgres_backup_kms_key_id}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/database-backup-bucket.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/database-backup-bucket.git?ref=v1.0.2"
retention_days = "${var.postgres_backup_retention_days}"
}
......
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