changes

Author: Daisyprakash

modules/gke-autopilot-cluster/README.md

@@ -54,7 +54,7 @@ For a module with a complete configuration of a Google Cloud Platform Kubernetes
 | pod\_security\_policy\_config | Configuration for the [PodSecurityPolicy](https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies) feature. | <pre>object({<br>    enabled = bool<br>  })</pre> | `null` | no |
 | private\_cluster\_config | Configuration for private clusters, clusters with private nodes. | <pre>object({<br>    enable_private_nodes        = optional(bool)<br>    enable_private_endpoint     = optional(bool)<br>    master_ipv4_cidr_block      = optional(string)<br>    private_endpoint_subnetwork = optional(string)<br>    master_global_access_config = optional(object({<br>      enabled = optional(bool)<br>    }))<br>  })</pre> | <pre>{<br>  "enable_private_endpoint": true,<br>  "enable_private_nodes": true,<br>  "master_global_access_config": {<br>    "enabled": true<br>  }<br>}</pre> | no |
 | private\_ipv6\_google\_access | The desired state of IPv6 access to Google Services. By default, no private IPv6 access to or from Google Services (all access will be via IPv4). | `string` | `null` | no |
-| project\_id | The ID of the project in which the resource belongs. If it is not provided, the provider project is used. | `string` | n/a | yes |
+| project\_id | The ID of the project in which the resource belongs. | `string` | n/a | yes |
 | protect\_config | Enable/Disable Protect API features for the cluster. | <pre>object({<br>    workload_config = object({<br>      audit_mode = string<br>    })<br>    workload_vulnerability_mode = optional(string)<br>  })</pre> | `null` | no |
 | release\_channel | The release channel of this cluster. Accepted values are `UNSPECIFIED`, `RAPID`, `REGULAR` and `STABLE`. Defaults to `REGULAR`. | <pre>object({<br>    channel = optional(string)<br>  })</pre> | <pre>{<br>  "channel": "REGULAR"<br>}</pre> | no |
 | resource\_labels | The GCE resource labels (a map of key/value pairs) to be applied to the cluster. Note: This field is non-authoritative, and will only manage the labels present in your configuration. Please refer to the field 'effective\_labels' for all of the labels present on the resource. | `map(string)` | `null` | no |

modules/gke-autopilot-cluster/metadata.yaml

@@ -135,7 +135,7 @@ spec:
         varType: string
         defaultValue: ""
       - name: project_id
-        description: The ID of the project in which the resource belongs. If it is not provided, the provider project is used.
+        description: The ID of the project in which the resource belongs.
         varType: string
         required: true
       - name: location

modules/gke-autopilot-cluster/variables.tf

@@ -27,7 +27,7 @@ variable "description" {
 }
 
 variable "project_id" {
-  description = "The ID of the project in which the resource belongs. If it is not provided, the provider project is used."
+  description = "The ID of the project in which the resource belongs."
   type        = string
 }
 

modules/gke-standard-cluster/README.md

@@ -54,7 +54,7 @@ For a module with a complete configuration of a Google Cloud Platform Kubernetes
 | monitoring\_config | Monitoring configuration for the cluster. | <pre>object({<br>    enable_components = optional(list(string))<br>  })</pre> | `null` | no |
 | monitoring\_service | The monitoring service that the cluster should write metrics to. Available options include `monitoring.googleapis.com`, `monitoring.googleapis.com/kubernetes`, and `none`. | `string` | `null` | no |
 | name | The name of the cluster (required) | `string` | n/a | yes |
