Commit 30e1272f authored by Craig Furman's avatar Craig Furman

Merge branch 'craigf/bump-bootstrap-and-dependencies' into 'master'

Bump all modules that depend on bootstrap

See merge request !822
parents e706731c a514c596
......@@ -247,7 +247,7 @@ module "patroni" {
service_account_email = "${var.service_account_email}"
service_path = "/"
service_port = 6432
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.5"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -273,7 +273,7 @@ module "geo-postgres" {
public_ports = "${var.public_ports["geodb"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -303,7 +303,7 @@ module "redis" {
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -378,7 +378,7 @@ module "file" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "stor"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -413,7 +413,7 @@ module "pages" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "stor"
use_new_node_name = true
use_external_ip = true
......@@ -771,7 +771,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -796,7 +796,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.3"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......
......@@ -352,7 +352,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -375,7 +375,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -838,7 +838,7 @@ module "sentry" {
public_ports = "${var.public_ports["sentry"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -881,7 +881,7 @@ module "aptly" {
public_ports = "${var.public_ports["aptly"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......
......@@ -854,7 +854,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -878,7 +878,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......
......@@ -409,7 +409,7 @@ module "postgres-dr-archive" {
public_ports = "${var.public_ports["db-dr"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -433,7 +433,7 @@ module "postgres-dr-delayed" {
public_ports = "${var.public_ports["db-dr"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -550,7 +550,7 @@ module "patroni" {
service_account_email = "${var.service_account_email}"
service_path = "/"
service_port = 6432
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.5"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -605,7 +605,7 @@ module "patroni-pg-11" {
service_account_email = "${var.service_account_email}"
service_path = "/"
service_port = 6432
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.5"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -636,7 +636,7 @@ module "redis" {
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -664,7 +664,7 @@ module "redis-cache" {
sentinel_data_disk_type = "pd-ssd"
sentinel_machine_type = "${var.machine_types["redis-cache-sentinel"]}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-redis.git?ref=v1.0.6"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-redis.git?ref=v1.0.7"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -770,7 +770,7 @@ module "file" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "stor"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -814,7 +814,7 @@ module "share" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "stor"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -851,7 +851,7 @@ module "pages" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "stor"
use_new_node_name = true
use_external_ip = true
......@@ -1428,7 +1428,7 @@ module "influxdb" {
public_ports = "${var.public_ports["influxdb"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -1453,7 +1453,7 @@ module "thanos-store" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -1478,7 +1478,7 @@ module "thanos-compact" {
public_ports = "${var.public_ports["thanos"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.1.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......
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