Revert "Merge pull request GoogleCloudPlatform#4739 from kadupoornima/numa-ff"

This reverts commit 721983b, reversing
changes made to 4f8b592.

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/scheduler/gke-cluster/README.md

@@ -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 {

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
-}