Remove unused prometheus static private ILB IPs

Follow-on to https://gitlab.com/gitlab-com/gl-infra/k8s-workloads/gitlab-helmfiles/-/merge_requests/151
parent a0692144
......@@ -2259,14 +2259,6 @@ resource "google_compute_address" "git-gke-cny" {
address_type = "INTERNAL"
}
# Reserved IP address for prometheus operator
resource "google_compute_address" "prometheus-gke" {
name = "prometheus-gke-${var.environment}"
description = "prometheus-gke-${var.environment}"
subnetwork = module.gitlab-gke.subnetwork_self_link
address_type = "INTERNAL"
}
# Reserved IP address for prometheus ingress with IAP
resource "google_compute_global_address" "prometheus-ingress-iap" {
name = "prometheus-ingress-iap-${var.environment}"
......@@ -2339,38 +2331,38 @@ module "gitlab-gke" {
node_pools = {
"default-1" = {
initial_node_count = "1"
machine_type = var.machine_types["gitlab-gke"]
max_node_count = "20"
node_auto_repair = "true"
node_auto_upgrade = "false"
node_disk_size_gb = "100"
node_disk_type = "pd-ssd"
preemptible = "false"
type = "default"
initial_node_count = "1"
machine_type = var.machine_types["gitlab-gke"]
max_node_count = "20"
node_auto_repair = "true"
node_auto_upgrade = "false"
node_disk_size_gb = "100"
node_disk_type = "pd-ssd"
preemptible = "false"
type = "default"
}
# This node pool is intended for the Container Registry workload
"registry-0" = {
initial_node_count = "1"
machine_type = var.machine_types["gitlab-gke-registry"]
max_node_count = "10"
node_auto_repair = "true"
node_auto_upgrade = "false"
node_disk_size_gb = "100"
node_disk_type = "pd-ssd"
preemptible = "false"
type = "registry"
initial_node_count = "1"
machine_type = var.machine_types["gitlab-gke-registry"]
max_node_count = "10"
node_auto_repair = "true"
node_auto_upgrade = "false"
node_disk_size_gb = "100"
node_disk_type = "pd-ssd"
preemptible = "false"
type = "registry"
}
"sidekiq-memory-bound-1" = {
initial_node_count = "1"
machine_type = var.machine_types["gitlab-gke"]
max_node_count = "10"
node_auto_repair = "true"
node_auto_upgrade = "false"
node_disk_size_gb = "100"
node_disk_type = "pd-ssd"
preemptible = "false"
type = "memory-bound"
initial_node_count = "1"
machine_type = var.machine_types["gitlab-gke"]
max_node_count = "10"
node_auto_repair = "true"
node_auto_upgrade = "false"
node_disk_size_gb = "100"
node_disk_type = "pd-ssd"
preemptible = "false"
type = "memory-bound"
}
"sidekiq-low-urgency-cpu-bound-1" = {
enable_workload_identity = false
......
......@@ -2081,14 +2081,6 @@ resource "google_compute_address" "git-gke" {
address_type = "INTERNAL"
}
# Reserved IP address for prometheus operator
resource "google_compute_address" "prometheus-gke" {
name = "prometheus-gke-${var.environment}"
description = "prometheus-gke-${var.environment}"
subnetwork = module.gitlab-gke.subnetwork_self_link
address_type = "INTERNAL"
}
# Reserved IP address for prometheus ingress with IAP
resource "google_compute_global_address" "prometheus-ingress-iap" {
name = "prometheus-ingress-iap-${var.environment}"
......
......@@ -1515,14 +1515,6 @@ resource "google_project_iam_binding" "k8s-workloads" {
]
}
# Reserved IP address for prometheus operator
resource "google_compute_address" "prometheus-gke" {
name = "prometheus-gke-${var.environment}"
description = "prometheus-gke-${var.environment}"
subnetwork = module.gitlab-gke.subnetwork_self_link
address_type = "INTERNAL"
}
# Reserved IP address for alertmanager ingress with IAP (GKE)
resource "google_compute_global_address" "alertmanager-ingress-iap" {
name = "alertmanager-ingress-iap-${var.environment}"
......
......@@ -328,14 +328,6 @@ resource "google_project_iam_binding" "k8s-workloads" {
]
}
# Reserved IP address for prometheus operator
resource "google_compute_address" "prometheus-gke" {
name = "prometheus-gke-${var.environment}"
description = "prometheus-gke-${var.environment}"
subnetwork = module.gitlab-gke.subnetwork_self_link
address_type = "INTERNAL"
}
module "gitlab-gke" {
name = "gitlab-gke"
environment = var.environment
......
......@@ -357,14 +357,6 @@ resource "google_compute_address" "git-gke" {
address_type = "INTERNAL"
}
# Reserved IP address for prometheus operator
resource "google_compute_address" "prometheus-gke" {
name = "prometheus-gke-${var.environment}"
description = "prometheus-gke-${var.environment}"
subnetwork = module.gitlab-gke.subnetwork_self_link
address_type = "INTERNAL"
}
# Reserved IP address for prometheus ingress with IAP
resource "google_compute_global_address" "prometheus-ingress-iap" {
name = "prometheus-ingress-iap-${var.environment}"
......
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