fix: Merge changes from branch 'master'

Author: matttrach

rancher2/resource_rancher2_cluster.go

@@ -35,6 +35,19 @@ func resourceRancher2Cluster() *schema.Resource {
 					d.SetNew("eks_config_v2", flattenClusterEKSConfigV2(newObj, []interface{}{}))
 				}
 			}
+
+			if d.Get("driver") == clusterDriverGKEV2 && d.HasChange("gke_config_v2") {
+				old, new := d.GetChange("gke_config_v2")
+				oldObj := expandClusterGKEConfigV2(old.([]interface{}))
+				newObj := expandClusterGKEConfigV2(new.([]interface{}))
+
+				if reflect.DeepEqual(oldObj, newObj) {
+					d.Clear("gke_config_v2")
+				} else {
+					d.SetNew("gke_config_v2", flattenClusterGKEConfigV2(newObj, []interface{}{}))
+				}
+			}
+
 			return nil
 		},
 		Schema:        clusterFields(),

rancher2/schema_cluster_gke_config_v2.go

@@ -364,7 +364,6 @@ func clusterGKEConfigV2NodePoolConfigFields() map[string]*schema.Schema {
 			Type:        schema.TypeList,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			MaxItems:    1,
 			Description: "The GKE node pool node config",
 			Elem: &schema.Resource{
@@ -421,7 +420,6 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 		"name": {
 			Type:        schema.TypeString,
 			Required:    true,
-			ForceNew:    true,
 			Description: "The GKE cluster name",
 		},
 		"google_credential_secret": {
@@ -433,7 +431,6 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 		"project_id": {
 			Type:        schema.TypeString,
 			Required:    true,
-			ForceNew:    true,
 			Description: "The GKE project id",
 		},
 		"cluster_addons": {
@@ -450,28 +447,24 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "The GKE ip v4 cidr block",
 		},
 		"description": {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "The GKE cluster description",
 		},
 		"enable_kubernetes_alpha": {
 			Type:        schema.TypeBool,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "Enable Kubernetes alpha",
 		},
 		"ip_allocation_policy": {
 			Type:        schema.TypeList,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			MaxItems:    1,
 			Description: "The GKE ip allocation policy",
 			Elem: &schema.Resource{
@@ -482,7 +475,6 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 			Type:        schema.TypeBool,
 			Optional:    true,
 			Default:     false,
-			ForceNew:    true,
 			Description: "Is GKE cluster imported?",
 		},
 		"kubernetes_version": {
@@ -522,7 +514,6 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 			Type:        schema.TypeList,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			MaxItems:    1,
 			Description: "The GKE cluster master authorized networks config",
 			Elem: &schema.Resource{
@@ -539,7 +530,6 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "The GKE cluster network",
 		},
 		"network_policy_enabled": {
@@ -561,7 +551,6 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 			Type:        schema.TypeList,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			MaxItems:    1,
 			Description: "The GKE private cluster config",
 			Elem: &schema.Resource{
@@ -572,21 +561,18 @@ func clusterGKEConfigV2Fields() map[string]*schema.Schema {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "The GKE cluster region. Required if `zone` is empty",
 		},
 		"subnetwork": {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "The GKE cluster subnetwork",
 		},
 		"zone": {
 			Type:        schema.TypeString,
 			Optional:    true,
 			Computed:    true,
-			ForceNew:    true,
 			Description: "The GKE cluster zone. Required if `region` is empty",
 		},
 	}