Merge pull request #890 from annablender/drain-before-delete-terraform

Add drain before delete to cluster_v2 resource

Author: Anna Blendermann

rancher2/schema_cluster_v2_rke_config_machine_pool.go

@@ -72,6 +72,12 @@ func clusterV2RKEConfigMachinePoolFields() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Machine pool etcd role",
 		},
+		"drain_before_delete": {
+			Type:        schema.TypeBool,
+			Optional:    true,
+			Default:     false,
+			Description: "Machine pool drain before delete",
+		},
 		"paused": {
 			Type:        schema.TypeBool,
 			Optional:    true,

rancher2/structure_cluster_v2_rke_config_machine_pool.go

@@ -55,6 +55,7 @@ func flattenClusterV2RKEConfigMachinePools(p []provisionv1.RKEMachinePool) []int
 		}
 		obj["control_plane_role"] = in.ControlPlaneRole
 		obj["etcd_role"] = in.EtcdRole
+		obj["drain_before_delete"] = in.DrainBeforeDelete
 
 		if len(in.MachineDeploymentAnnotations) > 0 {
 			obj["annotations"] = toMapInterface(in.MachineDeploymentAnnotations)
@@ -147,6 +148,9 @@ func expandClusterV2RKEConfigMachinePools(p []interface{}) []provisionv1.RKEMach
 		if v, ok := in["etcd_role"].(bool); ok {
 			obj.EtcdRole = v
 		}
+		if v, ok := in["drain_before_delete"].(bool); ok {
+			obj.DrainBeforeDelete = v
+		}
 		if v, ok := in["annotations"].(map[string]interface{}); ok && len(v) > 0 {
 			obj.MachineDeploymentAnnotations = toMapString(v)
 		}

rancher2/structure_cluster_v2_rke_config_machine_pool_test.go

@@ -45,11 +45,12 @@ func init() {
 	quantity := int32(10)
 	testClusterV2RKEConfigMachinePoolsConf = []provisionv1.RKEMachinePool{
 		{
-			Name:             "test",
-			DisplayName:      "test",
-			NodeConfig:       testClusterV2RKEConfigMachinePoolMachineConfigConf,
-			ControlPlaneRole: true,
-			EtcdRole:         true,
+			Name:              "test",
+			DisplayName:       "test",
+			NodeConfig:        testClusterV2RKEConfigMachinePoolMachineConfigConf,
+			ControlPlaneRole:  true,
+			EtcdRole:          true,
+			DrainBeforeDelete: true,
 			MachineDeploymentAnnotations: map[string]string{
 				"anno_one": "one",
 				"anno_two": "two",
@@ -79,6 +80,7 @@ func init() {
 			"machine_config":               testClusterV2RKEConfigMachinePoolMachineConfigInterface,
 			"control_plane_role":           true,
 			"etcd_role":                    true,
+			"drain_before_delete":          true,
 			"annotations": map[string]interface{}{
 				"anno_one": "one",
 				"anno_two": "two",