Merge branch 'master' into adtls

Author: rawmind0

CHANGELOG.md

@@ -4,6 +4,7 @@ FEATURES:
 
 * **New Argument:** `rancher2_auth_config_keycloak.entity_id` - (Optional/Computed) KeyCloak Client ID field (string)
 * **New Argument:** `rancher2_auth_config_activedirectory.start_tls` - (Optional/Computed) Enable start TLS connection (bool)
+* **New Argument:** `rancher2_node_pool.drain_before_delete` - (Optional) Drain nodes before delete (bool)
 
 ENHANCEMENTS:
 
@@ -12,6 +13,7 @@ ENHANCEMENTS:
 * Updated `rancher2_cluster.rke_config.cloud_provider.name` argument from `Optional/Computed` to `Optional`
 * Updated `rancher2_cluster` resource to replace RKE cluster API info instead of update, if `rancher2_cluster.rke_config` has been updated
 * Updated `rancher2_project` resource to replace project API info instead of update
+* Updated `rancher2_node_template.engine_install_url` argument to be `computed`
 
 BUG FIXES:
 

docs/resources/node_pool.md

@@ -65,6 +65,7 @@ The following arguments are supported:
 * `hostname_prefix` - (Required) The prefix for created nodes of the Node Pool (string)
 * `node_template_id` - (Required) The Node Template ID to use for node creation (string)
 * `delete_not_ready_after_secs` - (Optional) Delete not ready node after secs. For Rancher v2.3.3 or above. Default `0` (int)
+* `drain_before_delete` - (Optional) Drain nodes before delete. Default: `false` (bool)
 * `node_taints` - (Required) Node taints. For Rancher v2.3.3 or above (List)
 * `control_plane` - (Optional) RKE control plane role for created nodes (bool)
 * `etcd` - (Optional) RKE etcd role for created nodes (bool)

docs/resources/node_template.md

@@ -96,7 +96,7 @@ The following arguments are supported:
 * `driver_id` - (Optional/Computed) The node driver id used by the node template. It's required if the node driver isn't built in Rancher (string)
 * `engine_env` - (Optional) Engine environment for the node template (string)
 * `engine_insecure_registry` - (Optional) Insecure registry for the node template (list)
-* `engine_install_url` - (Optional) Docker engine install URL for the node template. Default `https://releases.rancher.com/install-docker/18.09.sh`. Available install docker versions at `https://github.com/rancher/install-docker` (string)
+* `engine_install_url` - (Optional/Computed) Docker engine install URL for the node template. Available install docker versions at `https://github.com/rancher/install-docker` (string)
 * `engine_label` - (Optional) Engine label for the node template (string)
 * `engine_opt` - (Optional) Engine options for the node template (map)
 * `engine_registry_mirror` - (Optional) Engine registry mirror for the node template (list)
@@ -110,7 +110,7 @@ The following arguments are supported:
 * `annotations` - (Optional) Annotations for Node Template object (map)
 * `labels` - (Optional/Computed) Labels for Node Template object (map)
 
-**Note** `annotations`, `labels` and `node_taints` will be applied to nodes deployed using the Node Template
+**Note** `labels` and `node_taints` will be applied to nodes deployed using the Node Template
 
 ## Attributes Reference
 

rancher2/resource_rancher2_node_pool.go

