Commit acce6de5 authored by Cindy Pallares's avatar Cindy Pallares 👽

Merge branch 'remove-fe-registry-temp-lb' into 'master'

Remove temporary registry nodes

See merge request !1975
parents e346587f 37d53cae
......@@ -1243,34 +1243,6 @@ module "fe-lb-registry" {
vpc = module.network.self_link
}
# NOTE: Although named "temp" this is the actual module serving
# registry.gitlab.com. For more details, see
# https://gitlab.com/gitlab-com/gl-infra/production/-/issues/2381
module "fe-lb-registry-temp" {
assign_public_ip = false
bootstrap_version = var.bootstrap_script_version
chef_provision = var.chef_provision
chef_run_list = "\"role[${var.environment}-base-lb-registry]\""
create_backend_service = true
dns_zone_name = var.dns_zone_name
environment = var.environment
health_check = "http"
ip_cidr_range = var.subnetworks["fe-lb-registry-temp"]
machine_type = var.machine_types["fe-lb-registry"]
name = "fe-registry-temp"
node_count = var.node_count["fe-lb-registry-temp"]
project = var.project
public_ports = var.public_ports["fe-lb"]
region = var.region
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=v3.1.1"
tier = "lb"
use_new_node_name = true
vpc = module.network.self_link
}
##################################
#
# External HAProxy LoadBalancer Canary
......
......@@ -423,7 +423,6 @@ variable "node_count" {
"fe-lb-altssh" = 3
"fe-lb-pages" = 5
"fe-lb-registry" = 3
"fe-lb-registry-temp" = 4
"fe-lb-cny" = 0
"git" = 24
"patroni" = 8
......@@ -474,7 +473,6 @@ variable "subnetworks" {
"fe-lb-altssh" = "10.216.3.0/24"
"bastion" = "10.216.4.0/24"
"fe-lb-registry" = "10.216.5.0/24"
"fe-lb-registry-temp" = "10.221.13.0/24"
"fe-lb-cny" = "10.216.6.0/24"
"gitlab-gke" = "10.216.8.0/23" # ~512 nodes
"redis" = "10.217.2.0/24"
......
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