Commit 4ac6a7df authored by John Jarvis's avatar John Jarvis

Merge branch 'jarv/add-pre-ha' into 'master'

Add config for preprod HA

See merge request !742
parents 6e3d1af5 336689be
This diff is collapsed.
variable "gitlab_io_zone_id" {}
variable "project" {
default = "gitlab-pre"
}
variable "bootstrap_script_version" {
default = 7
}
variable "region" {
default = "us-east1"
}
......@@ -46,11 +52,20 @@ variable "machine_types" {
type = "map"
default = {
"bastion" = "n1-standard-1"
"gitlab-pre" = "n1-standard-16"
"monitoring" = "n1-standard-2"
"sd-exporter" = "n1-standard-1"
"gke-runner" = "n1-standard-2"
"bastion" = "n1-standard-1"
"gitlab-pre" = "n1-standard-16"
"monitoring" = "n1-standard-2"
"sd-exporter" = "n1-standard-1"
"gke-runner" = "n1-standard-2"
"web" = "n1-standard-1"
"git" = "n1-standard-1"
"api" = "n1-standard-1"
"sidekiq-besteffort" = "n1-standard-1"
"registry" = "n1-standard-1"
"web-pages" = "n1-standard-1"
"fe-lb" = "n1-standard-1"
"gitaly" = "n1-standard-1"
"deploy" = "n1-standard-1"
}
}
......@@ -105,12 +120,28 @@ variable "subnetworks" {
type = "map"
default = {
"bastion" = "10.232.1.0/24"
"gitlab-pre" = "10.232.2.0/24"
"monitoring" = "10.232.3.0/24"
"pubsubbeat" = "10.232.4.0/24"
"gke-runner" = "10.232.5.0/24"
"sd-exporter" = "10.232.6.0/24"
"bastion" = "10.232.1.0/24"
"gitlab-pre" = "10.232.2.0/24"
"monitoring" = "10.232.3.0/24"
"pubsubbeat" = "10.232.4.0/24"
"gke-runner" = "10.232.5.0/24"
"sd-exporter" = "10.232.6.0/24"
"redis " = "10.232.7.0/24"
"fe-lb" = "10.232.9.0/24"
"fe-lb-pages" = "10.232.10.0/24"
"fe-lb-registry" = "10.232.11.0/24"
"registry" = "10.232.12.0/24"
"web" = "10.232.13.0/24"
"api" = "10.232.14.0/24"
"git" = "10.232.15.0/24"
"sidekiq" = "10.232.16.0/24"
"web-pages" = "10.232.17.0/24"
"gitaly" = "10.232.18.0/24"
"deploy" = "10.232.19.0/24"
# /mnt/storage
"filestore-storage" = "10.237.0.0/29"
"pod-ip-cidr-range" = "10.238.0.0/16"
"service-ip-cidr-range" = "10.239.0.0/16"
}
......@@ -144,6 +175,15 @@ variable "public_ports" {
"gitlab-pre" = [443, 80, 22, 5005]
"sd-exporter" = []
"pubsubbeat" = []
"web" = []
"api" = []
"git" = []
"sidekiq" = []
"registry" = []
"web-pages" = []
"fe-lb" = [22, 80, 443]
"gitaly" = []
"deploy" = []
}
}
......@@ -151,11 +191,22 @@ variable "node_count" {
type = "map"
default = {
"bastion" = 1
"gitlab-pre" = 1
"prometheus" = 1
"prometheus-app" = 1
"sd-exporter" = 1
"bastion" = 1
"gitlab-pre" = 1
"prometheus" = 1
"prometheus-app" = 1
"sd-exporter" = 1
"web" = 1
"git" = 1
"api" = 1
"sidekiq-besteffort" = 1
"web-pages" = 1
"registry" = 1
"fe-lb" = 1
"fe-lb-pages" = 1
"fe-lb-registry" = 1
"gitaly" = 1
"deploy" = 1
}
}
......@@ -179,11 +230,36 @@ variable "monitoring_cert_link" {
default = "projects/gitlab-pre/global/sslCertificates/wildcard-pre-gitlab-net"
}
variable "data_disk_sizes" {
type = "map"
default = {
"file" = "100"
"share" = "100"
"pages" = "100"
}
}
variable "lb_fqdns" {
type = "list"
default = ["test.pre.gitlab.com", "pre.gitlab.com"]
}
variable "lb_fqdns_bastion" {
type = "list"
default = ["lb-bastion.pre.gitlab.com"]
}
variable "lb_fqdns_pages" {
type = "list"
default = ["*.pages.pre.gitlab.io"]
}
variable "lb_fqdns_registry" {
type = "list"
default = ["registry-test.pre.gitlab.com", "registry.pre.gitlab.com"]
}
variable "tcp_lbs_bastion" {
type = "map"
......@@ -194,6 +270,26 @@ variable "tcp_lbs_bastion" {
}
}
variable "tcp_lbs_pages" {
type = "map"
default = {
"names" = ["http", "https"]
"forwarding_port_ranges" = ["80", "443"]
"health_check_ports" = ["8001", "8002"]
}
}
variable "tcp_lbs_registry" {
type = "map"
default = {
"names" = ["http", "https"]
"forwarding_port_ranges" = ["80", "443"]
"health_check_ports" = ["8001", "8002"]
}
}
variable "tcp_lbs_sentry" {
type = "map"
......@@ -205,6 +301,16 @@ variable "tcp_lbs_sentry" {
}
}
variable "tcp_lbs" {
type = "map"
default = {
"names" = ["http", "https", "ssh"]
"forwarding_port_ranges" = ["80", "443", "22"]
"health_check_ports" = ["8001", "8002", "8003"]
}
}
variable "pre_gitlab_net_cert_link" {
default = "projects/gitlab-pre/global/sslCertificates/pre-gitlab-net"
}
......@@ -213,3 +319,13 @@ variable "gcs_service_account_email" {
type = "string"
default = "gitlab-object-storage@gitlab-pre.iam.gserviceaccount.com"
}
variable "egress_ports" {
type = "list"
default = ["80", "443"]
}
variable "deploy_egress_ports" {
type = "list"
default = ["80", "443", "22"]
}
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