fix: relay mode conditon

terraform-google-modules · Oct 20, 2023 · 60ae18d · 60ae18d
1 parent f59ebe2
commit 60ae18d
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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."
   }