Merge pull request #889 from paynejacob/issue-874

Author: paynejacob

rancher2/schema_cluster_v2_rke_config_machine_pool.go

@@ -112,6 +112,26 @@ func clusterV2RKEConfigMachinePoolFields() map[string]*schema.Schema {
 			Optional:    true,
 			Description: "Machine pool worker role",
 		},
+		"node_startup_timeout_seconds": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "seconds a new node has to become active before it is replaced",
+		},
+		"unhealthy_node_timeout_seconds": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Description: "seconds an unhealthy node has to become active before it is replaced",
+		},
+		"max_unhealthy": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "max unhealthy nodes for automated replacement to be allowed",
+		},
+		"unhealthy_range": {
+			Type:        schema.TypeString,
+			Optional:    true,
+			Description: "range of unhealthy nodes for automated replacement to be allowed",
+		},
 	}
 
 	for k, v := range commonAnnotationLabelFields() {

rancher2/structure_cluster_v2_rke_config_machine_pool.go

@@ -3,7 +3,9 @@ package rancher2
 import (
 	provisionv1 "github.com/rancher/rancher/pkg/apis/provisioning.cattle.io/v1"
 	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
+	"time"
 )
 
 // Flatteners
@@ -75,6 +77,19 @@ func flattenClusterV2RKEConfigMachinePools(p []provisionv1.RKEMachinePool) []int
 		}
 		obj["worker_role"] = in.WorkerRole
 		out[i] = obj
+
+		if in.NodeStartupTimeout != nil {
+			obj["node_startup_timeout_seconds"] = int(in.NodeStartupTimeout.Seconds())
+		}
+		if in.UnhealthyNodeTimeout != nil {
+			obj["unhealthy_node_timeout_seconds"] = int(in.UnhealthyNodeTimeout.Seconds())
+		}
+		if in.MaxUnhealthy != nil {
+			obj["max_unhealthy"] = *in.MaxUnhealthy
+		}
+		if in.UnhealthyRange != nil {
+			obj["unhealthy_range"] = *in.UnhealthyRange
+		}
 	}
 
 	return out
@@ -173,6 +188,21 @@ func expandClusterV2RKEConfigMachinePools(p []interface{}) []provisionv1.RKEMach
 		if v, ok := in["worker_role"].(bool); ok {
 			obj.WorkerRole = v
 		}
+		if v, ok := in["node_startup_timeout_seconds"].(int); ok && v > 0 {
+			d := metav1.Duration{Duration: time.Duration(v) * time.Second}
+			obj.NodeStartupTimeout = &d
+		}
+		if v, ok := in["unhealthy_node_timeout_seconds"].(int); ok && v > 0 {
+			d := metav1.Duration{Duration: time.Duration(v) * time.Second}
+			obj.UnhealthyNodeTimeout = &d
+		}
+		if v, ok := in["max_unhealthy"].(string); ok && len(v) > 0 {
+			obj.MaxUnhealthy = &v
+		}
+		if v, ok := in["unhealthy_range"].(string); ok && len(v) > 0 {
+			obj.UnhealthyRange = &v
+		}
+
 		out[i] = obj
 	}
 

rancher2/structure_cluster_v2_rke_config_machine_pool_test.go

@@ -1,8 +1,10 @@
 package rancher2
 
 import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"reflect"
 	"testing"
+	"time"
 
 	provisionv1 "github.com/rancher/rancher/pkg/apis/provisioning.cattle.io/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -59,10 +61,14 @@ func init() {
 				"label_one": "one",
 				"label_two": "two",
 			},
-			Quantity:      &quantity,
-			Paused:        true,
-			RollingUpdate: testClusterV2RKEConfigMachinePoolRollingUpdateConf,
-			WorkerRole:    true,
+			Quantity:             &quantity,
+			Paused:               true,
+			RollingUpdate:        testClusterV2RKEConfigMachinePoolRollingUpdateConf,
+			WorkerRole:           true,
+			NodeStartupTimeout:   metav1DurationPtr(600),
+			UnhealthyNodeTimeout: metav1DurationPtr(60),
+			MaxUnhealthy:         stringPtr("2"),
+			UnhealthyRange:       stringPtr("[2,5]"),
 		},
 	}
 	testClusterV2RKEConfigMachinePoolsConf[0].CloudCredentialSecretName = "cloud_credential_secret_name"
@@ -99,7 +105,11 @@ func init() {
 					"effect": "recipient",
 				},
 			},
-			"worker_role": true,
+			"worker_role":                    true,
+			"node_startup_timeout_seconds":   600,
+			"unhealthy_node_timeout_seconds": 60,
+			"max_unhealthy":                  "2",
+			"unhealthy_range":                "[2,5]",
 		},
 	}
 }
@@ -229,3 +239,11 @@ func TestExpandClusterV2RKEConfigMachinePools(t *testing.T) {
 		}
 	}
 }
+
+func stringPtr(s string) *string {
+	return &s
+}
+
+func metav1DurationPtr(seconds int64) *metav1.Duration {
+	return &metav1.Duration{Duration: time.Duration(seconds) * time.Second}
+}