Commit c76df0d0 authored by Alejandro Rodríguez's avatar Alejandro Rodríguez

Pin module sources versions

This will make our workflow clearer and won't require a full updade
(with `tf get -update`) to update module sources
parent d14b95ca
......@@ -93,7 +93,7 @@ module "nat" {
module "network" {
environment = "${var.environment}"
project = "${var.project}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/vpc.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/vpc.git?ref=v1.0.0"
internal_subnets = "${var.internal_subnets}"
}
......@@ -135,7 +135,7 @@ module "web" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -165,7 +165,7 @@ module "api" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -196,7 +196,7 @@ module "git" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -222,7 +222,7 @@ module "gcp-tcp-lb-internal-patroni" {
names = ["${var.environment}-patroni"]
project = "${var.project}"
region = "${var.region}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
subnetwork_self_link = "${module.patroni.google_compute_subnetwork_self_link}"
targets = ["patroni"]
vpc = "${module.network.self_link}"
......@@ -251,7 +251,7 @@ module "patroni" {
service_account_email = "${var.service_account_email}"
service_path = "/"
service_port = 6432
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor-with-group.git?ref=v1.0.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -283,7 +283,7 @@ module "redis" {
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.0"
tier = "db"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -328,7 +328,7 @@ module "sidekiq" {
sidekiq_realtime_instance_type = "${var.machine_types["sidekiq-realtime"]}"
sidekiq_traces_count = "${var.node_count["sidekiq-traces"]}"
sidekiq_traces_instance_type = "${var.machine_types["sidekiq-traces"]}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v1.0.0"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -360,7 +360,7 @@ module "file" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.0"
tier = "stor"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -396,7 +396,7 @@ module "pages" {
public_ports = "${var.public_ports["stor"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.0"
tier = "stor"
use_new_node_name = true
use_external_ip = true
......@@ -429,7 +429,7 @@ module "fe-lb" {
service_account_email = "${var.service_account_email}"
service_path = "/-/available-https"
service_port = 8002
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "lb"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -459,7 +459,7 @@ module "fe-lb-altssh" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 7331
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "lb"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -484,7 +484,7 @@ module "gcp-tcp-lb" {
names = "${var.tcp_lbs["names"]}"
project = "${var.project}"
region = "${var.region}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
targets = ["fe"]
}
......@@ -509,7 +509,7 @@ module "gcp-tcp-lb-internal" {
names = "${var.tcp_lbs_internal["names"]}"
project = "${var.project}"
region = "${var.region}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
subnetwork_self_link = "${module.fe-lb.google_compute_subnetwork_self_link}"
targets = ["fe"]
vpc = "${module.network.self_link}"
......@@ -529,7 +529,7 @@ module "gcp-tcp-lb-altssh" {
names = "${var.tcp_lbs_altssh["names"]}"
project = "${var.project}"
region = "${var.region}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
targets = ["fe-altssh"]
}
......@@ -547,7 +547,7 @@ module "gcp-tcp-lb-bastion" {
project = "${var.project}"
region = "${var.region}"
session_affinity = "CLIENT_IP"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
targets = ["bastion"]
}
......@@ -573,7 +573,7 @@ module "consul" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 8300
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -609,7 +609,7 @@ module "pubsubbeat" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -651,7 +651,7 @@ module "monitoring-lb" {
project = "${var.project}"
region = "${var.region}"
service_ports = ["${var.monitoring_hosts["ports"]}"]
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-lb.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
targets = ["${var.monitoring_hosts["names"]}"]
url_map = "${google_compute_url_map.monitoring-lb.self_link}"
......@@ -681,7 +681,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::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -712,7 +712,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::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -743,7 +743,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::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -767,7 +767,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -798,7 +798,7 @@ module "console" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......@@ -829,7 +829,7 @@ module "deploy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......@@ -860,7 +860,7 @@ module "bastion" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -884,7 +884,7 @@ module "gitlab_object_storage" {
service_account_email = "${var.service_account_email}"
gcs_service_account_email = "${var.gcs_service_account_email}"
gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.0.0"
}
resource "google_kms_key_ring_iam_binding" "bootstrap" {
......
......@@ -26,7 +26,7 @@ provider "google" {
#################################
module "network" {
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/vpc.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/vpc.git?ref=v1.0.0"
project = "${var.project}"
environment = "${var.environment}"
}
......@@ -63,7 +63,7 @@ resource "google_compute_network_peering" "peering_dr" {
module "proxy-iap" {
environment = "${var.environment}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/web-iap.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/web-iap.git?ref=v1.0.0"
name = "proxy"
project = "${var.project}"
region = "${var.region}"
......@@ -93,7 +93,7 @@ module "proxy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = "9090"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -127,7 +127,7 @@ module "pubsubbeat" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -168,7 +168,7 @@ module "monitoring-lb" {
project = "${var.project}"
region = "${var.region}"
service_ports = ["${var.monitoring_hosts["ports"]}"]
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-lb.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
targets = ["${var.monitoring_hosts["names"]}"]
url_map = "${google_compute_url_map.monitoring-lb.self_link}"
......@@ -195,7 +195,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::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -222,7 +222,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::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -249,7 +249,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::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -271,7 +271,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -294,7 +294,7 @@ module "blackbox" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -310,7 +310,7 @@ module "blackbox" {
module "dashboards-internal" {
environment = "${var.environment}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/web-iap.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/web-iap.git?ref=v1.0.0"
name = "dashboards"
project = "${var.project}"
region = "${var.region}"
......@@ -343,7 +343,7 @@ module "dashboards" {
service_account_email = "${var.service_account_email}"
service_path = "/api/health"
service_port = 80
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -358,7 +358,7 @@ module "dashboards" {
module "dashboards-com-lb" {
environment = "${var.environment}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/web-iap.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/web-iap.git?ref=v1.0.0"
name = "dashboards-com"
project = "${var.project}"
region = "${var.region}"
......@@ -391,7 +391,7 @@ module "dashboards-com" {
service_account_email = "${var.service_account_email}"
service_path = "/api/health"
service_port = 80
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -444,7 +444,7 @@ module "gitlab-ops" {
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -489,7 +489,7 @@ module "gitlab-ops-geo" {
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.0"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -515,7 +515,7 @@ module "gcp-tcp-lb-bastion" {
project = "${var.project}"
region = "${var.region}"
session_affinity = "CLIENT_IP"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
targets = ["bastion"]
}
......@@ -535,7 +535,7 @@ module "bastion" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -564,7 +564,7 @@ module "runner" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -593,7 +593,7 @@ module "runner-chatops" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -622,7 +622,7 @@ module "runner-release" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -653,7 +653,7 @@ module "runner-release-single" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.0"
subnetwork_name = "${module.runner-release.google_compute_subnetwork_name}"
tier = "inf"
use_new_node_name = true
......@@ -679,7 +679,7 @@ module "sentry-lb" {
names = "${var.tcp_lbs_sentry["names"]}"
project = "${var.project}"
region = "${var.region}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/tcp-lb.git?ref=v1.0.0"
targets = ["sentry"]
}
......@@ -701,7 +701,7 @@ module "sentry" {
public_ports = "${var.public_ports["sentry"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-stor.git?ref=v1.0.0"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -725,7 +725,7 @@ module "storage" {
service_account_email = "${var.service_account_email}"
gcs_service_account_email = "${var.gcs_service_account_email}"
gcs_storage_analytics_group_email = "${var.gcs_storage_analytics_group_email}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/storage-buckets.git?ref=v1.0.0"
}
##################################
......@@ -786,7 +786,7 @@ module "gke-runner" {
environment = "${var.environment}"
name = "gke-runner"
vpc = "${module.network.self_link}"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/gke.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/gke.git?ref=v1.0.0"
initial_node_count = 1
ip_cidr_range = "${var.subnetworks["gke-runner"]}"
dns_zone_name = "${var.dns_zone_name}"
......
This diff is collapsed.
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