Release 1601 v8 (#1603)

Co-authored-by: Pedro Franco de Carvalho <pedro.carvalho@suse.com>

Author: matttrach

rancher2/schema_cluster_v2_rke_config_machine_pool.go

@@ -1,8 +1,6 @@
 package rancher2
 
 import (
-	"strings"
-
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/rancher/rancher/pkg/capr"
@@ -154,26 +152,24 @@ func clusterV2RKEConfigMachinePoolFields() map[string]*schema.Schema {
 		"machine_labels": {
 			Type:        schema.TypeMap,
 			Optional:    true,
-			Computed:    true,
-			Description: "Labels of the machine",
-			DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
-				// Suppressing diff for labels containing cattle.io/
-				if (strings.Contains(k, commonAnnotationLabelCattle) || strings.Contains(k, commonAnnotationLabelRancher)) && new == "" {
-					return true
-				}
-				return false
-			},
+			Description: "Labels for the machine pool nodes",
 		},
 		"hostname_length_limit": {
 			Type:         schema.TypeInt,
 			Optional:     true,
 			Description:  "maximum length for autogenerated hostname",
 			ValidateFunc: validation.IntBetween(capr.MinimumHostnameLengthLimit, capr.MaximumHostnameLengthLimit),
 		},
-	}
-
-	for k, v := range commonAnnotationLabelFields() {
-		s[k] = v
+		"annotations": {
+			Type:        schema.TypeMap,
+			Optional:    true,
+			Description: "Annotations for the MachineDeployment object",
+		},
+		"labels": {
+			Type:        schema.TypeMap,
+			Optional:    true,
+			Description: "Labels for the MachineDeployment object",
+		},
 	}
 
 	return s