Merge pull request #545 from gailwang/master

fix kubernetes bug

Author: oliverpei

CHANGELOG.md

@@ -1,4 +1,8 @@
 ## 1.46.4 (Unreleased)
+
+BUG FIXES:
+* Resource: `tencentcloud_kubernetes_cluster` fix force replacement when updating `docker_graph_path`.
+
 ## 1.46.3 (November 6, 2020)
 
 ENHANCEMENTS:

tencentcloud/extension_tke.go

@@ -6,6 +6,8 @@ const (
 	TKE_CLUSTER_OS_UBUNTU16 = "ubuntu16.04.1 LTSx86_64"
 	TKE_CLUSTER_OS_UBUNTU18 = "ubuntu18.04.1 LTSx86_64"
 	TKE_CLUSTER_OS_LINUX24  = "tlinux2.4x86_64"
+	TKE_CLUSTER_OS_LINUX22  = "tlinux2.2(tkernel3)x86_64"
+	TKE_CLUSTER_OS_LINUXF22 = "Tencent tlinux release 2.2 (Final)"
 )
 
 var TKE_CLUSTER_OS = []string{TKE_CLUSTER_OS_CENTOS72, TKE_CLUSTER_OS_CENTOS76, TKE_CLUSTER_OS_UBUNTU16, TKE_CLUSTER_OS_UBUNTU18, TKE_CLUSTER_OS_LINUX24}
@@ -15,6 +17,8 @@ var tkeClusterOsMap = map[string]string{TKE_CLUSTER_OS_CENTOS72: TKE_CLUSTER_OS_
 	TKE_CLUSTER_OS_UBUNTU16: TKE_CLUSTER_OS_UBUNTU16,
 	TKE_CLUSTER_OS_UBUNTU18: "ubuntu18.04.1x86_64",
 	TKE_CLUSTER_OS_LINUX24:  "tlinux2.4x86_64",
+	TKE_CLUSTER_OS_LINUX22:  TKE_CLUSTER_OS_LINUX22,
+	TKE_CLUSTER_OS_LINUXF22: TKE_CLUSTER_OS_LINUXF22,
 }
 
 func tkeToShowClusterOs(apiOs string) string {
@@ -23,7 +27,7 @@ func tkeToShowClusterOs(apiOs string) string {
 			return showName
 		}
 	}
-	return "unknown"
+	return apiOs
 }
 
 const (

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -826,10 +826,17 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Description: "Mount target. Default is not mounting.",
 		},
 		"docker_graph_path": {
-			Type:        schema.TypeString,
-			Optional:    true,
-			ForceNew:    true,
-			Default:     "/var/lib/docker",
+			Type:     schema.TypeString,
+			Optional: true,
+			ForceNew: true,
+			Default:  "/var/lib/docker",
+			DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
+				if new == "/var/lib/docker" && old == "" || old == "/var/lib/docker" && new == "" {
+					return true
+				} else {
+					return old == new
+				}
+			},
 			Description: "Docker graph path. Default is `/var/lib/docker`.",
 		},
 		"extra_args": {
@@ -1116,10 +1123,10 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
 
 	cluster_os := d.Get("cluster_os").(string)
 
-	if tkeClusterOsMap[cluster_os] == "" {
-		basic.ClusterOs = cluster_os
+	if v, ok := tkeClusterOsMap[cluster_os]; ok {
+		basic.ClusterOs = v
 	} else {
-		basic.ClusterOs = tkeClusterOsMap[cluster_os]
+		basic.ClusterOs = cluster_os
 	}
 	basic.ClusterOsType = d.Get("cluster_os_type").(string)