Merge pull request GoogleCloudPlatform#4750 from arpit974/reverting-google-beta-version

This pull request makes several updates to the GKE cluster and network modules, primarily focused on removing NUMA-aware scheduling support and aligning Terraform module and provider versions for improved compatibility. The changes simplify the configuration and ensure consistent dependency management across modules.

**Removal of NUMA-aware scheduling support:**
* Removed the `enable_numa_aware_scheduling` variable and all related configuration from the GKE cluster module, including the `kubelet_config` block and references in documentation and example files. [[1]](diffhunk://#diff-7939cd594b53ae6e59dae4629a32d7558e7c23123919d7b6e469ac18a57adddcL244-L259) [[2]](diffhunk://#diff-e54397224c9be21ab0ad72546e3d818fd2a4921bf593b2b6d7e881e6fc1d56e6L528-L533) [[3]](diffhunk://#diff-35b044e2245368feb59f14b7a63621200c0df5f4245b426552a09b8329705507L158) [[4]](diffhunk://#diff-e6090e2163c0286245ffc70056c158ea25acdeab329b5d21352fb007f80f4c73L125)

**Module and provider version alignment:**
* Updated the required versions for the `google` and `google-beta` Terraform providers from `>= 7.2` to `>= 6.16` in both the `versions.tf` and documentation files to standardize provider requirements. [[1]](diffhunk://#diff-b8e991c0f592027d61744d232494249832632ecc529153eac609f9e70444b471L21-R25) [[2]](diffhunk://#diff-35b044e2245368feb59f14b7a63621200c0df5f4245b426552a09b8329705507L106-R122)
* Changed the version constraints for the `workload_identity` module from `>= 40.0` to `~> 34.0` for compatibility, reflected in both code and documentation. [[1]](diffhunk://#diff-7939cd594b53ae6e59dae4629a32d7558e7c23123919d7b6e469ac18a57adddcL412-R396) [[2]](diffhunk://#diff-35b044e2245368feb59f14b7a63621200c0df5f4245b426552a09b8329705507L106-R122)
* Updated the version constraint for the `firewall_rule` module from `~> 12.0` to `~> 9.0` in both code and documentation for consistency. [[1]](diffhunk://#diff-bd07c7386bc0355d11578ce911bbc9a34a40f078b6f41fc0a8230d9b74eec28fL54-R54) [[2]](diffhunk://#diff-04a94d2869736107d8d67616c00f4e89cea5605aaec349c3d040b61be9cd1d0dL86-R86)
·

Author: arpit974

examples/gke-g4/gke-g4.yaml

@@ -122,7 +122,6 @@ deployment_groups:
       system_node_pool_taints: []
       enable_dcgm_monitoring: true
       enable_private_endpoint: false # Allows access from authorized public IPs
-      enable_numa_aware_scheduling: true
       configure_workload_identity_sa: true
       master_authorized_networks:
       - cidr_block: $(vars.authorized_cidr) # Allows your machine to run the kubectl command. Required for multi network setup.

modules/network/firewall-rules/README.md

@@ -83,7 +83,7 @@ limitations under the License.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_firewall_rule"></a> [firewall\_rule](#module\_firewall\_rule) | terraform-google-modules/network/google//modules/firewall-rules | ~> 12.0 |
+| <a name="module_firewall_rule"></a> [firewall\_rule](#module\_firewall\_rule) | terraform-google-modules/network/google//modules/firewall-rules | ~> 9.0 |
 
 ## Resources
 

modules/network/firewall-rules/main.tf

@@ -51,7 +51,7 @@ resource "terraform_data" "pga_check" {
 
 module "firewall_rule" {
   source       = "terraform-google-modules/network/google//modules/firewall-rules"
-  version      = "~> 12.0"
+  version      = "~> 9.0"
   project_id   = local.effective_project_id
   network_name = local.effective_network_name
 

modules/scheduler/gke-cluster/README.md

@@ -103,23 +103,23 @@ limitations under the License.
 | Name | Version |
 |------|---------|
 | <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.3 |
-| <a name="requirement_google"></a> [google](#requirement\_google) | >= 7.2 |
-| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 7.2 |
+| <a name="requirement_google"></a> [google](#requirement\_google) | >= 6.16 |
+| <a name="requirement_google-beta"></a> [google-beta](#requirement\_google-beta) | >= 6.16 |
 | <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.36 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| <a name="provider_google"></a> [google](#provider\_google) | >= 7.2 |
-| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | >= 7.2 |
+| <a name="provider_google"></a> [google](#provider\_google) | >= 6.16 |
+| <a name="provider_google-beta"></a> [google-beta](#provider\_google-beta) | >= 6.16 |
 
 ## Modules
 
 | Name | Source | Version |
 |------|--------|---------|
 | <a name="module_kubectl_apply"></a> [kubectl\_apply](#module\_kubectl\_apply) | ../../management/kubectl-apply | n/a |
-| <a name="module_workload_identity"></a> [workload\_identity](#module\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | >= 40.0 |
+| <a name="module_workload_identity"></a> [workload\_identity](#module\_workload\_identity) | terraform-google-modules/kubernetes-engine/google//modules/workload-identity | ~> 34.0 |
 
 ## Resources
 
@@ -155,7 +155,6 @@ limitations under the License.
 | <a name="input_enable_master_global_access"></a> [enable\_master\_global\_access](#input\_enable\_master\_global\_access) | Whether the cluster master is accessible globally (from any region) or only within the same region as the private endpoint. | `bool` | `false` | no |
 | <a name="input_enable_multi_networking"></a> [enable\_multi\_networking](#input\_enable\_multi\_networking) | Enables [multi networking](https://cloud.google.com/kubernetes-engine/docs/how-to/setup-multinetwork-support-for-pods#create-a-gke-cluster) (Requires GKE Enterprise). This setting is immutable on clusters and enables [Dataplane V2](https://cloud.google.com/kubernetes-engine/docs/concepts/dataplane-v2?hl=en). If null, will determine state based on if additional\_networks are passed in. | `bool` | `null` | no |
 | <a name="input_enable_node_local_dns_cache"></a> [enable\_node\_local\_dns\_cache](#input\_enable\_node\_local\_dns\_cache) | Enable GKE NodeLocal DNSCache addon to improve DNS lookup latency | `bool` | `false` | no |
-| <a name="input_enable_numa_aware_scheduling"></a> [enable\_numa\_aware\_scheduling](#input\_enable\_numa\_aware\_scheduling) | Enable [NUMA-aware](https://cloud.google.com/kubernetes-engine/distributed-cloud/bare-metal/docs/vm-runtime/numa) scheduling. | `bool` | `false` | no |
 | <a name="input_enable_parallelstore_csi"></a> [enable\_parallelstore\_csi](#input\_enable\_parallelstore\_csi) | The status of the Google Compute Engine Parallelstore Container Storage Interface (CSI) driver addon, which allows the usage of a parallelstore as volumes. | `bool` | `false` | no |
 | <a name="input_enable_persistent_disk_csi"></a> [enable\_persistent\_disk\_csi](#input\_enable\_persistent\_disk\_csi) | The status of the Google Compute Engine Persistent Disk Container Storage Interface (CSI) driver addon, which allows the usage of a PD as volumes. | `bool` | `true` | no |
 | <a name="input_enable_private_endpoint"></a> [enable\_private\_endpoint](#input\_enable\_private\_endpoint) | (Beta) Whether the master's internal IP address is used as the cluster endpoint. | `bool` | `true` | no |

modules/scheduler/gke-cluster/main.tf

@@ -241,22 +241,6 @@ resource "google_container_cluster" "gke_cluster" {
       enable_secure_boot          = var.system_node_pool_enable_secure_boot
       enable_integrity_monitoring = true
     }
-
-    kubelet_config {
-      cpu_manager_policy = var.enable_numa_aware_scheduling ? "static" : null
-      dynamic "topology_manager" {
-        for_each = var.enable_numa_aware_scheduling ? [1] : []
-        content {
-          policy = "restricted"
-        }
-      }
-      dynamic "memory_manager" {
-        for_each = var.enable_numa_aware_scheduling ? [1] : []
-        content {
-          policy = "Static"
-        }
-      }
-    }
   }
 
   control_plane_endpoints_config {
@@ -409,7 +393,7 @@ provider "kubernetes" {
 module "workload_identity" {
   count   = var.configure_workload_identity_sa ? 1 : 0
   source  = "terraform-google-modules/kubernetes-engine/google//modules/workload-identity"
-  version = ">= 40.0"
+  version = "~> 34.0"
 
   use_existing_gcp_sa = true
   name                = var.k8s_service_account_name

modules/scheduler/gke-cluster/variables.tf

@@ -525,9 +525,3 @@ variable "enable_external_dns_endpoint" {
   type        = bool
   default     = false
 }
-
-variable "enable_numa_aware_scheduling" {
-  description = "Enable [NUMA-aware](https://cloud.google.com/kubernetes-engine/distributed-cloud/bare-metal/docs/vm-runtime/numa) scheduling."
-  type        = bool
-  default     = false
-}

modules/scheduler/gke-cluster/versions.tf

@@ -18,11 +18,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 7.2"
+      version = ">= 6.16"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 7.2"
+      version = ">= 6.16"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"