Merge pull request #187 from rawmind0/v1.1

Updated rke to V1.1

Author: rawmind0

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.0.0-rc5 (Unreleased)
+## 1.0.0-rc5 (April 3, 2020)
 
 FEATURES:
 
@@ -10,14 +10,17 @@ FEATURES:
 ENHANCEMENTS:
 
 * Updated `hashicorp/terraform-plugin-sdk` go modules and vendor files to v1.8.0
-* Updated go modules and vendor files to support [RKE v1.0.6](https://github.com/rancher/rke/releases/tag/v1.0.6)
+* Updated go modules and vendor files to support [RKE v1.1.0](https://github.com/rancher/rke/releases/tag/v1.1.0)
+* Added `upgrade_strategy` argument to `rke_cluster` resource
+* Updated `kubernetes_version` argument to get default and available k8s versions from rke metadata
 
 BUG FIXES:
 
 * Fixed computed fields to avoid inconsistent plan
 * Disabled `debug` config option until next rke release (Breaking logs)
 * Fixed segmentation fault with deprecated fields
 * Fixed `vsphere_cloud_provider` argument to avoid false diff
+* Fixed segmentation fault with deprecated fields
 
 ## 1.0.0-rc4 (March 13, 2020)
 

go.mod

@@ -3,22 +3,24 @@ module github.com/rancher/terraform-provider-rke
 go 1.12
 
 require (
+	github.com/aws/aws-sdk-go v1.25.48 // indirect
 	github.com/ghodss/yaml v1.0.0
+	github.com/go-openapi/strfmt v0.19.2 // indirect
+	github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect
 	github.com/gorilla/websocket v1.4.1 // indirect
-	github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
+	github.com/hashicorp/go-sockaddr v1.0.2 // indirect
 	github.com/hashicorp/go-version v1.2.0
 	github.com/hashicorp/terraform-plugin-sdk v1.8.0
-	github.com/rancher/kontainer-driver-metadata v0.0.0-20200329153031-ee56d7c311b4
-	github.com/rancher/rke v1.0.6
-	github.com/rancher/types v0.0.0-20191220141556-ad31d6815bbd
+	github.com/rancher/rke v1.1.0
+	github.com/rancher/types v0.0.0-20200326224903-b4612bd96d9b
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/sirupsen/logrus v1.4.2
-	gopkg.in/ini.v1 v1.48.0 // indirect
-	gopkg.in/yaml.v2 v2.2.4
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/apiserver v0.0.0
-	k8s.io/client-go v11.0.1-0.20190805182715-88a2adca7e76+incompatible
+	github.com/soheilhy/cmux v0.1.4 // indirect
+	gopkg.in/yaml.v2 v2.2.5
+	k8s.io/api v0.17.2
+	k8s.io/apimachinery v0.17.2
+	k8s.io/apiserver v0.17.2
+	k8s.io/client-go v12.0.0+incompatible
 )
 
 replace (

go.sum

@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 
-	//rkelog "github.com/rancher/rke/log"
 	log "github.com/sirupsen/logrus"
 )
 

rke/config.go

@@ -234,6 +234,10 @@ resource rke_cluster "cluster" {
     user    = "docker"
     role    = ["controlplane", "worker", "etcd"]
   }
+  upgrade_strategy {
+    drain = true
+    max_unavailable_worker = "20%%"
+  }
 }
 `, testAccRKEClusterNodes[0])
 
@@ -255,6 +259,10 @@ resource rke_cluster "cluster" {
       bar = "bar"
     }
   }
+  upgrade_strategy {
+    drain = true
+    max_unavailable_worker = "20%%"
+  }
 }
 `, testAccRKEClusterNodes[0])
 
@@ -277,6 +285,10 @@ resource rke_cluster "cluster" {
     user    = "docker"
     role    = ["worker"]
   }
