Merge pull request #589 from Chengyudong/dev/remove-TKE-Optimized

Tke_optimized kernel had been offline

Author: gailwang

tencentcloud/extension_tke.go

@@ -56,7 +56,7 @@ const (
 	TKE_CLUSTER_OS_TYPE_GENERAL          = "GENERAL"
 )
 
-var TKE_CLUSTER_OS_TYPES = []string{TKE_CLUSTER_OS_TYPE_DOCKER_CUSTOMIZE, TKE_CLUSTER_OS_TYPE_GENERAL}
+var TKE_CLUSTER_OS_TYPES = []string{ TKE_CLUSTER_OS_TYPE_GENERAL}
 
 const (
 	TkeInternetStatusCreating      = "Creating"

tencentcloud/resource_tc_kubernetes_cluster.go

@@ -498,8 +498,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Default:      TKE_CLUSTER_OS_TYPE_GENERAL,
 			ValidateFunc: validateAllowedStringValue(TKE_CLUSTER_OS_TYPES),
 			Description: "Image type of the cluster os, the available values include: '" + strings.Join(TKE_CLUSTER_OS_TYPES, "','") +
-				"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL + "'. 'DOCKER_CUSTOMIZE' means 'TKE-Optimized'. " +
-				"Only 'centos7.6x86_64' or 'ubuntu18.04.1 LTSx86_64' support 'DOCKER_CUSTOMIZE' now.",
+				"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL,
 		},
 		"container_runtime": {
 			Type:         schema.TypeString,
@@ -603,7 +602,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
 			Optional: true,
 			Default:  "",
 			Description: "Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set." +
-				"When set to kube-proxy-bpf, cluster version greater than 1.14 and with TKE-optimized kernel is required.",
+				"When set to kube-proxy-bpf, cluster version greater than 1.14 and with Tencent Linux 2.4 is required.",
 		},
 		"vpc_id": {
 			Type:         schema.TypeString,

website/docs/r/kubernetes_cluster.html.markdown

@@ -220,7 +220,7 @@ The following arguments are supported:
 * `cluster_max_pod_num` - (Optional, ForceNew) The maximum number of Pods per node in the cluster. Default is 256. Must be a multiple of 16 and large than 32.
 * `cluster_max_service_num` - (Optional, ForceNew) The maximum number of services in the cluster. Default is 256. Must be a multiple of 16.
 * `cluster_name` - (Optional) Name of the cluster.
-* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os, the available values include: 'DOCKER_CUSTOMIZE','GENERAL'. Default is 'GENERAL'. 'DOCKER_CUSTOMIZE' means 'TKE-Optimized'. Only 'centos7.6x86_64' or 'ubuntu18.04.1 LTSx86_64' support 'DOCKER_CUSTOMIZE' now.
+* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os,  Default is 'GENERAL'.
 * `cluster_os` - (Optional, ForceNew) Operating system of the cluster, the available values include: 'centos7.2x86_64','centos7.6x86_64','ubuntu16.04.1 LTSx86_64','ubuntu18.04.1 LTSx86_64','tlinux2.4x86_64'. Default is 'ubuntu16.04.1 LTSx86_64'.
 * `cluster_version` - (Optional) Version of the cluster, Default is '1.10.5'.
 * `container_runtime` - (Optional, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.
@@ -230,7 +230,7 @@ The following arguments are supported:
 * `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
 * `ignore_cluster_cidr_conflict` - (Optional, ForceNew) Indicates whether to ignore the cluster cidr conflict error. Default is false.
 * `is_non_static_ip_mode` - (Optional, ForceNew) Indicates whether static ip mode is enabled. Default is false.
-* `kube_proxy_mode` - (Optional) Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set.When set to kube-proxy-bpf, cluster version greater than 1.14 and with TKE-optimized kernel is required.
+* `kube_proxy_mode` - (Optional) Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set.When set to kube-proxy-bpf, cluster version greater than 1.14 and with Tencent Linux 2.4 is required.
 * `labels` - (Optional, ForceNew) Labels of tke cluster nodes.
 * `managed_cluster_internet_security_policies` - (Optional) Security policies for managed cluster internet, like:'192.168.1.0/24' or '113.116.51.27', '0.0.0.0/0' means all. This field can only set when field `cluster_deploy_type` is 'MANAGED_CLUSTER' and `cluster_internet` is true. `managed_cluster_internet_security_policies` can not delete or empty once be set.
 * `master_config` - (Optional, ForceNew) Deploy the machine configuration information of the 'MASTER_ETCD' service, and create <=7 units for common users.