Merge pull request #544 from gailwang/master

Add more tlinux values with TKE cluster

Author: oliverpei

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 1.46.3 (Unreleased)
+
+ENHANCEMENTS:
+* Resource: `tencentcloud_kubernetes_cluster` add more values with argument `cluster_os` to support linux OS system.
+
 ## 1.46.2 (November 5, 2020)
 
 ENHANCEMENTS:

tencentcloud/resource_tc_clb_redirection.go

@@ -188,6 +188,7 @@ func resourceTencentCloudClbRedirectionCreate(d *schema.ResourceData, meta inter
 		}
 		instance := instances[0]
 		domain := instance.Domain
+		url := instance.Url
 		request.Domains = []*string{domain}
 		//check source listener is null
 		if sourceListenerId != "" || sourceLocId != "" {
@@ -238,6 +239,7 @@ func resourceTencentCloudClbRedirectionCreate(d *schema.ResourceData, meta inter
 		rparams := make(map[string]string)
 		rparams["clb_id"] = clbId
 		rparams["domain"] = *domain
+		rparams["url"] = *url
 		rparams["listener_id"] = sourceListenerId
 		var rules []*clb.RuleOutput
 		err = resource.Retry(readRetryTimeout, func() *resource.RetryError {

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -1116,7 +1116,11 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 
 	cluster_os := d.Get("cluster_os").(string)
 
-	basic.ClusterOs = tkeClusterOsMap[cluster_os]
+	if tkeClusterOsMap[cluster_os] == "" {
+		basic.ClusterOs = cluster_os
+	} else {
+		basic.ClusterOs = tkeClusterOsMap[cluster_os]
+	}
 	basic.ClusterOsType = d.Get("cluster_os_type").(string)
 
 	if basic.ClusterOsType == TKE_CLUSTER_OS_TYPE_DOCKER_CUSTOMIZE {