From 60ae18dec390ac3997fdd0e76cba98ade9c9e9ed Mon Sep 17 00:00:00 2001 From: Till Adam Date: Fri, 20 Oct 2023 16:18:35 +0200 Subject: [PATCH] fix: relay mode conditon --- autogen/main/variables.tf.tmpl | 2 +- modules/beta-private-cluster-update-variant/variables.tf | 2 +- modules/beta-private-cluster/variables.tf | 2 +- modules/beta-public-cluster-update-variant/variables.tf | 2 +- modules/beta-public-cluster/variables.tf | 2 +- modules/private-cluster-update-variant/variables.tf | 2 +- modules/private-cluster/variables.tf | 2 +- variables.tf | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl index 773cd7a4a7..047feb7354 100644 --- a/autogen/main/variables.tf.tmpl +++ b/autogen/main/variables.tf.tmpl @@ -732,7 +732,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/modules/beta-private-cluster-update-variant/variables.tf b/modules/beta-private-cluster-update-variant/variables.tf index 202f6484f5..13d5d3f625 100644 --- a/modules/beta-private-cluster-update-variant/variables.tf +++ b/modules/beta-private-cluster-update-variant/variables.tf @@ -692,7 +692,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/modules/beta-private-cluster/variables.tf b/modules/beta-private-cluster/variables.tf index 202f6484f5..13d5d3f625 100644 --- a/modules/beta-private-cluster/variables.tf +++ b/modules/beta-private-cluster/variables.tf @@ -692,7 +692,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/modules/beta-public-cluster-update-variant/variables.tf b/modules/beta-public-cluster-update-variant/variables.tf index 8a2f9376db..8eade85643 100644 --- a/modules/beta-public-cluster-update-variant/variables.tf +++ b/modules/beta-public-cluster-update-variant/variables.tf @@ -662,7 +662,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/modules/beta-public-cluster/variables.tf b/modules/beta-public-cluster/variables.tf index 8a2f9376db..8eade85643 100644 --- a/modules/beta-public-cluster/variables.tf +++ b/modules/beta-public-cluster/variables.tf @@ -662,7 +662,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/modules/private-cluster-update-variant/variables.tf b/modules/private-cluster-update-variant/variables.tf index 8811ac544b..76180dfa9c 100644 --- a/modules/private-cluster-update-variant/variables.tf +++ b/modules/private-cluster-update-variant/variables.tf @@ -656,7 +656,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/modules/private-cluster/variables.tf b/modules/private-cluster/variables.tf index 8811ac544b..76180dfa9c 100644 --- a/modules/private-cluster/variables.tf +++ b/modules/private-cluster/variables.tf @@ -656,7 +656,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." } diff --git a/variables.tf b/variables.tf index b855060c4f..39ed3285a7 100644 --- a/variables.tf +++ b/variables.tf @@ -626,7 +626,7 @@ variable "monitoring_advanced_datapath_observability_config_metrics_relay_mode" description = "Mode used to make advanced datapath metrics relay available." default = null validation { - condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.node_metadata) + condition = contains(["DISABLED", "INTERNAL_VPC_LB", "EXTERNAL_LB", null], var.monitoring_advanced_datapath_observability_config_metrics_relay_mode) error_message = "The advanced datapath metrics relay value must be one of DISABLED, INTERNAL_VPC_LB, EXTERNAL_LB." }