Commit 8263ca92 authored by John Skarbek's avatar John Skarbek

Merge branch 'jts/fix-ops' into 'master'

Fixes the ops environment since bootstrap v8 is missing

See merge request !813
parents 19a3da88 c7b3b5e7
......@@ -258,7 +258,7 @@ module "alerts" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "alerts"))}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -283,7 +283,7 @@ module "thanos-query" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "thanos-query"))}"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -451,7 +451,7 @@ module "dashboards" {
service_account_email = "${var.service_account_email}"
service_path = "/api/health"
service_port = 80
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -499,7 +499,7 @@ module "dashboards-com" {
service_account_email = "${var.service_account_email}"
service_path = "/api/health"
service_port = 80
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -552,7 +552,7 @@ module "gitlab-ops" {
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -597,7 +597,7 @@ module "gitlab-ops-geo" {
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......
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