Commit 91a9f3c1 authored by John Jarvis's avatar John Jarvis

Remove all default kernel versions

parent 4f47310a
......@@ -125,7 +125,6 @@ module "web" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["web"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["web"]}"
name = "web"
node_count = "${var.node_count["web"]}"
......@@ -155,7 +154,6 @@ module "api" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["api"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["api"]}"
name = "api"
node_count = "${var.node_count["api"]}"
......@@ -186,7 +184,6 @@ module "git" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["git"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["git"]}"
name = "git"
node_count = "${var.node_count["git"]}"
......@@ -241,7 +238,6 @@ module "patroni" {
health_check = "http"
health_check_port = "8009"
ip_cidr_range = "${var.subnetworks["patroni"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["db"]}"
name = "patroni"
node_count = "${var.node_count["patroni"]}"
......@@ -270,7 +266,6 @@ module "geo-postgres" {
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["geodb"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["geodb"]}"
name = "geo-postgres"
node_count = "${var.node_count["geodb"]}"
......@@ -301,7 +296,6 @@ module "redis" {
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
......@@ -328,7 +322,6 @@ module "sidekiq" {
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["sidekiq"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["sidekiq"]}"
name = "sidekiq"
os_disk_type = "pd-ssd"
......@@ -376,7 +369,6 @@ module "file" {
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["stor"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["stor"]}"
name = "file"
node_count = "${var.node_count["stor"]}"
......@@ -413,7 +405,6 @@ module "pages" {
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["pages"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["stor-pages"]}"
name = "pages"
node_count = "${var.node_count["pages"]}"
......@@ -445,7 +436,6 @@ module "fe-lb" {
environment = "${var.environment}"
health_check = "http"
ip_cidr_range = "${var.subnetworks["fe-lb"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["fe-lb"]}"
name = "fe"
node_count = "${var.node_count["fe-lb"]}"
......@@ -476,7 +466,6 @@ module "fe-lb-altssh" {
environment = "${var.environment}"
health_check = "http"
ip_cidr_range = "${var.subnetworks["fe-lb-altssh"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["fe-lb"]}"
name = "fe-altssh"
node_count = "${var.node_count["fe-lb-altssh"]}"
......@@ -590,7 +579,6 @@ module "consul" {
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["consul"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["consul"]}"
name = "consul"
node_count = "${var.node_count["consul"]}"
......@@ -627,7 +615,6 @@ module "pubsubbeat" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["pubsubbeat"]}"
kernel_version = "${var.default_kernel_version}"
machine_types = "${var.pubsubbeats["machine_types"]}"
names = "${var.pubsubbeats["names"]}"
project = "${var.project}"
......@@ -694,7 +681,6 @@ module "prometheus" {
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
fw_whitelist_ports = "${var.monitoring_whitelist_prometheus["ports"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["monitoring"]}"
name = "prometheus"
node_count = "${var.node_count["prometheus"]}"
......@@ -724,7 +710,6 @@ module "prometheus-app" {
environment = "${var.environment}"
fw_whitelist_subnets = "${concat(var.monitoring_whitelist_prometheus["subnets"], var.other_monitoring_subnets)}"
fw_whitelist_ports = "${var.monitoring_whitelist_prometheus["ports"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["monitoring"]}"
name = "prometheus-app"
node_count = "${var.node_count["prometheus-app"]}"
......@@ -753,7 +738,6 @@ module "sd-exporter" {
create_backend_service = false
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["sd-exporter"]}"
name = "sd-exporter"
node_count = "${var.node_count["sd-exporter"]}"
......@@ -778,7 +762,6 @@ module "thanos-store" {
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-store"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos-store"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos-store"
......@@ -804,7 +787,6 @@ module "thanos-compact" {
egress_ports = "${var.egress_ports}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["thanos-compact"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["thanos-compact"]}"
monitoring_whitelist = "${var.monitoring_whitelist_thanos}"
name = "thanos-compact"
......@@ -835,7 +817,6 @@ module "console" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["console"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["console"]}"
name = "console"
node_count = "${var.node_count["console"]}"
......@@ -866,7 +847,6 @@ module "deploy" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["deploy"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["deploy"]}"
name = "deploy"
node_count = "${var.node_count["deploy"]}"
......@@ -897,7 +877,6 @@ module "bastion" {
environment = "${var.environment}"
health_check = "http"
ip_cidr_range = "${var.subnetworks["bastion"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["bastion"]}"
name = "bastion"
node_count = "${var.node_count["bastion"]}"
......
......@@ -4,10 +4,6 @@ variable "oauth2_client_secret_monitoring" {}
variable "gitlab_net_zone_id" {}
variable "gitlab_com_zone_id" {}
variable "default_kernel_version" {
default = "4.15.0-1015"
}
variable "bootstrap_script_version" {
default = 8
}
......
......@@ -5,10 +5,6 @@ variable "gitlab_net_zone_id" {}
variable "gitlab_com_zone_id" {}
variable "gitlab_io_zone_id" {}
variable "default_kernel_version" {
default = "4.15.0-1029"
}
variable "bootstrap_script_version" {
default = 8
}
......
......@@ -5,10 +5,6 @@ variable "gitlab_net_zone_id" {}
variable "gitlab_com_zone_id" {}
variable "gitlab_io_zone_id" {}
variable "default_kernel_version" {
default = "4.15.0-1029"
}
variable "bootstrap_script_version" {
default = 8
}
......
......@@ -319,7 +319,6 @@ module "blackbox" {
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["blackbox"]}"
name = "blackbox"
node_count = "${var.node_count["blackbox"]}"
......@@ -395,7 +394,6 @@ module "nessus" {
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
health_check = "tcp"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["nessus"]}"
name = "nessus"
node_count = "${var.node_count["nessus"]}"
......
......@@ -14,10 +14,6 @@ variable "dns_zone_name" {
default = "gitlab.net"
}
variable "default_kernel_version" {
default = "4.15.0-1015"
}
variable "bootstrap_script_version" {
default = 8
}
......
......@@ -227,7 +227,6 @@ module "consul" {
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["consul"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["consul"]}"
name = "consul"
node_count = "${var.node_count["consul"]}"
......@@ -602,7 +601,6 @@ module "deploy" {
environment = "${var.environment}"
health_check = "tcp"
ip_cidr_range = "${var.subnetworks["deploy"]}"
kernel_version = "${var.default_kernel_version}"
machine_type = "${var.machine_types["deploy"]}"
name = "deploy"
node_count = "${var.node_count["deploy"]}"
......
......@@ -27,10 +27,6 @@ variable "dns_zone_name" {
default = "gitlab.net"
}
variable "default_kernel_version" {
default = "4.15.0-1015"
}
variable "machine_types" {
type = "map"
......
......@@ -20,10 +20,6 @@ variable "dns_zone_name" {
default = "gitlab.net"
}
variable "default_kernel_version" {
default = "4.15.0-1015"
}
variable "oauth2_client_id_monitoring" {
default = "test"
}
......
This diff is collapsed.
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