-| network | The name or self\_link of the Google Compute Engine network to which the cluster is connected. For Shared VPC, this network must be in the host project. | `string` | `null` | no |
+| network | The name or self\_link of the Google Compute Engine network to which the cluster is connected. For Shared VPC, this network must be in the host project. | `string` | n/a | yes |
 | network\_policy | Configuration options for the NetworkPolicy feature. | <pre>object({<br>    enabled  = optional(bool)<br>    provider = optional(string)<br>  })</pre> | `null` | no |
 | node\_config | Parameters used in creating the default node pool. Generally, this field should not be used at the same time as a `google_container_node_pool` or a `node_pool` block; this configuration is inherited by the default node pool, and can conflict with configuration in the separate resource or block. | <pre>object({<br>    confidential_nodes = optional(object({<br>      enabled = bool<br>    }))<br>    disk_size_gb                = optional(number)<br>    disk_type                   = optional(string)<br>    enable_confidential_storage = optional(bool)<br>    local_ssd_encryption_mode   = optional(string)<br>    ephemeral_storage_config = optional(object({<br>      local_ssd_count = number<br>    }))<br>    ephemeral_storage_local_ssd_config = optional(object({<br>      local_ssd_count  = number<br>      data_cache_count = optional(number)<br>    }))<br>    fast_socket = optional(object({<br>      enabled = bool<br>    }))<br>    local_nvme_ssd_block_config = optional(object({<br>      local_ssd_count = number<br>    }))<br>    logging_variant = optional(string)<br>    secondary_boot_disks = optional(object({<br>      disk_image = string<br>      mode       = optional(string)<br>    }))<br>    gcfs_config = optional(object({<br>      enabled = bool<br>    }))<br>    gvnic = optional(object({<br>      enabled = bool<br>    }))<br>    guest_accelerator = optional(object({<br>      type  = string<br>      count = number<br>      gpu_driver_installation_config = optional(object({<br>        gpu_driver_version = string<br>      }))<br>      gpu_partition_size = optional(string)<br>      gpu_sharing_config = optional(object({<br>        gpu_sharing_strategy       = string<br>        max_shared_clients_per_gpu = number<br>      }))<br>    }))<br>    image_type       = optional(string)<br>    labels           = optional(map(string))<br>    resource_labels  = optional(map(string))<br>    max_run_duration = optional(string)<br>    flex_start       = optional(bool)<br>    local_ssd_count  = optional(number)<br>    machine_type     = optional(string)<br>    metadata         = optional(map(string))<br>    min_cpu_platform = optional(string)<br>    oauth_scopes     = optional(list(string))<br>    preemptible      = optional(bool)<br>    reservation_affinity = optional(object({<br>      consume_reservation_type = string<br>      key                      = optional(string)<br>      values                   = optional(list(string))<br>    }))<br>    spot = optional(bool)<br>    sandbox_config = optional(object({<br>      sandbox_type = string<br>    }))<br>    boot_disk_kms_key = optional(string)<br>    service_account   = optional(string)<br>    shielded_instance_config = optional(object({<br>      enable_secure_boot          = optional(bool)<br>      enable_integrity_monitoring = optional(bool)<br>    }))<br>    storage_pools         = optional(list(string))<br>    tags                  = optional(list(string))<br>    resource_manager_tags = optional(map(string))<br>    taint = optional(list(object({<br>      key    = string<br>      value  = string<br>      effect = string<br>    })))<br>    workload_metadata_config = optional(object({<br>      mode = optional(string)<br>    }))<br>    kubelet_config = optional(object({<br>      cpu_manager_policy                     = optional(string)<br>      cpu_cfs_quota                          = optional(bool)<br>      cpu_cfs_quota_period                   = optional(string)<br>      insecure_kubelet_readonly_port_enabled = optional(bool)<br>      pod_pids_limit                         = optional(number)<br>      container_log_max_size                 = optional(string)<br>      container_log_max_files                = optional(number)<br>      image_gc_low_threshold_percent         = optional(number)<br>      image_gc_high_threshold_percent        = optional(number)<br>      image_minimum_gc_age                   = optional(string)<br>      allowed_unsafe_sysctls                 = optional(list(string))<br>    }))<br>    linux_node_config = optional(object({<br>      sysctls     = optional(map(string))<br>      cgroup_mode = optional(string)<br>      hugepages_config = optional(object({<br>        hugepage_size_2m = optional(number)<br>        hugepage_size_1g = optional(number)<br>      }))<br>    }))<br>    windows_node_config = optional(object({<br>      osversion = string<br>    }))<br>    containerd_config = optional(object({<br>      private_registry_access_config = optional(object({<br>        enabled = bool<br>        certificate_authority_domain_config = optional(object({<br>          fqdns = list(string)<br>          gcp_secret_manager_certificate_config = object({<br>            secret_uri = string<br>          })<br>        }))<br>      }))<br>    }))<br>    node_group = optional(string)<br>    sole_tenant_config = optional(object({<br>      node_affinity = optional(object({<br>        key      = string<br>        operator = string<br>        values   = list(string)<br>      }))<br>    }))<br>  })</pre> | `null` | no |
 | node\_locations | The list of zones in which the cluster's nodes are located. Nodes are created in the region's zones by default. This list must be a subset of the compute/zones in the region to which the cluster belongs. This field is optional for Zonal clusters and required for Regional clusters. | `list(string)` | `null` | no |
