feat(gke-cluster-standard): Move cilium_clusterwide_network_policy …

…to `enable_features` field
GoogleCloudPlatform · Apr 9, 2024 · ef7edeb · ef7edeb
1 parent 9e36a85
commit ef7edeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/modules/gke-cluster-standard/main.tf b/modules/gke-cluster-standard/main.tf
@@ -42,7 +42,7 @@ resource "google_container_cluster" "cluster" {
   initial_node_count                       = var.default_nodepool.initial_node_count
   remove_default_node_pool                 = var.default_nodepool.remove_pool
   deletion_protection                      = var.deletion_protection
-  enable_cilium_clusterwide_network_policy = var.enable_cilium_clusterwide_network_policy
+  enable_cilium_clusterwide_network_policy = var.enable_features.cilium_clusterwide_network_policy
   datapath_provider = (
     var.enable_features.dataplane_v2
     ? "ADVANCED_DATAPATH"

diff --git a/modules/gke-cluster-standard/variables.tf b/modules/gke-cluster-standard/variables.tf
@@ -168,18 +168,12 @@ variable "enable_addons" {
   nullable = false
 }
 
-variable "enable_cilium_clusterwide_network_policy" {
-  description = "Whether CiliumClusterWideNetworkPolicy is enabled in the cluster."
-  type        = bool
-  default     = false
-  nullable    = false
-}
-
 variable "enable_features" {
   description = "Enable cluster-level features. Certain features allow configuration."
   type = object({
     beta_apis            = optional(list(string))
     binary_authorization = optional(bool, false)
+    cilium_clusterwide_network_policy = optional(bool, false)
     cost_management      = optional(bool, false)
     dns = optional(object({
       provider = optional(string)