PLT-1279:Fixed VSphere cluster day 2 operation on control plane node p…

spectrocloud/cluster_common.go

@@ -156,6 +156,12 @@ func flattenCommonAttributeForClusterImport(c *client.V1Client, d *schema.Resour
 		return err
 	}
 
+	if cluster.Metadata.Annotations["description"] != "" {
+		if err := d.Set("description", cluster.Metadata.Annotations["description"]); err != nil {
+			return err
+		}
+	}
+
 	if cluster.Status.SpcApply != nil {
 		err = d.Set("apply_setting", cluster.Status.SpcApply.ActionType)
 		if err != nil {
@@ -196,3 +202,35 @@ func flattenCommonAttributeForClusterImport(c *client.V1Client, d *schema.Resour
 	}
 	return nil
 }
+
+func GetCommonCluster(d *schema.ResourceData, c *client.V1Client) error {
+	// parse resource ID and scope
+	scope, clusterID, err := ParseResourceID(d)
+	if err != nil {
+		return err
+	}
+
+	// Use the IDs to retrieve the cluster data from the API
+	cluster, err := c.GetCluster(scope, clusterID)
+	if err != nil {
+		return fmt.Errorf("unable to retrieve cluster data: %s", err)
+	}
+	if cluster != nil {
+		err = d.Set("name", cluster.Metadata.Name)
+		if err != nil {
+			return err
+		}
+		err = d.Set("context", cluster.Metadata.Annotations["scope"])
+		if err != nil {
+			return err
+		}
+
+		// Set the ID of the resource in the state. This ID is used to track the
+		// resource and must be set in the state during the import.
+		d.SetId(clusterID)
+	} else {
+		return fmt.Errorf("couldn’t find cluster. Kindly check the cluster UID and context")
+	}
+
+	return nil
+}

spectrocloud/resource_cluster_edge_native_import.go

@@ -34,34 +34,6 @@ func resourceClusterEdgeNativeImport(ctx context.Context, d *schema.ResourceData
 	return []*schema.ResourceData{d}, nil
 }
 
-func GetCommonCluster(d *schema.ResourceData, c *client.V1Client) error {
-	// parse resource ID and scope
-	scope, clusterID, err := ParseResourceID(d)
-	if err != nil {
-		return err
-	}
-
-	// Use the IDs to retrieve the cluster data from the API
-	cluster, err := c.GetCluster(scope, clusterID)
-	if err != nil {
-		return fmt.Errorf("unable to retrieve cluster data: %s", err)
-	}
-
-	err = d.Set("name", cluster.Metadata.Name)
-	if err != nil {
-		return err
-	}
-	err = d.Set("context", cluster.Metadata.Annotations["scope"])
-	if err != nil {
-		return err
-	}
-
-	// Set the ID of the resource in the state. This ID is used to track the
-	// resource and must be set in the state during the import.
-	d.SetId(clusterID)
-	return nil
-}
-
 func ParseResourceID(d *schema.ResourceData) (string, string, error) {
 	// d.Id() will contain the ID of the resource to import. This ID is provided by the user
 	// during the import command, and should be parsed to find the existing resource.

spectrocloud/resource_cluster_vsphere.go

@@ -728,7 +728,12 @@ func resourceClusterVsphereUpdate(ctx context.Context, d *schema.ResourceData, m
 							p.UID = oldPlacements[i].UID
 						}
 					}
-
+					// PEM-5013 For day 2 operation hubble is expecting datacenter and folder in machine pool even though TF maintain in cloud config
+					if machinePool.PoolConfig.IsControlPlane {
+						cConfig := d.Get("cloud_config").([]interface{})[0].(map[string]interface{})
+						machinePool.CloudConfig.Placements[0].Datacenter = cConfig["datacenter"].(string)
+						machinePool.CloudConfig.Placements[0].Folder = cConfig["folder"].(string)
+					}
 					err = c.UpdateMachinePoolVsphere(cloudConfigId, ClusterContext, machinePool)
 					// Node Maintenance Actions
 					err := resourceNodeAction(c, ctx, nsMap[name], c.GetNodeMaintenanceStatusVsphere, CloudConfig.Kind, ClusterContext, cloudConfigId, name)