@@ -67,7 +67,7 @@ For a module with a complete configuration of a Google Cloud Platform Kubernetes
 | pod\_security\_policy\_config | Configuration for the [PodSecurityPolicy](https://cloud.google.com/kubernetes-engine/docs/how-to/pod-security-policies) feature. | <pre>object({<br>    enabled = bool<br>  })</pre> | `null` | no |
 | private\_cluster\_config | Configuration for private clusters, clusters with private nodes. | <pre>object({<br>    enable_private_nodes        = optional(bool)<br>    enable_private_endpoint     = optional(bool)<br>    master_ipv4_cidr_block      = optional(string)<br>    private_endpoint_subnetwork = optional(string)<br>    master_global_access_config = optional(object({<br>      enabled = optional(bool)<br>    }))<br>  })</pre> | <pre>{<br>  "enable_private_endpoint": true,<br>  "enable_private_nodes": true,<br>  "master_global_access_config": {<br>    "enabled": true<br>  }<br>}</pre> | no |
 | private\_ipv6\_google\_access | The desired state of IPv6 access to Google Services. By default, no private IPv6 access to or from Google Services (all access will be via IPv4). | `string` | `null` | no |
-| project\_id | The ID of the project in which the resource belongs. If it is not provided, the provider project id is used. | `string` | n/a | yes |
+| project\_id | The ID of the project in which the resource belongs. | `string` | n/a | yes |
 | protect\_config | Enable GKE Protect workloads for this cluster. | <pre>object({<br>    workload_config = object({<br>      audit_mode = string<br>    })<br>    workload_vulnerability_mode = optional(string)<br>  })</pre> | `null` | no |
 | release\_channel | Configuration for the release channel feature, which provides more control over automatic upgrades of your GKE clusters. | <pre>object({<br>    channel = optional(string)<br>  })</pre> | `null` | no |
 | remove\_default\_node\_pool | If true, deletes the default node pool upon cluster creation. If you're using google\_container\_node\_pool resources with no default node pool, this should be set to true. | `bool` | `true` | no |
@@ -76,7 +76,7 @@ For a module with a complete configuration of a Google Cloud Platform Kubernetes
 | secret\_manager\_config | Configuration for the SecretManagerConfig feature | <pre>object({<br>    enabled = bool<br>  })</pre> | `null` | no |
 | security\_posture\_config | Security posture configuration for the cluster. mode - Sets the mode of the Kubernetes security posture API's off-cluster features. Available options include DISABLED, BASIC, and ENTERPRISE. vulnerability\_mode - Sets the mode of the Kubernetes security posture API's workload vulnerability scanning. Available options include VULNERABILITY\_DISABLED, VULNERABILITY\_BASIC and VULNERABILITY\_ENTERPRISE. | <pre>object({<br>    mode               = optional(string)<br>    vulnerability_mode = optional(string)<br>  })</pre> | `null` | no |
 | service\_external\_ips\_config | Configuration for controlling how IPs are allocated to Service objects. | <pre>object({<br>    enabled = optional(bool)<br>  })</pre> | `null` | no |
-| subnetwork | The name or self\_link of the Google Compute Engine subnetwork in which the cluster's instances are launched. | `string` | `null` | no |
+| subnetwork | The name or self\_link of the Google Compute Engine subnetwork in which the cluster's instances are launched. | `string` | n/a | yes |
 | timeouts | Timeout for cluster operations. | <pre>object({<br>    create = optional(string)<br>    update = optional(string)<br>    delete = optional(string)<br>  })</pre> | <pre>{<br>  "create": "45m",<br>  "delete": "45m",<br>  "update": "45m"<br>}</pre> | no |
 | vertical\_pod\_autoscaling | Vertical Pod Autoscaling automatically adjusts the resources of pods controlled by it. | <pre>object({<br>    enabled = optional(bool)<br>  })</pre> | `null` | no |
 | workload\_alts\_config | Workload ALTS configuration for the cluster. Whether the alts handshaker should be enabled or not for direct-path. Requires Workload Identity (workloadPool) must be non-empty | <pre>object({<br>    enable_alts = bool<br>  })</pre> | `null` | no |

modules/gke-standard-cluster/metadata.yaml

@@ -134,7 +134,7 @@ spec:
         description: Description of the cluster.
         varType: string
       - name: project_id
-        description: The ID of the project in which the resource belongs. If it is not provided, the provider project id is used.
+        description: The ID of the project in which the resource belongs.
         varType: string
         required: true
       - name: location
@@ -143,9 +143,11 @@ spec:
       - name: network
         description: The name or self_link of the Google Compute Engine network to which the cluster is connected. For Shared VPC, this network must be in the host project.
         varType: string
+        required: true
       - name: subnetwork
         description: The name or self_link of the Google Compute Engine subnetwork in which the cluster's instances are launched.
         varType: string
+        required: true
       - name: node_locations
         description: The list of zones in which the cluster's nodes are located. Nodes are created in the region's zones by default. This list must be a subset of the compute/zones in the region to which the cluster belongs. This field is optional for Zonal clusters and required for Regional clusters.
         varType: list(string)

modules/gke-standard-cluster/variables.tf

@@ -27,7 +27,7 @@ variable "description" {
 }
 
 variable "project_id" {
-  description = "The ID of the project in which the resource belongs. If it is not provided, the provider project id is used."
+  description = "The ID of the project in which the resource belongs."
   type        = string
 }
 
@@ -40,13 +40,11 @@ variable "location" {
 variable "network" {
   description = "The name or self_link of the Google Compute Engine network to which the cluster is connected. For Shared VPC, this network must be in the host project."
   type        = string
-  default     = null
 }
 
 variable "subnetwork" {
   description = "The name or self_link of the Google Compute Engine subnetwork in which the cluster's instances are launched."
   type        = string
-  default     = null
 }
 
 variable "node_locations" {