Merge pull request #197 from rawmind0/cloudprovider

Add external as allowed value on cloud_provider argument

Author: rawmind0

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 1.0.0-rc6 (Unreleased)
+## 1.0.0 (May 7, 2020)
 
 FEATURES:
 
@@ -10,6 +10,9 @@ ENHANCEMENTS:
   * `upgrade_strategy` on `rke_cluster` resource 
   * `ssh_key_path` on `bastion_host` argument 
   * `audit_log` on `services.kube_api` argument
+* Add `external` as allowed value on `cloud_provider` argument
+* Add `nodelocal` argument to `dns` argument on `rke_cluster` resource
+* Updated RKE to v1.1.1
 
 BUG FIXES:
 

GNUmakefile

@@ -86,7 +86,7 @@ test-compile:
 
 vendor:
 	@echo "==> Updating vendor modules..."
-	@GO111MODULE=${GO111MODULE} go mod vendor
+	@GO111MODULE=on go mod vendor
 
 website:
 ifeq (,$(wildcard $(GOPATH)/src/$(WEBSITE_REPO)))

go.mod

@@ -11,7 +11,7 @@ require (
 	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/rke v1.1.0
+	github.com/rancher/rke v1.1.1
 	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

go.sum

@@ -655,6 +655,8 @@ github.com/rancher/norman v0.0.0-20200312033725-5c74e1ee1e6d h1:XrZkPfanv6m1Ocnq
 github.com/rancher/norman v0.0.0-20200312033725-5c74e1ee1e6d/go.mod h1:b+483H276jRBXYosdWrNKFpxH+JYMs3UIdlV60dhdg0=
 github.com/rancher/rke v1.1.0 h1:A9FydBnODhdyIvSL3UbfE16WBLK/KmnUdrqQ2jBypq8=
 github.com/rancher/rke v1.1.0/go.mod h1:Fw4u45cKMFBTu81jAxN5wtZeMgS4862RxVixhRc5p3E=
+github.com/rancher/rke v1.1.1 h1:w7BJuY0pz1MA/WmkyzW0K1f6jevhW0k5AVcmHZLU/8Q=
+github.com/rancher/rke v1.1.1/go.mod h1:Fw4u45cKMFBTu81jAxN5wtZeMgS4862RxVixhRc5p3E=
 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/schema_rke_cluster_cloud_provider.go

@@ -6,14 +6,16 @@ import (
 )
 
 const (
-	rkeClusterCloudProviderCustomName = "custom"
+	rkeClusterCloudProviderCustomName   = "custom"
+	rkeClusterCloudProviderExternalName = "external"
 )
 
 var (
 	rkeClusterCloudProviderList = []string{
 		rkeClusterCloudProviderAwsName,
 		rkeClusterCloudProviderAzureName,
 		rkeClusterCloudProviderCustomName,
+		rkeClusterCloudProviderExternalName,
 		rkeClusterCloudProviderOpenstackName,
 		rkeClusterCloudProviderVsphereName,
 	}

rke/schema_rke_cluster_dns.go

@@ -21,13 +21,37 @@ var (
 
 //Schemas
 
+func rkeClusterDNSNodelocalFields() map[string]*schema.Schema {
+	s := map[string]*schema.Schema{
+		"ip_address": {
+			Type:     schema.TypeString,
+			Optional: true,
+		},
+		"node_selector": {
+			Type:        schema.TypeMap,
+			Optional:    true,
+			Description: "Node selector key pair",
+		},
+	}
+	return s
+}
+
 func rkeClusterDNSFields() map[string]*schema.Schema {
 	s := map[string]*schema.Schema{
 		"node_selector": {
 			Type:        schema.TypeMap,
 			Optional:    true,
 			Description: "NodeSelector key pair",
 		},
+		"nodelocal": {
+			Type:        schema.TypeList,
+			Optional:    true,
+			MaxItems:    1,
+			Description: "Nodelocal dns",
+			Elem: &schema.Resource{
+				Schema: rkeClusterDNSNodelocalFields(),
+			},
+		},
 		"provider": {
 			Type:         schema.TypeString,
 			Optional:     true,

rke/structure_rke_cluster_dns.go

@@ -6,12 +6,33 @@ import (
 
 // Flatteners
 
+func flattenRKEClusterDNSNodelocal(in *rancher.Nodelocal) []interface{} {
+	obj := make(map[string]interface{})
+	if in == nil {
+		return nil
+	}
+
+	if len(in.IPAddress) > 0 {
+		obj["ip_address"] = in.IPAddress
+	}
+
+	if len(in.NodeSelector) > 0 {
+		obj["node_selector"] = toMapInterface(in.NodeSelector)
+	}
+
+	return []interface{}{obj}
+}
+
 func flattenRKEClusterDNS(in *rancher.DNSConfig) []interface{} {
 	obj := make(map[string]interface{})
 	if in == nil {
 		return []interface{}{}
 	}
 
+	if in.Nodelocal != nil {
+		obj["nodelocal"] = flattenRKEClusterDNSNodelocal(in.Nodelocal)
+	}
+
 	if len(in.NodeSelector) > 0 {
 		obj["node_selector"] = toMapInterface(in.NodeSelector)
 	}
@@ -33,13 +54,35 @@ func flattenRKEClusterDNS(in *rancher.DNSConfig) []interface{} {
 
 // Expanders
 
+func expandRKEClusterDNSNodelocal(p []interface{}) *rancher.Nodelocal {
+	obj := &rancher.Nodelocal{}
+	if len(p) == 0 || p[0] == nil {
+		return nil
+	}
+	in := p[0].(map[string]interface{})
+
+	if v, ok := in["ip_address"].(string); ok && len(v) > 0 {
+		obj.IPAddress = v
+	}
+
+	if v, ok := in["node_selector"].(map[string]interface{}); ok && len(v) > 0 {
+		obj.NodeSelector = toMapString(v)
+	}
+
+	return obj
+}
+
 func expandRKEClusterDNS(p []interface{}) *rancher.DNSConfig {
 	obj := &rancher.DNSConfig{}
 	if len(p) == 0 || p[0] == nil {
 		return obj
 	}
 	in := p[0].(map[string]interface{})
 
+	if v, ok := in["nodelocal"].([]interface{}); ok && len(v) > 0 {
+		obj.Nodelocal = expandRKEClusterDNSNodelocal(v)
+	}
+
 	if v, ok := in["node_selector"].(map[string]interface{}); ok && len(v) > 0 {
 		obj.NodeSelector = toMapString(v)
 	}

rke/structure_rke_cluster_dns_test.go

@@ -8,12 +8,31 @@ import (
 )
 
 var (
-	testRKEClusterDNSConf      *rancher.DNSConfig
-	testRKEClusterDNSInterface []interface{}
+	testRKEClusterDNSNodelocalConf      *rancher.Nodelocal
+	testRKEClusterDNSNodelocalInterface []interface{}
+	testRKEClusterDNSConf               *rancher.DNSConfig
+	testRKEClusterDNSInterface          []interface{}
 )
 
 func init() {
+	testRKEClusterDNSNodelocalConf = &rancher.Nodelocal{
+		NodeSelector: map[string]string{
+			"sel1": "value1",
+			"sel2": "value2",
+		},
+		IPAddress: "ip_address",
+	}
+	testRKEClusterDNSNodelocalInterface = []interface{}{
+		map[string]interface{}{
+			"node_selector": map[string]interface{}{
+				"sel1": "value1",
+				"sel2": "value2",
+			},
+			"ip_address": "ip_address",
+		},
+	}
 	testRKEClusterDNSConf = &rancher.DNSConfig{
+		Nodelocal: testRKEClusterDNSNodelocalConf,
 		NodeSelector: map[string]string{
 			"sel1": "value1",
 			"sel2": "value2",
@@ -24,6 +43,7 @@ func init() {
 	}
 	testRKEClusterDNSInterface = []interface{}{
 		map[string]interface{}{
+			"nodelocal": testRKEClusterDNSNodelocalInterface,
 			"node_selector": map[string]interface{}{
 				"sel1": "value1",
 				"sel2": "value2",
@@ -35,6 +55,27 @@ func init() {
 	}
 }
 
+func TestFlattenRKEClusterDNSNodelocal(t *testing.T) {
+
+	cases := []struct {
+		Input          *rancher.Nodelocal
+		ExpectedOutput []interface{}
+	}{
+		{
+			testRKEClusterDNSNodelocalConf,
+			testRKEClusterDNSNodelocalInterface,
+		},
+	}
+
+	for _, tc := range cases {
+		output := flattenRKEClusterDNSNodelocal(tc.Input)
+		if !reflect.DeepEqual(output, tc.ExpectedOutput) {
+			t.Fatalf("Unexpected output from flattener.\nExpected: %#v\nGiven:    %#v",
+				tc.ExpectedOutput, output)
+		}
+	}
+}
+
 func TestFlattenRKEClusterDNS(t *testing.T) {
 
 	cases := []struct {
@@ -56,6 +97,27 @@ func TestFlattenRKEClusterDNS(t *testing.T) {
 	}
 }
 
+func TestExpandRKEClusterDNSNodelocal(t *testing.T) {
+
+	cases := []struct {
+		Input          []interface{}
+		ExpectedOutput *rancher.Nodelocal
+	}{
+		{
+			testRKEClusterDNSNodelocalInterface,
+			testRKEClusterDNSNodelocalConf,
+		},
+	}
+
+	for _, tc := range cases {
+		output := expandRKEClusterDNSNodelocal(tc.Input)
+		if !reflect.DeepEqual(output, tc.ExpectedOutput) {
+			t.Fatalf("Unexpected output from expander.\nExpected: %#v\nGiven:    %#v",
+				tc.ExpectedOutput, output)
+		}
+	}
+}
+
 func TestExpandRKEClusterDNS(t *testing.T) {
 
 	cases := []struct {