+  upgrade_strategy {
+    drain = true
+    max_unavailable_worker = "20%%"
+  }
 }
 `, testAccRKEClusterNodes[0], testAccRKEClusterNodes[1])
 }

rke/resource_rke_cluster_test.go

@@ -1,14 +1,14 @@
 package rke
 
 import (
+	"context"
 	"fmt"
-	//"reflect"
 	"sort"
 
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
-	"github.com/rancher/kontainer-driver-metadata/rke"
+	"github.com/rancher/rke/metadata"
 )
 
 //Schemas
@@ -167,12 +167,11 @@ func rkeClusterFields() map[string]*schema.Schema {
 		"kubernetes_version": {
 			Type:        schema.TypeString,
 			Optional:    true,
-			Computed:    true,
 			Description: "K8s version to deploy (if kubernetes image is specified, image version takes precedence)",
 			ValidateFunc: validation.StringInSlice(func() []string {
-				rkeData := rke.DriverData
-				versions := make([]*version.Version, 0, len(rkeData.K8sVersionRKESystemImages))
-				for k := range rkeData.K8sVersionRKESystemImages {
+				metadata.InitMetadata(context.Background())
+				versions := make([]*version.Version, 0, len(metadata.K8sVersionToRKESystemImages))
+				for k := range metadata.K8sVersionToRKESystemImages {
 					v, _ := version.NewVersion(k)
 					versions = append(versions, v)
 				}
@@ -183,6 +182,10 @@ func rkeClusterFields() map[string]*schema.Schema {
 				}
 				return keys
 			}(), false),
+			DefaultFunc: func() (interface{}, error) {
+				metadata.InitMetadata(context.Background())
+				return metadata.DefaultK8sVersion, nil
+			},
 		},
 		"monitoring": {
 			Type:        schema.TypeList,
@@ -349,6 +352,15 @@ func rkeClusterFields() map[string]*schema.Schema {
 				Schema: rkeClusterSystemImagesFields(),
 			},
 		},
+		"upgrade_strategy": {
+			Type:        schema.TypeList,
+			Description: "RKE k8s cluster upgrade strategy",
+			MaxItems:    1,
+			Optional:    true,
+			Elem: &schema.Resource{
+				Schema: rkeClusterNodeUpgradeStrategyFields(),
+			},
+		},
 		"update_only": {
 			Type:        schema.TypeBool,
 			Optional:    true,

rke/schema_rke_cluster.go

@@ -129,3 +129,65 @@ func rkeClusterNodeComputedFields() map[string]*schema.Schema {
 	}
 	return s
 }
+
+func rkeClusterNodeDrainInputFields() map[string]*schema.Schema {
+	s := map[string]*schema.Schema{
+		"delete_local_data": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  false,
+		},
+		"force": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  false,
+		},
+		"grace_period": {
+			Type:     schema.TypeInt,
+			Optional: true,
+			Default:  -1,
+		},
+		"ignore_daemon_sets": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  true,
+		},
+		"timeout": {
+			Type:         schema.TypeInt,
+			Optional:     true,
+			Default:      60,
+			ValidateFunc: validation.IntBetween(1, 10800),
+		},
+	}
+	return s
+}
+
+func rkeClusterNodeUpgradeStrategyFields() map[string]*schema.Schema {
+	s := map[string]*schema.Schema{
+		"drain": {
+			Type:     schema.TypeBool,
+			Optional: true,
+			Default:  false,
+		},
+		"drain_input": {
+			Type:     schema.TypeList,
+			MaxItems: 1,
+			Optional: true,
+			Computed: true,
+			Elem: &schema.Resource{
+				Schema: rkeClusterNodeDrainInputFields(),
+			},
+		},
+		"max_unavailable_controlplane": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "1",
+		},
+		"max_unavailable_worker": {
+			Type:     schema.TypeString,
+			Optional: true,
+			Default:  "10%",
+		},
+	}
+	return s
+}

rke/schema_rke_cluster_node.go

@@ -106,7 +106,7 @@ func rkeClusterServicesKubeAPIAuditLogFields() map[string]*schema.Schema {
 		"enabled": {
 			Type:     schema.TypeBool,
 			Optional: true,
-			Default:  false,
+			Default:  true,
 		},
 	}
 	return s

rke/schema_rke_cluster_services_kube_api.go

@@ -191,6 +191,11 @@ func flattenRKECluster(d *schema.ResourceData, in *cluster.Cluster) error {
 		return err
 	}
 
+	err = d.Set("upgrade_strategy", flattenRKEClusterNodeUpgradeStrategy(in.UpgradeStrategy))
+	if err != nil {
+		return err
+	}
+
 	return nil
 }
 
@@ -302,6 +307,10 @@ func expandRKECluster(in *schema.ResourceData) (string, error) {
 		obj.SystemImages = expandRKEClusterSystemImages(v)
 	}
 
+	if v, ok := in.Get("upgrade_strategy").([]interface{}); ok {
+		obj.UpgradeStrategy = expandRKEClusterNodeUpgradeStrategy(v)
+	}
+
 	policyJSON := ""
 	if v, ok := in.Get("services").([]interface{}); ok && len(v) > 0 {
 		services, err := expandRKEClusterServices(v)

rke/structure_rke_cluster.go

@@ -7,6 +7,44 @@ import (
 
 // Flatteners
 
+func flattenRKEClusterNodeDrainInput(in *rancher.NodeDrainInput) []interface{} {
+	obj := make(map[string]interface{})
+	if in == nil {
+		return []interface{}{}
+	}
+
+	obj["delete_local_data"] = in.DeleteLocalData
+	obj["force"] = in.Force
+	obj["grace_period"] = in.GracePeriod
+	obj["ignore_daemon_sets"] = in.IgnoreDaemonSets
+	obj["timeout"] = in.Timeout
+
+	return []interface{}{obj}
+}
+
+func flattenRKEClusterNodeUpgradeStrategy(in *rancher.NodeUpgradeStrategy) []interface{} {
+	obj := make(map[string]interface{})
+	if in == nil {
+		return []interface{}{}
+	}
+
+	obj["drain"] = in.Drain
+
+	if in.DrainInput != nil {
+		obj["drain_input"] = flattenRKEClusterNodeDrainInput(in.DrainInput)
+	}
+
+	if len(in.MaxUnavailableControlplane) > 0 {
+		obj["max_unavailable_controlplane"] = in.MaxUnavailableControlplane
+	}
+
+	if len(in.MaxUnavailableWorker) > 0 {
+		obj["max_unavailable_worker"] = in.MaxUnavailableWorker
+	}
+
+	return []interface{}{obj}
+}
+
 func flattenRKEClusterNodes(p []rancher.RKEConfigNode) []interface{} {
 	out := []interface{}{}
 
@@ -99,6 +137,62 @@ func flattenRKEClusterNodesComputed(p []*hosts.Host) []interface{} {
 
 // Expanders
 
+func expandRKEClusterNodeDrainInput(p []interface{}) *rancher.NodeDrainInput {
+	obj := &rancher.NodeDrainInput{}
+	if len(p) == 0 || p[0] == nil {
+		return obj
+	}
+	in := p[0].(map[string]interface{})
+
+	if v, ok := in["delete_local_data"].(bool); ok {
+		obj.DeleteLocalData = v
+	}
+
+	if v, ok := in["force"].(bool); ok {
+		obj.Force = v
+	}
+
+	if v, ok := in["grace_period"].(int); ok {
+		obj.GracePeriod = v
+	}
+
+	if v, ok := in["ignore_daemon_sets"].(bool); ok {
+		obj.IgnoreDaemonSets = v
+	}
+
+	if v, ok := in["timeout"].(int); ok {
+		obj.Timeout = v
+	}
+
+	return obj
+}
+
+func expandRKEClusterNodeUpgradeStrategy(p []interface{}) *rancher.NodeUpgradeStrategy {
+	obj := &rancher.NodeUpgradeStrategy{}
+	if len(p) == 0 || p[0] == nil {
+		return obj
+	}
+	in := p[0].(map[string]interface{})
+
+	if v, ok := in["drain"].(bool); ok {
+		obj.Drain = v
+	}
+
+	if v, ok := in["drain_input"].([]interface{}); ok {
+		obj.DrainInput = expandRKEClusterNodeDrainInput(v)
+	}
+
+	if v, ok := in["max_unavailable_controlplane"].(string); ok && len(v) > 0 {
+		obj.MaxUnavailableControlplane = v
+	}
+
+	if v, ok := in["max_unavailable_worker"].(string); ok && len(v) > 0 {
+		obj.MaxUnavailableWorker = v
+	}
+
+	return obj
+}
+
 func expandRKEClusterNodes(p []interface{}) []rancher.RKEConfigNode {
 	out := []rancher.RKEConfigNode{}
 	if len(p) == 0 || p[0] == nil {