Revert shutdown grace period fields from GKE Autopilot nodePoolAutoConfig

Author: chenggu88

mmv1/third_party/terraform/services/container/node_config.go.tmpl

@@ -1483,18 +1483,6 @@ func schemaNodePoolAutoConfigNodeKubeletConfig() *schema.Schema {
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"insecure_kubelet_readonly_port_enabled": schemaInsecureKubeletReadonlyPortEnabled(),
-				"shutdown_grace_period_seconds": {
-					Type:        schema.TypeInt,
-					Optional:    true,
-					Computed:    true,
-					Description: `Controls the total duration of time (in seconds) the node delays shutdown.`,
-				},
-				"shutdown_grace_period_critical_pods_seconds": {
-					Type:        schema.TypeInt,
-					Optional:    true,
-					Computed:    true,
-					Description: `Controls the portion of total grace period (in seconds) that is specifically reserved for terminating critical pods.`,
-				},
 			},
 		},
 	}
@@ -3392,8 +3380,6 @@ func flattenNodePoolAutoConfigNodeKubeletConfig(c *container.NodeKubeletConfig)
 	if c != nil {
 		result = append(result, map[string]interface{}{
 			"insecure_kubelet_readonly_port_enabled": flattenInsecureKubeletReadonlyPortEnabled(c),
-			"shutdown_grace_period_seconds":          c.ShutdownGracePeriodSeconds,
-			"shutdown_grace_period_critical_pods_seconds": c.ShutdownGracePeriodCriticalPodsSeconds,
 		})
 	}
 	return result

mmv1/third_party/terraform/services/container/resource_container_cluster_meta.yaml.tmpl

@@ -816,8 +816,6 @@ fields:
   - api_field: 'nodePoolAutoConfig.linuxNodeConfig.nodeKernelModuleLoading.policy'
   - api_field: 'nodePoolAutoConfig.networkTags.tags'
   - api_field: 'nodePoolAutoConfig.nodeKubeletConfig.insecureKubeletReadonlyPortEnabled'
-  - api_field: 'nodePoolAutoConfig.nodeKubeletConfig.shutdownGracePeriodSeconds'
-  - api_field: 'nodePoolAutoConfig.nodeKubeletConfig.shutdownGracePeriodCriticalPodsSeconds'
   - field: 'node_pool_auto_config.resource_manager_tags'
     api_field: 'nodePoolAutoConfig.resourceManagerTags.tags'
   - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns'

mmv1/third_party/terraform/services/container/resource_container_cluster_test.go.tmpl

@@ -17508,13 +17508,6 @@ resource "google_container_cluster" "primary" {
       }
     }
   }
-
-  node_pool_auto_config {
-    node_kubelet_config {
-      shutdown_grace_period_critical_pods_seconds = 30
-      shutdown_grace_period_seconds               = 120
-    }
-  }
 }
 `, clusterName, networkName, subnetworkName)
 }

mmv1/third_party/terraform/website/docs/r/container_cluster.html.markdown

@@ -1325,7 +1325,8 @@ workload_identity_config {
 
 <a name="nested_node_pool_auto_config"></a>The `node_pool_auto_config` block supports:
 
-* `node_kubelet_config` - (Optional) Kubelet configuration for Autopilot clusters. Structure is [documented below](#nested_node_kubelet_config).
+* `node_kubelet_config` - (Optional) Kubelet configuration for Autopilot clusters. Currently, only `insecure_kubelet_readonly_port_enabled` is supported here.
+    Structure is [documented below](#nested_node_kubelet_config).
 
 * `resource_manager_tags` - (Optional) A map of resource manager tag keys and values to be attached to the nodes for managing Compute Engine firewalls using Network Firewall Policies. Tags must be according to specifications found [here](https://cloud.google.com/vpc/docs/tags-firewalls-overview#specifications). A maximum of 5 tag key-value pairs can be specified. Existing tags will be replaced with new values. Tags must be in one of the following formats ([KEY]=[VALUE]) 1. `tagKeys/{tag_key_id}=tagValues/{tag_value_id}` 2. `{org_id}/{tag_key_name}={tag_value_name}` 3. `{project_id}/{tag_key_name}={tag_value_name}`.
 
@@ -1336,10 +1337,6 @@ workload_identity_config {
 <a name="nested_node_kubelet_config"></a>The `node_kubelet_config` block supports:
 
 * `insecure_kubelet_readonly_port_enabled` - (Optional) Controls whether the kubelet read-only port is enabled. It is strongly recommended to set this to `FALSE`. Possible values: `TRUE`, `FALSE`.
-
-* `shutdown_grace_period_seconds` - (Optional) The grace period (in seconds) to use during a graceful node shutdown. This is the time allocated for all pods (critical and non-critical) to terminate. The value must be between 10 and 10000. This field can only be configured if the node pool uses Spot VMs or Preemptible VMs.
-
-* `shutdown_grace_period_critical_pods_seconds` - (Optional) The grace period (in seconds) to use during a graceful node shutdown for critical pods. This value must be less than or equal to `shutdown_grace_period_seconds`. This field can only be configured if the node pool uses Spot VMs or Preemptible VMs.
 
 <a name="nested_network_tags"></a>The `network_tags` block supports:
 

mmv1/third_party/tgc_next/pkg/services/container/node_config.go

@@ -1383,18 +1383,6 @@ func schemaNodePoolAutoConfigNodeKubeletConfig() *schema.Schema {
 		Elem: &schema.Resource{
 			Schema: map[string]*schema.Schema{
 				"insecure_kubelet_readonly_port_enabled": schemaInsecureKubeletReadonlyPortEnabled(),
-				"shutdown_grace_period_seconds": {
-					Type:        schema.TypeInt,
-					Optional:    true,
-					Computed:    true,
-					Description: `Controls the total duration of time (in seconds) the node delays shutdown.`,
-				},
-				"shutdown_grace_period_critical_pods_seconds": {
-					Type:        schema.TypeInt,
-					Optional:    true,
-					Computed:    true,
-					Description: `Controls the portion of total grace period (in seconds) that is specifically reserved for terminating critical pods.`,
-				},
 			},
 		},
 	}
@@ -3179,8 +3167,6 @@ func flattenNodePoolAutoConfigNodeKubeletConfig(v interface{}) []map[string]inte
 	transformed := map[string]interface{}{}
 	if c != nil {
 		transformed["insecure_kubelet_readonly_port_enabled"] = flattenInsecureKubeletReadonlyPortEnabled(c)
-		transformed["shutdown_grace_period_seconds"] = c["shutdownGracePeriodSeconds"]
-		transformed["shutdown_grace_period_critical_pods_seconds"] = c["shutdownGracePeriodCriticalPodsSeconds"]
 	}
 
 	return []map[string]interface{}{transformed}