Commit 85e0b5c8 authored by John Jarvis's avatar John Jarvis

Bump module versions for the bootstrap script version bump

parent 77990ce1
......@@ -105,7 +105,7 @@ module "proxy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = "9090"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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}"
......@@ -139,7 +139,7 @@ module "pubsubbeat" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git?ref=v1.0.6"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -305,7 +305,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}"
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-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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
......@@ -328,7 +328,7 @@ module "blackbox" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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
......@@ -353,7 +353,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.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -376,7 +376,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.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -557,7 +557,7 @@ module "gitlab-dev" {
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.5"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -701,7 +701,7 @@ module "bastion" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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}"
......@@ -724,13 +724,13 @@ module "runner" {
machine_type = "${var.machine_types["runner-build"]}"
name = "runner"
node_count = "${var.node_count["runner"]}"
os_disk_size = 100
os_disk_size = 500
project = "${var.project}"
public_ports = "${var.public_ports["runner"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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}"
......@@ -759,7 +759,7 @@ module "runner-chatops" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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}"
......@@ -788,7 +788,7 @@ module "runner-release" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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}"
......@@ -819,7 +819,7 @@ module "runner-release-single" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.4"
subnetwork_name = "${module.runner-release.google_compute_subnetwork_name}"
tier = "inf"
use_new_node_name = true
......@@ -849,7 +849,7 @@ module "runner-snapshots" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.1"
source = "git::ssh://git@ops.gitlab.net/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}"
......@@ -896,7 +896,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.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -939,7 +939,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.1"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.4"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......
......@@ -117,7 +117,7 @@ variable "public_ports" {
"proxy" = []
"bastion" = [22]
"dashboards" = []
"gitlab-dev" = [443, 80, 22, 5005]
"gitlab-dev" = [22]
"gitlab-ops" = [443, 80, 22, 5005]
"pubsubbeat" = []
"runner" = []
......
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