@@ -102,6 +102,7 @@ func resourceRancher2NodePoolUpdate(d *schema.ResourceData, meta interface{}) er
 	update := map[string]interface{}{
 		"hostnamePrefix":          d.Get("hostname_prefix").(string),
 		"deleteNotReadyAfterSecs": int64(d.Get("delete_not_ready_after_secs").(int)),
+		"drainBeforeDelete":       d.Get("drain_before_delete").(bool),
 		"nodeTemplateId":          d.Get("node_template_id").(string),
 		"nodeTaints":              expandTaints(d.Get("node_taints").([]interface{})),
 		"quantity":                int64(d.Get("quantity").(int)),

rancher2/schema_common.go

@@ -22,7 +22,7 @@ func commonAnnotationLabelFields() map[string]*schema.Schema {
 			Description: "Annotations of the resource",
 			DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
 				// Supressing diff for annotations containing cattle.io/
-				if (strings.Contains(k, commonAnnotationLabelCattle) || strings.Contains(k, commonAnnotationLabelRancher)) && old != "" && new == "" {
+				if (strings.Contains(k, commonAnnotationLabelCattle) || strings.Contains(k, commonAnnotationLabelRancher)) && new == "" {
 					return true
 				}
 				return false
@@ -35,7 +35,7 @@ func commonAnnotationLabelFields() map[string]*schema.Schema {
 			Description: "Labels of the resource",
 			DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
 				// Supressing diff for labels containing cattle.io/
-				if (strings.Contains(k, commonAnnotationLabelCattle) || strings.Contains(k, commonAnnotationLabelRancher)) && old != "" && new == "" {
+				if (strings.Contains(k, commonAnnotationLabelCattle) || strings.Contains(k, commonAnnotationLabelRancher)) && new == "" {
 					return true
 				}
 				return false

rancher2/schema_node_pool.go

@@ -40,6 +40,10 @@ func nodePoolFields() map[string]*schema.Schema {
 			Default:      0,
 			ValidateFunc: validation.IntAtLeast(0),
 		},
+		"drain_before_delete": {
+			Type:     schema.TypeBool,
+			Optional: true,
+		},
 		"control_plane": {
 			Type:     schema.TypeBool,
 			Optional: true,

rancher2/schema_node_template.go

@@ -95,7 +95,7 @@ func nodeTemplateFields() map[string]*schema.Schema {
 		"engine_install_url": {
 			Type:     schema.TypeString,
 			Optional: true,
-			Default:  "https://releases.rancher.com/install-docker/18.09.sh",
+			Computed: true,
 		},
 		"engine_label": {
 			Type:     schema.TypeMap,

rancher2/structure_node_pool.go

@@ -16,6 +16,7 @@ func flattenNodePool(d *schema.ResourceData, in *managementClient.NodePool) erro
 	d.Set("cluster_id", in.ClusterID)
 	d.Set("name", in.Name)
 	d.Set("delete_not_ready_after_secs", int(in.DeleteNotReadyAfterSecs))
+	d.Set("drain_before_delete", in.DrainBeforeDelete)
 	d.Set("hostname_prefix", in.HostnamePrefix)
 	d.Set("node_template_id", in.NodeTemplateID)
 
@@ -56,6 +57,7 @@ func expandNodePool(in *schema.ResourceData) *managementClient.NodePool {
 	obj.ClusterID = in.Get("cluster_id").(string)
 	obj.Name = in.Get("name").(string)
 	obj.DeleteNotReadyAfterSecs = int64(in.Get("delete_not_ready_after_secs").(int))
+	obj.DrainBeforeDelete = in.Get("drain_before_delete").(bool)
 	obj.HostnamePrefix = in.Get("hostname_prefix").(string)
 	obj.NodeTemplateID = in.Get("node_template_id").(string)
 

rancher2/structure_node_pool_test.go

@@ -9,32 +9,70 @@ import (
 )
 
 var (
-	testNodePoolConf      *managementClient.NodePool
-	testNodePoolInterface map[string]interface{}
+	testNodePoolNodeTaintsConf      []managementClient.Taint
+	testNodePoolNodeTaintsInterface []interface{}
+	testNodePoolConf                *managementClient.NodePool
+	testNodePoolInterface           map[string]interface{}
 )
 
 func init() {
+	testNodePoolNodeTaintsConf = []managementClient.Taint{
+		{
+			Key:       "key",
+			Value:     "value",
+			Effect:    "recipient",
+			TimeAdded: "time_added",
+		},
+	}
+	testNodePoolNodeTaintsInterface = []interface{}{
+		map[string]interface{}{
+			"key":        "key",
+			"value":      "value",
+			"effect":     "recipient",
+			"time_added": "time_added",
+		},
+	}
 	testNodePoolConf = &managementClient.NodePool{
 		ClusterID:               "cluster-test",
 		Name:                    "test",
 		DeleteNotReadyAfterSecs: 0,
+		DrainBeforeDelete:       true,
 		HostnamePrefix:          "terraform-test",
+		NodeTaints:              testNodePoolNodeTaintsConf,
 		NodeTemplateID:          "node-test",
 		Quantity:                3,
 		ControlPlane:            true,
 		Etcd:                    true,
 		Worker:                  true,
+		Annotations: map[string]string{
+			"one": "one",
+			"two": "two",
+		},
+		Labels: map[string]string{
+			"option1": "value1",
+			"option2": "value2",
+		},
 	}
 	testNodePoolInterface = map[string]interface{}{
 		"cluster_id":                  "cluster-test",
 		"name":                        "test",
 		"delete_not_ready_after_secs": 0,
+		"drain_before_delete":         true,
 		"hostname_prefix":             "terraform-test",
+		"node_taints":                 testNodePoolNodeTaintsInterface,
 		"node_template_id":            "node-test",
 		"quantity":                    3,
 		"control_plane":               true,
 		"etcd":                        true,
 		"worker":                      true,
+		"annotations": map[string]interface{}{
+			"one": "one",
+			"two": "two",
+		},
+		"labels": map[string]interface{}{
+			"option1": "value1",
+			"option2": "value2",
+		},
 	}
 }
 
@@ -62,7 +100,7 @@ func TestFlattenNodePool(t *testing.T) {
 		}
 		if !reflect.DeepEqual(expectedOutput, tc.ExpectedOutput) {
 			t.Fatalf("Unexpected output from flattener.\nExpected: %#v\nGiven:    %#v",
-				expectedOutput, output)
+				expectedOutput, tc.ExpectedOutput)
 		}
 	}
 }