From b3f4e077837cd12e89f2da7a7fbc204b3a4808a9 Mon Sep 17 00:00:00 2001
From: Max Xu <xuhuan@live.cn>
Date: Fri, 13 Dec 2024 15:14:50 +0800
Subject: [PATCH] Update

---
 main.tf                         |  9 ++++-----
 modules/dns-bucket/README.md    |  2 +-
 modules/dns-bucket/variables.tf | 14 +++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/main.tf b/main.tf
index 7c5af6f..7fbfc5f 100644
--- a/main.tf
+++ b/main.tf
@@ -161,9 +161,9 @@ locals {
 module "gke" {
   count   = var.enable_private_gke ? 0 : 1
   source  = "terraform-google-modules/kubernetes-engine/google"
-  name    = var.cluster_name
   version = "30.3.0"
 
+  name                              = var.cluster_name
   add_cluster_firewall_rules        = var.add_cluster_firewall_rules
   add_master_webhook_firewall_rules = var.add_master_webhook_firewall_rules
   add_shadow_firewall_rules         = var.add_shadow_firewall_rules
@@ -200,12 +200,11 @@ module "gke" {
 }
 
 module "gke_private" {
-  count  = var.enable_private_gke ? 1 : 0
-  source = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
-
-  name    = var.cluster_name
+  count   = var.enable_private_gke ? 1 : 0
+  source  = "terraform-google-modules/kubernetes-engine/google//modules/private-cluster"
   version = "30.3.0"
 
+  name                              = var.cluster_name
   add_cluster_firewall_rules        = var.add_cluster_firewall_rules
   add_master_webhook_firewall_rules = var.add_master_webhook_firewall_rules
   add_shadow_firewall_rules         = var.add_shadow_firewall_rules
diff --git a/modules/dns-bucket/README.md b/modules/dns-bucket/README.md
index b12e849..4723511 100644
--- a/modules/dns-bucket/README.md
+++ b/modules/dns-bucket/README.md
@@ -53,7 +53,7 @@ No modules.
 | <a name="input_bucket_encryption_kms_key_id"></a> [bucket\_encryption\_kms\_key\_id](#input\_bucket\_encryption\_kms\_key\_id) | KMS key id to use for bucket encryption. If not set, the gcp default key will be used | `string` | `null` | no |
 | <a name="input_bucket_location"></a> [bucket\_location](#input\_bucket\_location) | The location of the bucket | `string` | n/a | yes |
 | <a name="input_bucket_tiered_storage_soft_delete"></a> [bucket\_tiered\_storage\_soft\_delete](#input\_bucket\_tiered\_storage\_soft\_delete) | Set the soft deletion policy, if false soft deletes will be disabled. | `bool` | `true` | no |
-| <a name="input_bucket_uniform_bucket_level_access"></a> [bucket\_uniform\_bucket\_level\_access](#input\_bucket\_uniform\_bucket\_level\_access) | Enables Uniform bucket-level access access to a bucket. | `bool` | `false` | no |
+| <a name="input_bucket_uniform_bucket_level_access"></a> [bucket\_uniform\_bucket\_level\_access](#input\_bucket\_uniform\_bucket\_level\_access) | Enables Uniform bucket-level access access to a bucket. | `bool` | `true` | no |
 | <a name="input_custom_dns_zone_id"></a> [custom\_dns\_zone\_id](#input\_custom\_dns\_zone\_id) | if specified, then a streamnative zone will not be created, and this zone will be used instead. Otherwise, we will provision a new zone and delegate access | `string` | `""` | no |
 | <a name="input_custom_dns_zone_name"></a> [custom\_dns\_zone\_name](#input\_custom\_dns\_zone\_name) | must be passed if custom\_dns\_zone\_id is passed, this is the zone name to use | `string` | `""` | no |
 | <a name="input_parent_zone_name"></a> [parent\_zone\_name](#input\_parent\_zone\_name) | The parent zone in which we create the delegation records | `string` | n/a | yes |
diff --git a/modules/dns-bucket/variables.tf b/modules/dns-bucket/variables.tf
index 4778503..8bd2ef5 100644
--- a/modules/dns-bucket/variables.tf
+++ b/modules/dns-bucket/variables.tf
@@ -13,8 +13,8 @@
 # limitations under the License.
 
 variable "pm_name" {
-  description = "The name of the poolmember, for new clusters, this should be like `pm-<xxxxx>`"
   type        = string
+  description = "The name of the poolmember, for new clusters, this should be like `pm-<xxxxx>`"
 }
 
 variable "parent_zone_name" {
@@ -40,25 +40,25 @@ variable "bucket_location" {
 }
 
 variable "bucket_encryption_kms_key_id" {
+  type        = string
   default     = null
   description = "KMS key id to use for bucket encryption. If not set, the gcp default key will be used"
-  type        = string
 }
 
 variable "bucket_uniform_bucket_level_access" {
-  default     = false
-  description = "Enables Uniform bucket-level access access to a bucket."
   type        = bool
+  default     = true
+  description = "Enables Uniform bucket-level access access to a bucket."
 }
 
 variable "bucket_tiered_storage_soft_delete" {
+  type        = bool
   default     = true
   description = "Set the soft deletion policy, if false soft deletes will be disabled."
-  type        = bool
 }
 
 variable "bucket_cluster_backup_soft_delete" {
+  type        = bool
   default     = true
   description = "Set the soft deletion policy, if false soft deletes will be disabled."
-  type        = bool
-}
\ No newline at end of file
+}