Commit bae0a1ee authored by Steve Azzopardi's avatar Steve Azzopardi
Browse files

Merge branch 'peer-production-gprd-with-ci-ci' into 'master'

Peer gitlab-production/gprd with gitlab-ci/ci networks

See merge request !2806
parents 19979486 c02fef74
......@@ -52,6 +52,15 @@ module "docker-machine-firewalls" {
runner_managers_cidrs = [google_compute_subnetwork.runner-managers.ip_cidr_range]
}
# Peering GPRD network to allow communication between Prometheus server and runner managers.
# It's needed until we will migrate to dedicated server deployed in GKE, which is tracked
# by https://gitlab.com/gitlab-com/gl-infra/infrastructure/-/issues/13886.
resource "google_compute_network_peering" "peering-ci-to-gprd" {
name = "peering-gprd-for-monitoring"
network = module.network.self_link
peer_network = "https://www.googleapis.com/compute/v1/projects/gitlab-production/global/networks/gprd"
}
##############################
# Runner manager deployments #
##############################
......
......@@ -227,10 +227,11 @@ variable "peer_networks" {
type = map(list(string))
default = {
"names" = ["ops", "gstg"]
"names" = ["ops", "gstg", "ci"]
"links" = [
"https://www.googleapis.com/compute/v1/projects/gitlab-ops/global/networks/ops",
"https://www.googleapis.com/compute/v1/projects/gitlab-staging-1/global/networks/gstg",
"https://www.googleapis.com/compute/v1/projects/gitlab-ci-155816/global/networks/ci",
]
}
}
......
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