Skip to content

Commit a3c65de

Browse files
author
yudongcheng
committed
Tke_optimized kernel had been offline
1 parent 4920875 commit a3c65de

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

tencentcloud/extension_tke.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ const (
5656
TKE_CLUSTER_OS_TYPE_GENERAL = "GENERAL"
5757
)
5858

59-
var TKE_CLUSTER_OS_TYPES = []string{TKE_CLUSTER_OS_TYPE_DOCKER_CUSTOMIZE, TKE_CLUSTER_OS_TYPE_GENERAL}
59+
var TKE_CLUSTER_OS_TYPES = []string{ TKE_CLUSTER_OS_TYPE_GENERAL}
6060

6161
const (
6262
TkeInternetStatusCreating = "Creating"

tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -484,8 +484,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
484484
Default: TKE_CLUSTER_OS_TYPE_GENERAL,
485485
ValidateFunc: validateAllowedStringValue(TKE_CLUSTER_OS_TYPES),
486486
Description: "Image type of the cluster os, the available values include: '" + strings.Join(TKE_CLUSTER_OS_TYPES, "','") +
487-
"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL + "'. 'DOCKER_CUSTOMIZE' means 'TKE-Optimized'. " +
488-
"Only 'centos7.6x86_64' or 'ubuntu18.04.1 LTSx86_64' support 'DOCKER_CUSTOMIZE' now.",
487+
"'. Default is '" + TKE_CLUSTER_OS_TYPE_GENERAL,
489488
},
490489
"container_runtime": {
491490
Type: schema.TypeString,
@@ -589,7 +588,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
589588
Optional: true,
590589
Default: "",
591590
Description: "Cluster kube-proxy mode, the available values include: 'kube-proxy-bpf'. Default is not set." +
592-
"When set to kube-proxy-bpf, cluster version greater than 1.14 and with TKE-optimized kernel is required.",
591+
"When set to kube-proxy-bpf, cluster version greater than 1.14 and with Tencent Linux 2.4 is required.",
593592
},
594593
"vpc_id": {
595594
Type: schema.TypeString,

website/docs/r/kubernetes_cluster.html.markdown

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ The following arguments are supported:
220220
* `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.
221221
* `cluster_max_service_num` - (Optional, ForceNew) The maximum number of services in the cluster. Default is 256. Must be a multiple of 16.
222222
* `cluster_name` - (Optional) Name of the cluster.
223-
* `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.
223+
* `cluster_os_type` - (Optional, ForceNew) Image type of the cluster os, Default is 'GENERAL'.
224224
* `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'.
225225
* `cluster_version` - (Optional) Version of the cluster, Default is '1.10.5'.
226226
* `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:
230230
* `extra_args` - (Optional, ForceNew) Custom parameter information related to the node.
231231
* `ignore_cluster_cidr_conflict` - (Optional, ForceNew) Indicates whether to ignore the cluster cidr conflict error. Default is false.
232232
* `is_non_static_ip_mode` - (Optional, ForceNew) Indicates whether static ip mode is enabled. Default is false.
233-
* `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.
233+
* `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.
234234
* `labels` - (Optional, ForceNew) Labels of tke cluster nodes.
235235
* `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.
236236
* `master_config` - (Optional, ForceNew) Deploy the machine configuration information of the 'MASTER_ETCD' service, and create <=7 units for common users.

0 commit comments

Comments
 (0)