Commit 138f53cd authored by Andrew Newdigate's avatar Andrew Newdigate Committed by Craig Barrett

Add new export nodes

parent 46f24119
......@@ -296,6 +296,8 @@ module "sidekiq" {
sidekiq_besteffort_instance_type = var.machine_types["sidekiq-besteffort"]
sidekiq_elasticsearch_count = var.node_count["sidekiq-elasticsearch"]
sidekiq_elasticsearch_instance_type = var.machine_types["sidekiq-elasticsearch"]
sidekiq_export_count = var.node_count["sidekiq-export"]
sidekiq_export_instance_type = var.machine_types["sidekiq-export"]
sidekiq_import_count = var.node_count["sidekiq-import"]
sidekiq_import_instance_type = var.machine_types["sidekiq-import"]
sidekiq_pages_count = var.node_count["sidekiq-pages"]
......@@ -308,7 +310,7 @@ module "sidekiq" {
sidekiq_realtime_instance_type = var.machine_types["sidekiq-realtime"]
sidekiq_traces_count = var.node_count["sidekiq-traces"]
sidekiq_traces_instance_type = var.machine_types["sidekiq-traces"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v2.0.0"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.0.0"
tier = "sv"
use_new_node_name = true
vpc = module.network.self_link
......
......@@ -285,6 +285,7 @@ variable "machine_types" {
"sidekiq-asap" = "n1-standard-8"
"sidekiq-besteffort" = "n1-standard-8"
"sidekiq-elasticsearch" = "n1-standard-8"
"sidekiq-export" = "n1-highmem-8"
"sidekiq-import" = "n1-highmem-8"
"sidekiq-pages" = "n1-standard-8"
"sidekiq-pipeline" = "n1-standard-8"
......@@ -324,6 +325,7 @@ variable "node_count" {
"sidekiq-asap" = 0
"sidekiq-besteffort" = 1
"sidekiq-elasticsearch" = 0
"sidekiq-export" = 0
"sidekiq-import" = 0
"sidekiq-pages" = 0
"sidekiq-pipeline" = 0
......
......@@ -634,6 +634,8 @@ module "sidekiq" {
sidekiq_besteffort_instance_type = var.machine_types["sidekiq-besteffort"]
sidekiq_elasticsearch_count = var.node_count["sidekiq-elasticsearch"]
sidekiq_elasticsearch_instance_type = var.machine_types["sidekiq-elasticsearch"]
sidekiq_export_count = var.node_count["sidekiq-export"]
sidekiq_export_instance_type = var.machine_types["sidekiq-export"]
sidekiq_import_count = var.node_count["sidekiq-import"]
sidekiq_import_instance_type = var.machine_types["sidekiq-import"]
sidekiq_pages_count = var.node_count["sidekiq-pages"]
......@@ -646,7 +648,7 @@ module "sidekiq" {
sidekiq_realtime_instance_type = var.machine_types["sidekiq-realtime"]
sidekiq_traces_count = var.node_count["sidekiq-traces"]
sidekiq_traces_instance_type = var.machine_types["sidekiq-traces"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v2.0.0"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.0.0"
tier = "sv"
use_new_node_name = true
vpc = module.network.self_link
......
......@@ -347,6 +347,7 @@ variable "machine_types" {
"sidekiq-asap" = "custom-4-20480"
"sidekiq-besteffort" = "n1-standard-8"
"sidekiq-elasticsearch" = "n1-standard-8"
"sidekiq-export" = "n1-highmem-8"
"sidekiq-import" = "n1-highmem-8"
"sidekiq-pages" = "n1-standard-4"
"sidekiq-pipeline" = "custom-8-15360"
......@@ -400,6 +401,7 @@ variable "node_count" {
"sidekiq-asap" = 5
"sidekiq-besteffort" = 6
"sidekiq-elasticsearch" = 0
"sidekiq-export" = 0
"sidekiq-import" = 4
"sidekiq-pages" = 6
"sidekiq-pipeline" = 8
......
......@@ -672,6 +672,8 @@ module "sidekiq" {
sidekiq_besteffort_instance_type = var.machine_types["sidekiq-besteffort"]
sidekiq_elasticsearch_count = var.node_count["sidekiq-elasticsearch"]
sidekiq_elasticsearch_instance_type = var.machine_types["sidekiq-elasticsearch"]
sidekiq_export_count = var.node_count["sidekiq-export"]
sidekiq_export_instance_type = var.machine_types["sidekiq-export"]
sidekiq_import_count = var.node_count["sidekiq-import"]
sidekiq_import_instance_type = var.machine_types["sidekiq-import"]
sidekiq_pages_count = var.node_count["sidekiq-pages"]
......@@ -684,7 +686,7 @@ module "sidekiq" {
sidekiq_realtime_instance_type = var.machine_types["sidekiq-realtime"]
sidekiq_traces_count = var.node_count["sidekiq-traces"]
sidekiq_traces_instance_type = var.machine_types["sidekiq-traces"]
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v2.0.0"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.0.0"
tier = "sv"
use_new_node_name = true
vpc = module.network.self_link
......
......@@ -338,6 +338,7 @@ variable "machine_types" {
"sidekiq-asap" = "n1-standard-4"
"sidekiq-besteffort" = "n1-standard-4"
"sidekiq-elasticsearch" = "n1-standard-4"
"sidekiq-export" = "n1-highmem-8"
"sidekiq-import" = "n1-highmem-8"
"sidekiq-pages" = "n1-standard-4"
"sidekiq-pipeline" = "n1-standard-4"
......@@ -392,6 +393,7 @@ variable "node_count" {
"sidekiq-asap" = 1
"sidekiq-besteffort" = 3
"sidekiq-elasticsearch" = 1
"sidekiq-export" = 1
"sidekiq-import" = 1
"sidekiq-pages" = 1
"sidekiq-pipeline" = 2
......
......@@ -767,6 +767,8 @@ module "sidekiq" {
sidekiq_besteffort_instance_type = var.machine_types["sidekiq-besteffort"]
sidekiq_elasticsearch_count = "0"
sidekiq_elasticsearch_instance_type = "none"
sidekiq_export_count = "0"
sidekiq_export_instance_type = "none"
sidekiq_import_count = "0"
sidekiq_import_instance_type = "none"
sidekiq_pages_count = "0"
......@@ -779,7 +781,7 @@ module "sidekiq" {
sidekiq_realtime_instance_type = "none"
sidekiq_traces_count = "0"
sidekiq_traces_instance_type = "none"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v2.0.0"
source = "git::ssh://git@ops.gitlab.net/gitlab-com/gl-infra/terraform-modules/google/generic-sv-sidekiq.git?ref=v3.0.0"
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