Skip to content

Commit 1ff7724

Browse files
xaweixawei
authored
misc: update tke cluster resource doc detail (#1560)
1 parent 8179e2d commit 1ff7724

File tree

3 files changed

+37
-18
lines changed

3 files changed

+37
-18
lines changed

‎.changelog/1560.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_cluster: update tke cluster resource doc detail
3+
```

‎tencentcloud/resource_tc_kubernetes_cluster.go‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
6464
enhanced_security_service = false
6565
enhanced_monitor_service = false
6666
user_data = "dGVzdA=="
67-
password = "ZZXXccvv1212"
67+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
68+
keys_id = "skey-11112222"
6869
}
6970
7071
worker_config {
@@ -86,7 +87,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
8687
enhanced_security_service = false
8788
enhanced_monitor_service = false
8889
user_data = "dGVzdA=="
89-
password = "ZZXXccvv1212"
90+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
91+
keys_id = "skey-11112222"
9092
cam_role_name = "CVM_QcsRole"
9193
}
9294
@@ -156,7 +158,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
156158
enhanced_security_service = false
157159
enhanced_monitor_service = false
158160
user_data = "dGVzdA=="
159-
password = "ZZXXccvv1212"
161+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
162+
keys_id = "skey-11112222"
160163
}
161164
162165
worker_config {
@@ -178,8 +181,9 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
178181
enhanced_security_service = false
179182
enhanced_monitor_service = false
180183
user_data = "dGVzdA=="
181-
password = "ZZXXccvv1212"
184+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
182185
cam_role_name = "CVM_QcsRole"
186+
keys_id = "skey-11112222"
183187
}
184188
185189
labels = {
@@ -247,7 +251,8 @@ resource "tencentcloud_kubernetes_cluster" "cluster_with_addon" {
247251
enhanced_security_service = false
248252
enhanced_monitor_service = false
249253
user_data = "dGVzdA=="
250-
password = "ZZXXccvv1212"
254+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
255+
keys_id = "skey-11112222"
251256
}
252257
253258
extension_addon {
@@ -329,7 +334,8 @@ resource "tencentcloud_kubernetes_cluster" "test_node_pool_global_config" {
329334
enhanced_security_service = false
330335
enhanced_monitor_service = false
331336
user_data = "dGVzdA=="
332-
password = "ZZXXccvv1212"
337+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
338+
keys_id = "skey-11112222"
333339
}
334340
335341
node_pool_global_config {
@@ -397,7 +403,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
397403
enhanced_security_service = false
398404
enhanced_monitor_service = false
399405
user_data = "dGVzdA=="
400-
password = "ZZXXccvv1212"
406+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
407+
keys_id = "skey-11112222"
401408
}
402409
403410
labels = {
@@ -910,7 +917,9 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
910917
Optional: true,
911918
Default: TKE_RUNTIME_DOCKER,
912919
ValidateFunc: validateAllowedStringValue(TKE_RUNTIMES),
913-
Description: "Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.",
920+
Description: "Runtime type of the cluster, the available values include: 'docker' and 'containerd'." +
921+
"The Kubernetes v1.24 has removed dockershim, so please use containerd in v1.24 or higher." +
922+
"Default is 'docker'.",
914923
},
915924
"cluster_deploy_type": {
916925
Type: schema.TypeString,

‎website/docs/r/kubernetes_cluster.html.markdown‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
7474
enhanced_security_service = false
7575
enhanced_monitor_service = false
7676
user_data = "dGVzdA=="
77-
password = "ZZXXccvv1212"
77+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
78+
keys_id = "skey-11112222"
7879
}
7980
8081
worker_config {
@@ -96,8 +97,9 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
9697
enhanced_security_service = false
9798
enhanced_monitor_service = false
9899
user_data = "dGVzdA=="
99-
password = "ZZXXccvv1212"
100-
cam_role_name = "CVM_QcsRole"
100+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
101+
keys_id = "skey-11112222"
102+
cam_role_name = "CVM_QcsRole"
101103
}
102104
103105
labels = {
@@ -166,7 +168,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
166168
enhanced_security_service = false
167169
enhanced_monitor_service = false
168170
user_data = "dGVzdA=="
169-
password = "ZZXXccvv1212"
171+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
172+
keys_id = "skey-11112222"
170173
}
171174
172175
worker_config {
@@ -188,8 +191,9 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
188191
enhanced_security_service = false
189192
enhanced_monitor_service = false
190193
user_data = "dGVzdA=="
191-
password = "ZZXXccvv1212"
192-
cam_role_name = "CVM_QcsRole"
194+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
195+
cam_role_name = "CVM_QcsRole"
196+
keys_id = "skey-11112222"
193197
}
194198
195199
labels = {
@@ -257,7 +261,8 @@ resource "tencentcloud_kubernetes_cluster" "cluster_with_addon" {
257261
enhanced_security_service = false
258262
enhanced_monitor_service = false
259263
user_data = "dGVzdA=="
260-
password = "ZZXXccvv1212"
264+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
265+
keys_id = "skey-11112222"
261266
}
262267
263268
extension_addon {
@@ -339,7 +344,8 @@ resource "tencentcloud_kubernetes_cluster" "test_node_pool_global_config" {
339344
enhanced_security_service = false
340345
enhanced_monitor_service = false
341346
user_data = "dGVzdA=="
342-
password = "ZZXXccvv1212"
347+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
348+
keys_id = "skey-11112222"
343349
}
344350
345351
node_pool_global_config {
@@ -408,7 +414,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
408414
enhanced_security_service = false
409415
enhanced_monitor_service = false
410416
user_data = "dGVzdA=="
411-
password = "ZZXXccvv1212"
417+
# password = "ZZXXccvv1212" // Optional, should be set if key_ids not set.
418+
keys_id = "skey-11112222"
412419
}
413420
414421
labels = {
@@ -473,7 +480,7 @@ The following arguments are supported:
473480
* `cluster_os_type` - (Optional, String, ForceNew) Image type of the cluster os, the available values include: 'GENERAL'. Default is 'GENERAL'.
474481
* `cluster_os` - (Optional, String, ForceNew) Operating system of the cluster, the available values include: 'centos7.6.0_x64','ubuntu18.04.1x86_64','tlinux2.4x86_64'. Default is 'tlinux2.4x86_64'.
475482
* `cluster_version` - (Optional, String) Version of the cluster, Default is '1.10.5'.
476-
* `container_runtime` - (Optional, String, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'. Default is 'docker'.
483+
* `container_runtime` - (Optional, String, ForceNew) Runtime type of the cluster, the available values include: 'docker' and 'containerd'.The Kubernetes v1.24 has removed dockershim, so please use containerd in v1.24 or higher.Default is 'docker'.
477484
* `deletion_protection` - (Optional, Bool) Indicates whether cluster deletion protection is enabled. Default is false.
478485
* `docker_graph_path` - (Optional, String, ForceNew) Docker graph path. Default is `/var/lib/docker`.
479486
* `enable_customized_pod_cidr` - (Optional, Bool) Whether to enable the custom mode of node podCIDR size. Default is false.

0 commit comments

Comments
 (0)