Merge pull request #832 from rawmind0/clustersync

Cluster and cluster sync fixes

Author: rawmind0

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 1.22.2 (Unreleased)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+* Added k8s specialized verbs `bind`, `escalate`, `impersonate` and `use` support, to `rancher2_global_role` and `rancher2_role_template` rules
+
+BUG FIXES:
+
+* Fix `rancher2_cluster_sync.state_confirm` behaviour https://github.com/rancher/terraform-provider-rancher2/issues/797
+* Fix `rancher2_cluster` monitoring flips on resource update https://github.com/rancher/terraform-provider-rancher2/issues/825
+
 ## 1.22.1 (December 23, 2021)
 
 FEATURES:
@@ -23,7 +38,7 @@ FEATURES:
 
 ENHANCEMENTS:
 
-* Updated `rancher2_cluster_v2` docs adding labels and annotations arguments. https://github.com/rancher/terraform-provider-rancher2/issues/784
+* Updated `rancher2_cluster_v2` docs adding labels and annotations arguments https://github.com/rancher/terraform-provider-rancher2/issues/784
 * Updated `findClusterRegistrationToken` function checking for correct Cluster Registration Token https://github.com/rancher/terraform-provider-rancher2/issues/791
 * Updated `getClusterKubeconfig` function to properly delete a cluster if cluster not available https://github.com/rancher/terraform-provider-rancher2/issues/788
 * Updated `rancher2_machine_config_v2` resource to allow its use by Rancher standard users https://github.com/rancher/terraform-provider-rancher2/issues/824

rancher2/resource_rancher2_cluster.go

@@ -281,6 +281,7 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 		"dockerRootDir":                      d.Get("docker_root_dir").(string),
 		"fleetWorkspaceName":                 d.Get("fleet_workspace_name").(string),
 		"enableClusterAlerting":              d.Get("enable_cluster_alerting").(bool),
+		"enableClusterMonitoring":            d.Get("enable_cluster_monitoring").(bool),
 		"enableNetworkPolicy":                &enableNetworkPolicy,
 		"istioEnabled":                       d.Get("enable_cluster_istio").(bool),
 		"localClusterAuthEndpoint":           expandClusterAuthEndpoint(d.Get("cluster_auth_endpoint").([]interface{})),
@@ -289,6 +290,11 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 		"labels":                             toMapString(d.Get("labels").(map[string]interface{})),
 	}
 
+	// cluster_monitoring is not updated here. Setting old `enable_cluster_monitoring` value if it was updated
+	if d.HasChange("enable_cluster_monitoring") {
+		update["enableClusterMonitoring"] = !d.Get("enable_cluster_monitoring").(bool)
+	}
+
 	if clusterTemplateID, ok := d.Get("cluster_template_id").(string); ok && len(clusterTemplateID) > 0 {
 		update["clusterTemplateId"] = clusterTemplateID
 		if clusterTemplateRevisionID, ok := d.Get("cluster_template_revision_id").(string); ok && len(clusterTemplateRevisionID) > 0 {
@@ -373,6 +379,7 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 		return fmt.Errorf("[ERROR] waiting for cluster (%s) to be updated: %s", newCluster.ID, waitErr)
 	}
 
+	// cluster_monitoring is updated here
 	if d.HasChange("enable_cluster_monitoring") || d.HasChange("cluster_monitoring_input") {
 		clusterResource := &norman.Resource{
 			ID:      newCluster.ID,
@@ -381,12 +388,6 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 			Actions: newCluster.Actions,
 		}
 		enableMonitoring := d.Get("enable_cluster_monitoring").(bool)
-		if !enableMonitoring && len(newCluster.Actions[monitoringActionDisable]) > 0 {
-			err = client.APIBaseClient.Action(managementClient.ClusterType, monitoringActionDisable, clusterResource, nil, nil)
-			if err != nil {
-				return err
-			}
-		}
 		if enableMonitoring {
 			monitoringInput := expandMonitoringInput(d.Get("cluster_monitoring_input").([]interface{}))
 			if len(newCluster.Actions[monitoringActionEnable]) > 0 {
@@ -431,6 +432,11 @@ func resourceRancher2ClusterUpdate(d *schema.ResourceData, meta interface{}) err
 					return err
 				}
 			}
+		} else if len(newCluster.Actions[monitoringActionDisable]) > 0 {
+			err = client.APIBaseClient.Action(managementClient.ClusterType, monitoringActionDisable, clusterResource, nil, nil)
+			if err != nil {
+				return err
+			}
 		}
 	}
 

rancher2/resource_rancher2_cluster_sync.go

@@ -31,6 +31,15 @@ func resourceRancher2ClusterSyncCreate(d *schema.ResourceData, meta interface{})
 	if err != nil {
 		return err
 	}
+	if retries, ok := d.Get("state_confirm").(int); ok && retries > 1 {
+		for i := 1; i < retries; i++ {
+			time.Sleep(rancher2RetriesWait * time.Second)
+			cluster, err = meta.(*Config).WaitForClusterState(clusterID, clusterActiveCondition, d.Timeout(schema.TimeoutCreate))
+			if err != nil {
+				return err
+			}
+		}
+	}
 
 	if cluster.EnableClusterMonitoring && d.Get("wait_monitoring").(bool) {
 		_, err := meta.(*Config).WaitForClusterState(clusterID, clusterMonitoringEnabledCondition, d.Timeout(schema.TimeoutCreate))