Merge pull request #761 from rawmind0/eksv2

Fixed rancher2_cluster resource update to properly update eks v2 and gke v2 clusters

Author: rawmind0

CHANGELOG.md

@@ -11,6 +11,7 @@ ENHANCEMENTS:
 BUG FIXES:
 
 * Fixed `expandClusterEKSConfigV2` function to avoid provider crash https://github.com/rancher/terraform-provider-rancher2/issues/753
+* Fixed `rancher2_cluster` resource update to properly update eks v2 and gke v2 clusters
 
 ## 1.20.0 (September 17, 2021)
 

rancher2/resource_rancher2_cluster.go

@@ -321,7 +321,7 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 		update["amazonElasticContainerServiceConfig"] = eksConfig
 	case ToLower(clusterDriverEKSV2):
 		eksConfigV2 := expandClusterEKSConfigV2(d.Get("eks_config_v2").([]interface{}))
-		update["eksConfig"] = structToMap(eksConfigV2)
+		update["eksConfig"] = fixClusterEKSConfigV2(d.Get("eks_config_v2").([]interface{}), structToMap(eksConfigV2))
 	case clusterDriverGKE:
 		gkeConfig, err := expandClusterGKEConfig(d.Get("gke_config").([]interface{}), d.Get("name").(string))
 		if err != nil {
@@ -330,7 +330,7 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 		update["googleKubernetesEngineConfig"] = gkeConfig
 	case ToLower(clusterDriverGKEV2):
 		gkeConfig := expandClusterGKEConfigV2(d.Get("gke_config_v2").([]interface{}))
-		update["gke_config"] = gkeConfig
+		update["gkeConfig"] = fixClusterGKEConfigV2(structToMap(gkeConfig))
 	case clusterOKEKind:
 		okeConfig, err := expandClusterOKEConfig(d.Get("oke_config").([]interface{}), d.Get("name").(string))
 		if err != nil {