Commit b0d11e69 authored by Alejandro Rodríguez's avatar Alejandro Rodríguez
Browse files

Point to ops.gitlab.net's module repositories

parent ece76d71
......@@ -23,8 +23,8 @@ docs](./docs/working-with-cattle.md)
While some modules are still maintained under the `./modules` directory, we are actively migrating
module code to standalone repositories under the
[`gitlab-com/gl-infra/terraform-modules`](https://gitlab.com/gitlab-com/gl-infra/terraform-modules) group in
the gitlab.com instance (see [infrastructure#5688](https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/5688) for
[`gitlab-com/gl-infra/terraform-modules`](https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules) group in
the ops.gitlab.net instance (see [infrastructure#5688](https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/5688) for
current progress).
## Setup
......
......@@ -93,7 +93,7 @@ module "nat" {
module "network" {
environment = "${var.environment}"
project = "${var.project}"
source = "git::https://gitlab.com/gitlab-com/gl-infra/terraform-modules/google/vpc.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/vpc.git"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
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://gitlab.com/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"
targets = ["bastion"]
}
......@@ -573,7 +573,7 @@ module "consul" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 8300
source = "git::https://gitlab.com/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"
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://gitlab.com/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -660,7 +660,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://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -691,7 +691,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://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -722,7 +722,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://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -746,7 +746,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -777,7 +777,7 @@ module "console" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......@@ -808,7 +808,7 @@ module "deploy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "sv"
use_external_ip = true
use_new_node_name = true
......@@ -839,7 +839,7 @@ module "bastion" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -863,7 +863,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://gitlab.com/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"
}
resource "google_kms_key_ring_iam_binding" "bootstrap" {
......
......@@ -26,7 +26,7 @@ provider "google" {
#################################
module "network" {
source = "git::https://gitlab.com/gitlab-com/gl-infra/terraform-modules/google/vpc.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/vpc.git"
project = "${var.project}"
environment = "${var.environment}"
}
......@@ -57,7 +57,7 @@ resource "google_compute_network_peering" "peering_gstg" {
module "proxy-iap" {
environment = "${var.environment}"
source = "git::https://gitlab.com/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"
name = "proxy"
project = "${var.project}"
region = "${var.region}"
......@@ -87,7 +87,7 @@ module "proxy" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = "9090"
source = "git::https://gitlab.com/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"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -121,7 +121,7 @@ module "pubsubbeat" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/pubsubbeat.git"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -162,7 +162,7 @@ module "monitoring-lb" {
project = "${var.project}"
region = "${var.region}"
service_ports = ["${var.monitoring_hosts["ports"]}"]
source = "git::https://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
targets = ["${var.monitoring_hosts["names"]}"]
url_map = "${google_compute_url_map.monitoring-lb.self_link}"
......@@ -189,7 +189,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://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -216,7 +216,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://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_external_ip = true
......@@ -243,7 +243,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://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -265,7 +265,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -288,7 +288,7 @@ module "blackbox" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf"
use_new_node_name = true
......@@ -304,7 +304,7 @@ module "blackbox" {
module "dashboards-internal" {
environment = "${var.environment}"
source = "git::https://gitlab.com/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"
name = "dashboards"
project = "${var.project}"
region = "${var.region}"
......@@ -337,7 +337,7 @@ module "dashboards" {
service_account_email = "${var.service_account_email}"
service_path = "/api/health"
service_port = 80
source = "git::https://gitlab.com/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"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -352,7 +352,7 @@ module "dashboards" {
module "dashboards-com-lb" {
environment = "${var.environment}"
source = "git::https://gitlab.com/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"
name = "dashboards-com"
project = "${var.project}"
region = "${var.region}"
......@@ -385,7 +385,7 @@ module "dashboards-com" {
service_account_email = "${var.service_account_email}"
service_path = "/api/health"
service_port = 80
source = "git::https://gitlab.com/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"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -438,7 +438,7 @@ module "gitlab-ops" {
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::https://gitlab.com/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"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -483,7 +483,7 @@ module "gitlab-ops-geo" {
service_account_email = "${var.service_account_email}"
service_path = "/-/liveness"
service_port = 443
source = "git::https://gitlab.com/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"
tier = "inf"
use_external_ip = true
use_new_node_name = true
......@@ -509,7 +509,7 @@ module "gcp-tcp-lb-bastion" {
project = "${var.project}"
region = "${var.region}"
session_affinity = "CLIENT_IP"
source = "git::https://gitlab.com/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"
targets = ["bastion"]
}
......@@ -529,7 +529,7 @@ module "bastion" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -558,7 +558,7 @@ module "runner" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -587,7 +587,7 @@ module "runner-chatops" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -616,7 +616,7 @@ module "runner-release" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
tier = "inf"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -647,7 +647,7 @@ module "runner-release-single" {
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 22
source = "git::https://gitlab.com/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"
subnetwork_name = "${module.runner-release.google_compute_subnetwork_name}"
tier = "inf"
use_new_node_name = true
......@@ -673,7 +673,7 @@ module "sentry-lb" {
names = "${var.tcp_lbs_sentry["names"]}"
project = "${var.project}"
region = "${var.region}"
source = "git::https://gitlab.com/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"
targets = ["sentry"]
}
......@@ -695,7 +695,7 @@ module "sentry" {
public_ports = "${var.public_ports["sentry"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
source = "git::https://gitlab.com/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"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
......@@ -719,7 +719,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://gitlab.com/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"
}
##################################
......@@ -780,7 +780,7 @@ module "gke-runner" {
environment = "${var.environment}"
name = "gke-runner"
vpc = "${module.network.self_link}"
source = "git::https://gitlab.com/gitlab-com/gl-infra/terraform-modules/google/gke.git"
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/gke.git"
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