Commit 2f9236e7 authored by Cameron McFarland's avatar Cameron McFarland

Merge branch 'master' into cmcfarland/snowplow

Moving master target might have messed up my rebase from before.
parents beb36fc2 59e5c5a3
......@@ -416,7 +416,7 @@ variable "node_count" {
"thanos-compact" = 1
"thanos-store" = 1
"contributors" = 1
"multizone-stor" = 12
"multizone-stor" = 16
"web" = 28
"web-pages" = 8
"web-cny" = 2
......
......@@ -51,7 +51,7 @@ variable "machine_types" {
"sentry" = "n1-standard-16"
"sd-exporter" = "n1-standard-1"
"thanos-compact" = "n1-standard-2"
"thanos-query" = "n1-standard-2"
"thanos-query" = "n1-standard-8"
"thanos-store" = "n1-highmem-8"
"gke-runner" = "n1-standard-2"
"nessus" = "n1-standard-4"
......
......@@ -596,7 +596,6 @@ module "patroni-pg-11" {
health_check = "http"
health_check_port = "8009"
ip_cidr_range = "${var.subnetworks["postgres11"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["patroni"]}"
name = "postgres11"
node_count = "${var.node_count["postgres-11"]}"
......
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