Commit 26fdf093 authored by John Skarbek's avatar John Skarbek

The bootstrap script was updated without validation

* Our bootstrap configuration was updated without taking into
consideration that our submodules are not updated in our infrastructure
causing problems when trying to converge the master branch in the pre
environment
* This updates all relevant modules
parent 7db41ce8
......@@ -109,7 +109,7 @@ module "prometheus" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.5"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -138,7 +138,7 @@ module "prometheus-app" {
service_account_email = "${var.service_account_email}"
service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-app"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.5"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -162,7 +162,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -208,7 +208,7 @@ module "bastion" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -236,7 +236,7 @@ module "consul" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 8300
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -405,7 +405,7 @@ module "proxy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = "9090"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -437,7 +437,7 @@ module "fe-lb" {
service_account_email = "${var.service_account_email}"
service_path = "/-/available-https"
service_port = 8002
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "lb"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -466,7 +466,7 @@ module "fe-lb-pages" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 7331
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "lb"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -497,7 +497,7 @@ module "fe-lb-registry" {
service_account_email = "${var.service_account_email}"
service_path = "/-/available-https"
service_port = 8002
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "lb"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -584,7 +584,7 @@ module "deploy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......@@ -613,7 +613,7 @@ module "registry" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -643,7 +643,7 @@ module "web" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -672,7 +672,7 @@ module "api" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -702,7 +702,7 @@ module "git" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -731,7 +731,7 @@ module "web-pages" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -775,7 +775,7 @@ module "sidekiq" {
sidekiq_realtime_instance_type = "none"
sidekiq_traces_count = "0"
sidekiq_traces_instance_type = "none"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v1.0.2"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -805,7 +805,7 @@ module "gitaly" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
tier = "sv"
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