Commit ea5f0877 authored by John Jarvis's avatar John Jarvis

Add a canary for registry and bring back staging canaries

parent 1d4b0d70
......@@ -414,6 +414,7 @@ variable "node_count" {
"web-cny" = 2
"api-cny" = 2
"git-cny" = 2
"registry-cny" = 2
"alerts" = 2
"prometheus" = 2
"prometheus-app" = 2
......
......@@ -403,9 +403,10 @@ variable "node_count" {
"multizone-stor" = 0
"web" = 3
"web-pages" = 2
"web-cny" = 0
"api-cny" = 0
"git-cny" = 0
"web-cny" = 1
"api-cny" = 1
"git-cny" = 1
"registry-cny" = 1
"prometheus" = 2
"prometheus-app" = 2
"alerts" = 2
......
......@@ -214,6 +214,37 @@ module "git-cny" {
vpc = "${module.network.self_link}"
}
##################################
#
# Registry Canary front-end
#
#################################
module "registry-cny" {
bootstrap_version = "${var.bootstrap_script_version}"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-fe-registry-cny]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["registry"]}"
kernel_version = "4.13.0-1007"
machine_type = "${var.machine_types["registry"]}"
name = "registry-cny"
node_count = "${var.node_count["registry-cny"]}"
os_disk_type = "pd-ssd"
project = "${var.project}"
public_ports = "${var.public_ports["registry"]}"
region = "${var.region}"
service_account_email = "${var.service_account_email}"
service_port = 443
source = "git::https://ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-with-group.git"
subnetwork_name = "${module.registry.google_compute_subnetwork_name}"
tier = "sv"
use_new_node_name = true
vpc = "${module.network.self_link}"
}
##################################
#
# API
......
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