Promote gce_persistent_disk_csi_driver_config to GA (#6187) (#4436)

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/6187.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+container: Promoted `gce_persistent_disk_csi_driver_config` addon in `google_container_cluster` resource to GA
+```

google-beta/resource_container_cluster.go

@@ -61,8 +61,8 @@ var (
 		"addons_config.0.cloudrun_config",
 		"addons_config.0.gcp_filestore_csi_driver_config",
 		"addons_config.0.dns_cache_config",
-		"addons_config.0.istio_config",
 		"addons_config.0.gce_persistent_disk_csi_driver_config",
+		"addons_config.0.istio_config",
 		"addons_config.0.kalm_config",
 		"addons_config.0.config_connector_config",
 		"addons_config.0.gke_backup_agent_config",
@@ -305,6 +305,22 @@ func resourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
+						"gce_persistent_disk_csi_driver_config": {
+							Type:         schema.TypeList,
+							Optional:     true,
+							Computed:     true,
+							AtLeastOneOf: addonsConfigKeys,
+							MaxItems:     1,
+							Description:  `Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. Defaults to enabled; set disabled = true to disable.`,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"enabled": {
+										Type:     schema.TypeBool,
+										Required: true,
+									},
+								},
+							},
+						},
 						"istio_config": {
 							Type:         schema.TypeList,
 							Optional:     true,
@@ -330,22 +346,6 @@ func resourceContainerCluster() *schema.Resource {
 								},
 							},
 						},
-						"gce_persistent_disk_csi_driver_config": {
-							Type:         schema.TypeList,
-							Optional:     true,
-							Computed:     true,
-							AtLeastOneOf: addonsConfigKeys,
-							MaxItems:     1,
-							Description:  `Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. Defaults to disabled; set enabled = true to enable.`,
-							Elem: &schema.Resource{
-								Schema: map[string]*schema.Schema{
-									"enabled": {
-										Type:     schema.TypeBool,
-										Required: true,
-									},
-								},
-							},
-						},
 						"kalm_config": {
 							Type:         schema.TypeList,
 							Optional:     true,
@@ -3100,6 +3100,14 @@ func expandClusterAddonsConfig(configured interface{}) *container.AddonsConfig {
 		}
 	}
 
+	if v, ok := config["gce_persistent_disk_csi_driver_config"]; ok && len(v.([]interface{})) > 0 {
+		addon := v.([]interface{})[0].(map[string]interface{})
+		ac.GcePersistentDiskCsiDriverConfig = &container.GcePersistentDiskCsiDriverConfig{
+			Enabled:         addon["enabled"].(bool),
+			ForceSendFields: []string{"Enabled"},
+		}
+	}
+
 	if v, ok := config["istio_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
 		ac.IstioConfig = &container.IstioConfig{
@@ -3109,14 +3117,6 @@ func expandClusterAddonsConfig(configured interface{}) *container.AddonsConfig {
 		}
 	}
 
-	if v, ok := config["gce_persistent_disk_csi_driver_config"]; ok && len(v.([]interface{})) > 0 {
-		addon := v.([]interface{})[0].(map[string]interface{})
-		ac.GcePersistentDiskCsiDriverConfig = &container.GcePersistentDiskCsiDriverConfig{
-			Enabled:         addon["enabled"].(bool),
-			ForceSendFields: []string{"Enabled"},
-		}
-	}
-
 	if v, ok := config["kalm_config"]; ok && len(v.([]interface{})) > 0 {
 		addon := v.([]interface{})[0].(map[string]interface{})
 		ac.KalmConfig = &container.KalmConfig{
@@ -3779,19 +3779,19 @@ func flattenClusterAddonsConfig(c *container.AddonsConfig) []map[string]interfac
 		}
 	}
 
-	if c.IstioConfig != nil {
-		result["istio_config"] = []map[string]interface{}{
+	if c.GcePersistentDiskCsiDriverConfig != nil {
+		result["gce_persistent_disk_csi_driver_config"] = []map[string]interface{}{
 			{
-				"disabled": c.IstioConfig.Disabled,
-				"auth":     c.IstioConfig.Auth,
+				"enabled": c.GcePersistentDiskCsiDriverConfig.Enabled,
 			},
 		}
 	}
 
-	if c.GcePersistentDiskCsiDriverConfig != nil {
-		result["gce_persistent_disk_csi_driver_config"] = []map[string]interface{}{
+	if c.IstioConfig != nil {
+		result["istio_config"] = []map[string]interface{}{
 			{
-				"enabled": c.GcePersistentDiskCsiDriverConfig.Enabled,
+				"disabled": c.IstioConfig.Disabled,
+				"auth":     c.IstioConfig.Auth,
 			},
 		}
 	}

google-beta/resource_container_cluster_test.go

@@ -2817,16 +2817,16 @@ resource "google_container_cluster" "primary" {
     cloudrun_config {
       disabled = true
     }
-	dns_cache_config {
+    dns_cache_config {
+      enabled = false
+    }
+    gce_persistent_disk_csi_driver_config {
       enabled = false
     }
     istio_config {
       disabled = true
       auth     = "AUTH_MUTUAL_TLS"
     }
-    gce_persistent_disk_csi_driver_config {
-      enabled = false
-    }
     kalm_config {
 	  enabled = false
 	}
@@ -2876,17 +2876,16 @@ resource "google_container_cluster" "primary" {
       # disabled = false
       disabled = true
     }
-	dns_cache_config {
+    dns_cache_config {
       enabled = true
-	}
+    }
+    gce_persistent_disk_csi_driver_config {
+      enabled = true
+    }
     istio_config {
       disabled = false
       auth     = "AUTH_NONE"
     }
-
-    gce_persistent_disk_csi_driver_config {
-      enabled = true
-	}
 	kalm_config {
 	  enabled = true
 	}

website/docs/r/container_cluster.html.markdown

@@ -385,8 +385,8 @@ subnetwork in which the cluster's instances are launched.
     **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.
+* `gce_persistent_disk_csi_driver_config` - (Optional).
+    Whether this cluster should enable the Google Compute Engine Persistent Disk Container Storage Interface (CSI) Driver. Defaults to disabled; set `enabled = true` to enabled.
 
 * `kalm_config` - (Optional, [Beta](https://terraform.io/docs/providers/google/guides/provider_versions.html)).
     Configuration for the KALM addon, which manages the lifecycle of k8s. It is disabled by default; Set `enabled = true` to enable.