Commit 5a1b09ec authored by Graeme Gillies's avatar Graeme Gillies
Browse files

Revert "Add node pool for web service in Production"

This reverts commit 8d5f6af0.

This is because change request https://gitlab.com/gitlab-com/gl-infra/production/-/issues/5247
needs to be reverted.
parent eccaa2c8
......@@ -229,13 +229,6 @@ module "gitlab-gke" {
node_disk_type = "pd-standard"
type = "git-https"
}
"web-0" = { //Note: this node pool only runs cny web workloads
machine_type = var.machine_types["gke-web-cny"]
max_node_count = var.gke_nodepool_max_nodes["web-cny"]
node_auto_upgrade = true
node_disk_type = "pd-standard"
type = "web"
}
"websockets-1" = {
machine_type = var.machine_types["gke-websockets"]
max_node_count = var.gke_nodepool_max_nodes["websockets"]
......
......@@ -83,13 +83,6 @@ module "gke-us-east1-b" {
type = "registry"
node_disk_type = "pd-standard"
}
"web-0" = {
machine_type = var.machine_types["gke-web"]
max_node_count = var.gke_nodepool_max_nodes["web"]
node_auto_upgrade = true
node_disk_type = "pd-standard"
type = "web"
}
"websockets-1" = {
machine_type = var.machine_types["gke-websockets"]
max_node_count = var.gke_nodepool_max_nodes["websockets"]
......@@ -187,13 +180,6 @@ module "gke-us-east1-c" {
type = "registry"
node_disk_type = "pd-standard"
}
"web-0" = {
machine_type = var.machine_types["gke-web"]
max_node_count = var.gke_nodepool_max_nodes["web"]
node_auto_upgrade = true
node_disk_type = "pd-standard"
type = "web"
}
"websockets-1" = {
machine_type = var.machine_types["gke-websockets"]
max_node_count = var.gke_nodepool_max_nodes["websockets"]
......@@ -292,13 +278,6 @@ module "gke-us-east1-d" {
node_auto_upgrade = true
node_disk_type = "pd-standard"
}
"web-0" = {
machine_type = var.machine_types["gke-web"]
max_node_count = var.gke_nodepool_max_nodes["web"]
node_auto_upgrade = true
node_disk_type = "pd-standard"
type = "web"
}
"websockets-1" = {
machine_type = var.machine_types["gke-websockets"]
max_node_count = var.gke_nodepool_max_nodes["websockets"]
......
......@@ -361,8 +361,6 @@ variable "machine_types" {
"gke-memory-bound" = "n1-standard-8"
"gke-registry" = "n1-highmem-8"
"gke-urgent-cpu-bound" = "c2-standard-4"
"gke-web-cny" = "c2-standard-16"
"gke-web" = "c2-standard-16"
"gke-websockets" = "n1-standard-8"
"influxdb" = "n1-standard-8"
"monitoring-app" = "n1-highmem-32"
......@@ -473,8 +471,6 @@ variable "gke_nodepool_max_nodes" {
"low-urgency-cpu-bound" = 20
"urgent-other" = 10
"urgent-cpu-bound" = 15
"web" = 50
"web-cny" = 10
}
}
......
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