From f3c540239d8c07b7c6cf74ab593760ecdd4fbf2f Mon Sep 17 00:00:00 2001 From: YuviPanda Date: Fri, 15 Dec 2023 19:27:54 -0800 Subject: [PATCH] terraform: Remove temp_opt_out_node_purpose_label_core_nodes variable No longer used anywhere --- terraform/gcp/cluster.tf | 2 +- terraform/gcp/variables.tf | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/terraform/gcp/cluster.tf b/terraform/gcp/cluster.tf index f4238f00bc..6e5d95d984 100644 --- a/terraform/gcp/cluster.tf +++ b/terraform/gcp/cluster.tf @@ -218,7 +218,7 @@ resource "google_container_node_pool" "core" { # Faster disks provide faster image pulls! disk_type = "pd-balanced" - resource_labels = var.temp_opt_out_node_purpose_label_core_nodes ? {} : { + resource_labels = { "node-purpose" : "core" } diff --git a/terraform/gcp/variables.tf b/terraform/gcp/variables.tf index 8d89320b5b..6aaee0cb5c 100644 --- a/terraform/gcp/variables.tf +++ b/terraform/gcp/variables.tf @@ -240,13 +240,6 @@ variable "core_node_max_count" { EOT } -# FIXME: Remove temp_opt_out_node_purpose_label_core_nodes when its no longer referenced. -# See https://github.com/2i2c-org/infrastructure/issues/3405. -variable "temp_opt_out_node_purpose_label_core_nodes" { - type = bool - default = false -} - variable "enable_network_policy" { type = bool default = false