Add writable cgroups to containerd config (#15511)

Signed-off-by: Chris Henzie <[email protected]>

Author: chrishenzie

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

@@ -78,6 +78,21 @@ func schemaContainerdConfig() *schema.Schema {
 					},
 				}},
 			},
+			"writable_cgroups": {
+				Type:        schema.TypeList,
+				Description: `Parameters for writable cgroups configuration.`,
+				Optional:    true,
+				MaxItems:    1,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						"enabled": {
+							Type:        schema.TypeBool,
+							Required:    true,
+							Description: `Whether writable cgroups are enabled.`,
+						},
+					},
+				},
+			},
 		}},
 	}
 }
@@ -1962,6 +1977,7 @@ func expandContainerdConfig(v interface{}) *container.ContainerdConfig {
 
 	cc := &container.ContainerdConfig{}
 	cc.PrivateRegistryAccessConfig = expandPrivateRegistryAccessConfig(cfg["private_registry_access_config"])
+	cc.WritableCgroups = expandWritableCgroups(cfg["writable_cgroups"])
 	return cc
 }
 
@@ -2033,6 +2049,26 @@ func expandGCPSecretManagerCertificateConfig(v interface{}) *container.GCPSecret
 	return gcpSMConfig
 }
 
+func expandWritableCgroups(v interface{}) *container.WritableCgroups {
+	if v == nil {
+		return nil
+	}
+	ls := v.([]interface{})
+	if len(ls) == 0 {
+		return nil
+	}
+	if ls[0] == nil {
+		return &container.WritableCgroups{}
+	}
+	cfg := ls[0].(map[string]interface{})
+
+	wcg := &container.WritableCgroups{}
+	if enabled, ok := cfg["enabled"]; ok {
+		wcg.Enabled = enabled.(bool)
+	}
+	return wcg
+}
+
 func expandSoleTenantConfig(v interface{}) *container.SoleTenantConfig {
 	if v == nil {
 		return nil
@@ -2636,6 +2672,9 @@ func flattenContainerdConfig(c *container.ContainerdConfig) []map[string]interfa
 	if c.PrivateRegistryAccessConfig != nil {
 		r["private_registry_access_config"] = flattenPrivateRegistryAccessConfig(c.PrivateRegistryAccessConfig)
 	}
+	if c.WritableCgroups != nil {
+		r["writable_cgroups"] = flattenWritableCgroups(c.WritableCgroups)
+	}
 	return append(result, r)
 }
 
@@ -2695,6 +2734,17 @@ func flattenGCPSecretManagerCertificateConfig(c *container.GCPSecretManagerCerti
 	return append(result, r)
 }
 
+func flattenWritableCgroups(c *container.WritableCgroups) []map[string]interface{} {
+	result := []map[string]interface{}{}
+	if c == nil {
+		return result
+	}
+	r := map[string]interface{}{
+		"enabled": c.Enabled,
+	}
+	return append(result, r)
+}
+
 func flattenConfidentialNodes(c *container.ConfidentialNodes) []map[string]interface{} {
 	result := []map[string]interface{}{}
 	if c != nil {

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

@@ -249,6 +249,7 @@ fields:
   - api_field: 'nodeConfig.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns'
   - api_field: 'nodeConfig.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.gcpSecretManagerCertificateConfig.secretUri'
   - api_field: 'nodeConfig.containerdConfig.privateRegistryAccessConfig.enabled'
+  - api_field: 'nodeConfig.containerdConfig.writableCgroups.enabled'
   - api_field: 'nodeConfig.diskSizeGb'
   - api_field: 'nodeConfig.diskType'
   - field: 'node_config.effective_taints.effect'
@@ -685,6 +686,7 @@ fields:
   - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.fqdns'
   - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.certificateAuthorityDomainConfig.gcpSecretManagerCertificateConfig.secretUri'
   - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.privateRegistryAccessConfig.enabled'
+  - api_field: 'nodePoolDefaults.nodeConfigDefaults.containerdConfig.writableCgroups.enabled'
   - api_field: 'nodePoolDefaults.nodeConfigDefaults.gcfsConfig.enabled'
   - field: 'node_pool_defaults.node_config_defaults.insecure_kubelet_readonly_port_enabled'
     api_field: 'nodePoolDefaults.nodeConfigDefaults.nodeKubeletConfig.insecureKubeletReadonlyPortEnabled'

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

@@ -14118,6 +14118,208 @@ resource "google_container_cluster" "primary" {
 `, secretID, clusterName, customDomain, networkName, subnetworkName)
 }
 
+func TestAccContainerCluster_writableCgroups(t *testing.T) {
+	t.Parallel()
+
+	clusterName := fmt.Sprintf("tf-test-cluster-%s", acctest.RandString(t, 10))
+	nodePoolName := fmt.Sprintf("tf-test-nodepool-%s", acctest.RandString(t, 10))
+	networkName := acctest.BootstrapSharedTestNetwork(t, "gke-cluster")
+	subnetworkName := acctest.BootstrapSubnet(t, "gke-cluster", networkName)
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		CheckDestroy:             testAccCheckContainerClusterDestroyProducer(t),
+		Steps: []resource.TestStep{
+			// Test enabling writable_cgroups for new node pools via node_pool_defaults.
+			{
+				Config: testAccContainerCluster_writableCgroupsEnabled(clusterName, networkName, subnetworkName),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"google_container_cluster.primary",
+						"node_pool_defaults.0.node_config_defaults.0.containerd_config.0.writable_cgroups.0.enabled",
+						"true",
+					),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+			// Test disabling writable_cgroups for new node pools via node_pool_defaults.
+			{
+				Config: testAccContainerCluster_writableCgroupsDisabled(clusterName, networkName, subnetworkName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						acctest.ExpectNoDelete(),
+					},
+				},
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"google_container_cluster.primary",
+						"node_pool_defaults.0.node_config_defaults.0.containerd_config.0.writable_cgroups.0.enabled",
+						"false",
+					),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+			// Test configuring writable_cgroups on the cluster's default node pool directly via node_config.
+			{
+				Config: testAccContainerCluster_withNodeConfigWritableCgroups(clusterName, networkName, subnetworkName),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						acctest.ExpectNoDelete(),
+					},
+				},
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttr(
+						"google_container_cluster.primary",
+						"node_config.0.containerd_config.0.writable_cgroups.0.enabled",
+						"true",
+					),
+				),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+			// Test configuring writable_cgroups on a named node pool defined within the cluster.
+			// This change from a default to a named node pool is expected to force recreation.
+			{
+				Config: testAccContainerCluster_withNodePoolWritableCgroups(clusterName, nodePoolName, networkName, subnetworkName),
+			},
+			{
+				ResourceName:            "google_container_cluster.primary",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"min_master_version", "deletion_protection"},
+			},
+		},
+	})
+}
+
+func testAccContainerCluster_writableCgroupsEnabled(clusterName, networkName, subnetworkName string) string {
+	return fmt.Sprintf(`
+data "google_container_engine_versions" "central1a" {
+  location = "us-central1-a"
+}
+
+resource "google_container_cluster" "primary" {
+  name                = "%s"
+  location            = "us-central1-a"
+  initial_node_count  = 1
+  min_master_version  = data.google_container_engine_versions.central1a.release_channel_latest_version["RAPID"]
+  network             = "%s"
+  subnetwork          = "%s"
+  deletion_protection = false
+
+  node_pool_defaults {
+    node_config_defaults {
+      containerd_config {
+        writable_cgroups {
+          enabled = true
+        }
+      }
+    }
+  }
+}
+`, clusterName, networkName, subnetworkName)
+}
+
+func testAccContainerCluster_writableCgroupsDisabled(clusterName, networkName, subnetworkName string) string {
+	return fmt.Sprintf(`
+data "google_container_engine_versions" "central1a" {
+  location = "us-central1-a"
+}
+
+resource "google_container_cluster" "primary" {
+  name                = "%s"
+  location            = "us-central1-a"
+  initial_node_count  = 1
+  min_master_version  = data.google_container_engine_versions.central1a.release_channel_latest_version["RAPID"]
+  network             = "%s"
+  subnetwork          = "%s"
+  deletion_protection = false
+
+  node_pool_defaults {
+    node_config_defaults {
+      containerd_config {
+        writable_cgroups {
+          enabled = false
+        }
+      }
+    }
+  }
+}
+`, clusterName, networkName, subnetworkName)
+}
+
+func testAccContainerCluster_withNodePoolWritableCgroups(clusterName, nodePoolName, networkName, subnetworkName string) string {
+	return fmt.Sprintf(`
+data "google_container_engine_versions" "central1a" {
+  location = "us-central1-a"
+}
+
+resource "google_container_cluster" "primary" {
+  name                = "%s"
+  location            = "us-central1-a"
+  min_master_version  = data.google_container_engine_versions.central1a.release_channel_latest_version["RAPID"]
+  network             = "%s"
+  subnetwork          = "%s"
+  deletion_protection = false
+
+  node_pool {
+    name               = "%s"
+    initial_node_count = 1
+    node_config {
+      containerd_config {
+        writable_cgroups {
+          enabled = true
+        }
+      }
+    }
+  }
+
+}
+`, clusterName, networkName, subnetworkName, nodePoolName)
+}
+
+func testAccContainerCluster_withNodeConfigWritableCgroups(clusterName, networkName, subnetworkName string) string {
+	return fmt.Sprintf(`
+data "google_container_engine_versions" "central1a" {
+  location = "us-central1-a"
+}
+
+resource "google_container_cluster" "primary" {
+  name                = "%s"
+  location            = "us-central1-a"
+  initial_node_count  = 1
+  min_master_version  = data.google_container_engine_versions.central1a.release_channel_latest_version["RAPID"]
+  network             = "%s"
+  subnetwork          = "%s"
+  deletion_protection = false
+
+  node_config {
+    containerd_config {
+      writable_cgroups {
+        enabled = true
+      }
+    }
+  }
+
+}
+`, clusterName, networkName, subnetworkName)
+}
+
 func TestAccContainerCluster_withProviderDefaultLabels(t *testing.T) {
 	// The test failed if VCR testing is enabled, because the cached provider config is used.
 	// With the cached provider config, any changes in the provider default labels will not be applied.
@@ -15734,4 +15936,4 @@ resource "google_container_cluster" "with_kubelet_config" {
   }
 }
 `, clusterName, networkName, subnetworkName, npName, npName)
-}
+}