Merge pull request #263 from rawmind0/rke12

Updated RKE to v1.2.2

Author: rawmind0

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.1.5 (November 5, 2020)
+
+FEATURES:
+
+
+
+ENHANCEMENTS:
+
+* Updated RKE to v1.2.2
+
+BUG FIXES:
+
+
+
 ## 1.1.4 (November 5, 2020)
 
 FEATURES:

go.mod

@@ -7,7 +7,7 @@ require (
 	github.com/gorilla/websocket v1.4.1 // indirect
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.14.0
-	github.com/rancher/rke v1.2.1
+	github.com/rancher/rke v1.2.2
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/sirupsen/logrus v1.4.2
 	gopkg.in/yaml.v2 v2.2.8

go.sum

@@ -786,6 +786,8 @@ github.com/rancher/rke v1.2.0 h1:IxnUfQKyiQ1F16xERd9JSboS8g43JHtjpmtcfgssHQE=
 github.com/rancher/rke v1.2.0/go.mod h1:aPSc14Hp8UGLscL/wB9ZZQHPX/kjDiPXLcoMTCY2NS4=
 github.com/rancher/rke v1.2.1 h1:YLIZ+bkINrJrje8zPuFfnVx7iGqAvnZoHZSK3pA9BRs=
 github.com/rancher/rke v1.2.1/go.mod h1:aPSc14Hp8UGLscL/wB9ZZQHPX/kjDiPXLcoMTCY2NS4=
+github.com/rancher/rke v1.2.2 h1:E5Vqs+vO+M0iN/0b5EsS0vc9Bg5BtQtXOQVXVakxr4s=
+github.com/rancher/rke v1.2.2/go.mod h1:aPSc14Hp8UGLscL/wB9ZZQHPX/kjDiPXLcoMTCY2NS4=
 github.com/rancher/types v0.0.0-20200303162837-300a04e6f743/go.mod h1:k5LoTlUpefw0eAzFSJsZI0gf+C4WE41yrc1jm/MS1nM=
 github.com/rancher/types v0.0.0-20200326224903-b4612bd96d9b h1:nLJOQuk36vCXFQuD03L5Fh9xpF9n9U7/76WNGDjOjeY=
 github.com/rancher/types v0.0.0-20200326224903-b4612bd96d9b/go.mod h1:k5LoTlUpefw0eAzFSJsZI0gf+C4WE41yrc1jm/MS1nM=

rke/structure_rke_cluster_node.go

@@ -30,7 +30,7 @@ func flattenRKEClusterNodeUpgradeStrategy(in *rancher.NodeUpgradeStrategy) []int
 		return []interface{}{}
 	}
 
-	obj["drain"] = in.Drain
+	obj["drain"] = *in.Drain
 
 	if in.DrainInput != nil {
 		obj["drain_input"] = flattenRKEClusterNodeDrainInput(in.DrainInput)
@@ -208,7 +208,7 @@ func expandRKEClusterNodeUpgradeStrategy(p []interface{}) *rancher.NodeUpgradeSt
 	in := p[0].(map[string]interface{})
 
 	if v, ok := in["drain"].(bool); ok {
-		obj.Drain = v
+		obj.Drain = &v
 	}
 
 	if v, ok := in["drain_input"].([]interface{}); ok {

rke/structure_rke_cluster_node_test.go

@@ -36,7 +36,7 @@ func init() {
 		},
 	}
 	testRKEClusterNodeUpgradeStrategyConf = &rancher.NodeUpgradeStrategy{
-		Drain:                      false,
+		Drain:                      newFalse(),
 		DrainInput:                 testRKEClusterNodeDrainInputConf,
 		MaxUnavailableControlplane: "2",
 		MaxUnavailableWorker:       "20%",