GKE Addon for Compute Engine persistent disk CSI Driver

third_party/terraform/resources/resource_container_cluster.go.erb

@@ -57,6 +57,7 @@ var (
 		"addons_config.0.istio_config",
 		"addons_config.0.cloudrun_config",
 		"addons_config.0.dns_cache_config",
+		"addons_config.0.gce_persistent_disk_csi_driver_config",
 	<% end -%>
 	}
 )
@@ -288,6 +289,21 @@ func resourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
+						"gce_persistent_disk_csi_driver_config": {
+							Type:         schema.TypeList,
+							Optional:     true,
+							Computed:     true,
+							AtLeastOneOf: addonsConfigKeys,
+							MaxItems:     1,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"enabled": {
+										Type:     schema.TypeBool,
+										Required: true,
+									},
+								},
+							},
+						},
 					<% end -%>
 					},
 				},
@@ -2221,7 +2237,15 @@ func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConf
 	if v, ok := config["dns_cache_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
 		ac.DnsCacheConfig = &containerBeta.DnsCacheConfig{
-			Enabled:        addon["enabled"].(bool),
+			Enabled:         addon["enabled"].(bool),
+			ForceSendFields: []string{"Enabled"},
+		}
+	}
+
+	if v, ok := config["gce_persistent_disk_csi_driver_config"]; ok && len(v.([]interface{})) > 0 {
+		addon := v.([]interface{})[0].(map[string]interface{})
+		ac.GcePersistentDiskCsiDriverConfig = &containerBeta.GcePersistentDiskCsiDriverConfig{
+			Enabled:         addon["enabled"].(bool),
 			ForceSendFields: []string{"Enabled"},
 		}
 	}
@@ -2636,12 +2660,20 @@ func flattenClusterAddonsConfig(c *containerBeta.AddonsConfig) []map[string]inte
 	}
 
 	if c.DnsCacheConfig != nil {
-  		result["dns_cache_config"] = []map[string]interface{}{
-  			{
-  				"enabled": c.DnsCacheConfig.Enabled,
-  			},
-  		}
-  	}
+		result["dns_cache_config"] = []map[string]interface{}{
+			{
+				"enabled": c.DnsCacheConfig.Enabled,
+			},
+		}
+	}
+
+	if c.GcePersistentDiskCsiDriverConfig != nil {
+		result["gce_persistent_disk_csi_driver_config"] = []map[string]interface{}{
+			{
+				"enabled": c.GcePersistentDiskCsiDriverConfig.Enabled,
+			},
+		}
+	}
 <% end -%>
 	return []map[string]interface{}{result}
 }

third_party/terraform/tests/resource_container_cluster_test.go.erb

@@ -1989,6 +1989,9 @@ resource "google_container_cluster" "primary" {
     dns_cache_config {
       enabled = false
     }
+    gce_persistent_disk_csi_driver_config {
+      enabled = false
+    }
 <% end -%>
   }
 }
@@ -2025,6 +2028,9 @@ resource "google_container_cluster" "primary" {
     dns_cache_config {
       enabled = true
     }
+    gce_persistent_disk_csi_driver_config {
+      enabled = true
+    }
 <% end -%>
   }
 }

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

@@ -324,14 +324,17 @@ The `addons_config` block supports:
 * `cloudrun_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     The status of the CloudRun addon. It requires `istio_config` enabled. It is disabled by default.
     Set `disabled = false` to enable. This addon can only be enabled at cluster creation time.
-    
+
 * `dns_cache_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     The status of the NodeLocal DNSCache addon. It is disabled by default.
-    Set `enabled = true` to enable. 
-    
+    Set `enabled = true` to enable.
+
     **Enabling/Disabling NodeLocal DNSCache in an existing cluster is a disruptive operation.
     All cluster nodes running GKE 1.15 and higher are recreated.**
 
+* `gce_persistent_disk_csi_driver_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
+    Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. Defaults to disabled; set `enabled = true` to enable. 
+
 This example `addons_config` disables two addons:
 
 ```hcl