code review changes

Author: arthurlapertosa

examples/confidential_autopilot_private/README.md

@@ -1,7 +1,7 @@
 # Confidential Autopilot Private Cluster
 
-This example illustrates how to create a autopilot cluster with beta features,
-using Confidential Nodes and a Customer Managed Encryption Keys (CMEK).
+This example illustrates how to create an Autopilot cluster with beta features,
+using Confidential GKE nodes and a Customer Managed Encryption Keys (CMEK).
 
 <!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
 ## Inputs
@@ -17,7 +17,7 @@ using Confidential Nodes and a Customer Managed Encryption Keys (CMEK).
 | cluster\_name | Cluster name |
 | kms\_key | CMEK used for disk and database encryption |
 | kubernetes\_endpoint | The cluster endpoint |
-| location | n/a |
+| location | Cluster location (region if regional cluster, zone if zonal cluster) |
 | master\_kubernetes\_version | Kubernetes version of the master |
 | network\_name | The name of the VPC being created |
 | region | The region in which the cluster resides |

examples/confidential_autopilot_private/main.tf

@@ -40,7 +40,7 @@ module "kms" {
 
   project_id           = var.project_id
   key_protection_level = "HSM"
-  location             = "us-central1"
+  location             = var.region
   keyring              = "keyring-${random_string.suffix.result}"
   keys                 = ["key"]
   prevent_destroy      = false
@@ -59,7 +59,7 @@ module "gke" {
   project_id                      = var.project_id
   name                            = "${local.cluster_type}-cluster"
   regional                        = true
-  region                          = "us-central1"
+  region                          = var.region
   network                         = module.gcp-network.network_name
   subnetwork                      = local.subnet_names[index(module.gcp-network.subnets_names, local.subnet_name)]
   ip_range_pods                   = local.pods_range_name

examples/confidential_autopilot_private/network.tf

@@ -16,7 +16,7 @@
 
 module "gcp-network" {
   source  = "terraform-google-modules/network/google"
-  version = ">= 7.5"
+  version = "~= 10.0"
 
   project_id   = var.project_id
   network_name = local.network_name
@@ -25,13 +25,13 @@ module "gcp-network" {
     {
       subnet_name           = local.subnet_name
       subnet_ip             = "10.0.0.0/17"
-      subnet_region         = "us-central1"
+      subnet_region         = var.region
       subnet_private_access = true
     },
     {
       subnet_name   = local.master_auth_subnetwork
       subnet_ip     = "10.60.0.0/17"
-      subnet_region = "us-central1"
+      subnet_region = var.region
     },
   ]
 

examples/confidential_autopilot_private/outputs.tf

@@ -26,7 +26,8 @@ output "cluster_name" {
 }
 
 output "location" {
-  value = module.gke.location
+  description = "Cluster location (region if regional cluster, zone if zonal cluster)"
+  value       = module.gke.location
 }
 
 output "master_kubernetes_version" {

examples/confidential_autopilot_private/variables.tf

@@ -16,4 +16,11 @@
 
 variable "project_id" {
   description = "The project ID to host the cluster in"
+  type        = string
+}
+
+variable "region" {
+  description = "The region to host the cluster in"
+  type        = string
+  default     = "us-central1"
 }