Commit 61377a3e authored by John Jarvis's avatar John Jarvis

Add web-puma

parent 0462b7dd
...@@ -93,7 +93,7 @@ module "prometheus" { ...@@ -93,7 +93,7 @@ module "prometheus" {
chef_provision = "${var.chef_provision}" chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus]\"" chef_run_list = "\"role[${var.environment}-infra-prometheus]\""
data_disk_size = 1000 data_disk_size = 1000
data_disk_type = "pd-standard" data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}" dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}" environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}" fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
...@@ -110,7 +110,7 @@ module "prometheus" { ...@@ -110,7 +110,7 @@ module "prometheus" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_path = "/graph" service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus"))}" service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}" subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf" tier = "inf"
use_external_ip = true use_external_ip = true
...@@ -124,7 +124,7 @@ module "prometheus-app" { ...@@ -124,7 +124,7 @@ module "prometheus-app" {
chef_provision = "${var.chef_provision}" chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\"" chef_run_list = "\"role[${var.environment}-infra-prometheus-app]\""
data_disk_size = 1000 data_disk_size = 1000
data_disk_type = "pd-standard" data_disk_type = "pd-ssd"
dns_zone_name = "${var.dns_zone_name}" dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}" environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}" fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
...@@ -140,7 +140,7 @@ module "prometheus-app" { ...@@ -140,7 +140,7 @@ module "prometheus-app" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_path = "/graph" service_path = "/graph"
service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-app"))}" service_port = "${element(var.monitoring_hosts["ports"], index(var.monitoring_hosts["names"], "prometheus-app"))}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/monitoring-with-count.git?ref=v1.0.4"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}" subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf" tier = "inf"
use_external_ip = true use_external_ip = true
...@@ -164,7 +164,7 @@ module "sd-exporter" { ...@@ -164,7 +164,7 @@ module "sd-exporter" {
public_ports = "${var.public_ports["sd-exporter"]}" public_ports = "${var.public_ports["sd-exporter"]}"
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
subnetwork_name = "${google_compute_subnetwork.monitoring.name}" subnetwork_name = "${google_compute_subnetwork.monitoring.name}"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
...@@ -210,7 +210,7 @@ module "bastion" { ...@@ -210,7 +210,7 @@ module "bastion" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 22 service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "inf" tier = "inf"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -288,7 +288,7 @@ module "fe-lb" { ...@@ -288,7 +288,7 @@ module "fe-lb" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_path = "/-/available-https" service_path = "/-/available-https"
service_port = 8002 service_port = 8002
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "lb" tier = "lb"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -317,7 +317,7 @@ module "fe-lb-pages" { ...@@ -317,7 +317,7 @@ module "fe-lb-pages" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 7331 service_port = 7331
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "lb" tier = "lb"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -347,7 +347,7 @@ module "fe-lb-registry" { ...@@ -347,7 +347,7 @@ module "fe-lb-registry" {
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_path = "/-/available-https" service_path = "/-/available-https"
service_port = 8002 service_port = 8002
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "lb" tier = "lb"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -463,7 +463,7 @@ module "registry" { ...@@ -463,7 +463,7 @@ module "registry" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 22 service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -493,7 +493,7 @@ module "web" { ...@@ -493,7 +493,7 @@ module "web" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 443 service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -522,7 +522,7 @@ module "api" { ...@@ -522,7 +522,7 @@ module "api" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 443 service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -552,7 +552,7 @@ module "git" { ...@@ -552,7 +552,7 @@ module "git" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 22 service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -581,7 +581,7 @@ module "web-pages" { ...@@ -581,7 +581,7 @@ module "web-pages" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 443 service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
...@@ -655,7 +655,7 @@ module "gitaly" { ...@@ -655,7 +655,7 @@ module "gitaly" {
region = "${var.region}" region = "${var.region}"
service_account_email = "${var.service_account_email}" service_account_email = "${var.service_account_email}"
service_port = 22 service_port = 22
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2" source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.3"
tier = "sv" tier = "sv"
use_new_node_name = true use_new_node_name = true
vpc = "${module.network.self_link}" vpc = "${module.network.self_link}"
......
...@@ -139,6 +139,10 @@ variable "subnetworks" { ...@@ -139,6 +139,10 @@ variable "subnetworks" {
"gitaly" = "10.232.18.0/24" "gitaly" = "10.232.18.0/24"
"deploy" = "10.232.19.0/24" "deploy" = "10.232.19.0/24"
# 10.232.20.0 is skipped until the test
# gke cluster for registry is removed
"web-puma" = "10.232.21.0/24"
# /mnt/storage # /mnt/storage
"filestore-storage" = "10.237.0.0/29" "filestore-storage" = "10.237.0.0/29"
...@@ -176,6 +180,7 @@ variable "public_ports" { ...@@ -176,6 +180,7 @@ variable "public_ports" {
"sd-exporter" = [] "sd-exporter" = []
"pubsubbeat" = [] "pubsubbeat" = []
"web" = [] "web" = []
"web-puma" = [443, 80, 22]
"api" = [] "api" = []
"git" = [] "git" = []
"sidekiq" = [] "sidekiq" = []
......
##################################
#
# Web front-end for puma testing
#
#################################
module "web-puma" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-fe-web-puma]\""
dns_zone_name = "${var.dns_zone_name}"
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["web-puma"]}"
machine_type = "${var.machine_types["web"]}"
name = "web-puma"
node_count = "${var.node_count["web"]}"
os_disk_type = "pd-ssd"
project = "${var.project}"
public_ports = "${var.public_ports["web-puma"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::ssh://[email protected]/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git?ref=v1.0.2"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
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