Skip to content

Commit 11f4b1e

Browse files
authored
fix(tke): [126079732] tencentcloud_kubernetes_native_node_pool optmize code logic for update function (#3453)
* add * add
1 parent 25ad40f commit 11f4b1e

File tree

4 files changed

+67
-49
lines changed

4 files changed

+67
-49
lines changed

.changelog/3453.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_native_node_pool: optmize code logic for update function
3+
```

tencentcloud/services/tke/resource_tc_kubernetes_native_node_pool.go

Lines changed: 17 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
1-
Provides a resource to create a tke kubernetes_native_node_pool
1+
Provides a resource to create a TKE kubernetes native node pool
22

33
Example Usage
44

55
```hcl
6-
resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool" {
6+
resource "tencentcloud_kubernetes_native_node_pool" "example" {
77
cluster_id = "cls-eyier120"
8-
name = "native-node-pool"
8+
name = "tf-example"
99
type = "Native"
1010
1111
labels {
12-
name = "test11"
13-
value = "test21"
14-
}
15-
16-
taints {
17-
key = "product"
18-
value = "coderider"
19-
effect = "NoExecute"
12+
name = "labelName"
13+
value = "labelValue"
2014
}
2115
2216
tags {
@@ -25,6 +19,7 @@ resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool
2519
key = "keep-test-np1"
2620
value = "test1"
2721
}
22+
2823
tags {
2924
key = "keep-test-np3"
3025
value = "test3"
@@ -40,51 +35,59 @@ resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool
4035
max_replicas = 10
4136
create_policy = "ZoneEquality"
4237
}
43-
subnet_ids = ["subnet-itb6d123"]
44-
instance_charge_type = "PREPAID"
38+
39+
subnet_ids = ["subnet-itb6d123"]
4540
system_disk {
46-
disk_type = "CLOUD_SSD"
41+
disk_type = "CLOUD_PREMIUM"
4742
disk_size = 50
4843
}
49-
instance_types = ["SA2.MEDIUM2"]
50-
security_group_ids = ["sg-7tum9120"]
51-
auto_repair = false
44+
45+
instance_types = ["SA2.MEDIUM2"]
46+
security_group_ids = ["sg-7tum9120"]
47+
auto_repair = false
48+
instance_charge_type = "PREPAID"
5249
instance_charge_prepaid {
5350
period = 1
5451
renew_flag = "NOTIFY_AND_MANUAL_RENEW"
5552
}
53+
5654
management {
5755
nameservers = ["183.60.83.19", "183.60.82.98"]
5856
hosts = ["192.168.2.42 static.fake.com", "192.168.2.42 static.fake.com2"]
5957
kernel_args = ["kernel.pid_max=65535", "fs.file-max=400000"]
6058
}
59+
6160
host_name_pattern = "aaa{R:3}"
6261
kubelet_args = ["allowed-unsafe-sysctls=net.core.somaxconn", "root-dir=/var/lib/test"]
6362
lifecycle {
6463
pre_init = "ZWNobyBoZWxsb3dvcmxk"
6564
post_init = "ZWNobyBoZWxsb3dvcmxk"
6665
}
66+
6767
runtime_root_dir = "/var/lib/docker"
6868
enable_autoscaling = true
6969
replicas = 2
7070
internet_accessible {
7171
max_bandwidth_out = 50
7272
charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
7373
}
74+
7475
data_disks {
7576
disk_type = "CLOUD_PREMIUM"
7677
file_system = "ext4"
77-
disk_size = 60
78+
disk_size = 100
7879
mount_target = "/var/lib/containerd"
7980
auto_format_and_mount = true
8081
}
82+
8183
key_ids = ["skey-9pcs2100"]
8284
}
8385
8486
annotations {
8587
name = "node.tke.cloud.tencent.com/test-anno"
8688
value = "test"
8789
}
90+
8891
annotations {
8992
name = "node.tke.cloud.tencent.com/test-label"
9093
value = "test"
@@ -94,8 +97,8 @@ resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool
9497

9598
Import
9699

97-
tke kubernetes_native_node_pool can be imported using the id, e.g.
100+
TKE kubernetes native node pool can be imported using the id, e.g.
98101

99102
```
100-
terraform import tencentcloud_kubernetes_native_node_pool.kubernetes_native_node_pool cls-xxx#np-xxx
103+
terraform import tencentcloud_kubernetes_native_node_pool.kubernetes_native_node_pool cls-eyier120#np-4h43fuxj
101104
```

website/docs/r/kubernetes_native_node_pool.html.markdown

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,24 @@ layout: "tencentcloud"
44
page_title: "TencentCloud: tencentcloud_kubernetes_native_node_pool"
55
sidebar_current: "docs-tencentcloud-resource-kubernetes_native_node_pool"
66
description: |-
7-
Provides a resource to create a tke kubernetes_native_node_pool
7+
Provides a resource to create a TKE kubernetes native node pool
88
---
99

1010
# tencentcloud_kubernetes_native_node_pool
1111

12-
Provides a resource to create a tke kubernetes_native_node_pool
12+
Provides a resource to create a TKE kubernetes native node pool
1313

1414
## Example Usage
1515

1616
```hcl
17-
resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool" {
17+
resource "tencentcloud_kubernetes_native_node_pool" "example" {
1818
cluster_id = "cls-eyier120"
19-
name = "native-node-pool"
19+
name = "tf-example"
2020
type = "Native"
2121
2222
labels {
23-
name = "test11"
24-
value = "test21"
25-
}
26-
27-
taints {
28-
key = "product"
29-
value = "coderider"
30-
effect = "NoExecute"
23+
name = "labelName"
24+
value = "labelValue"
3125
}
3226
3327
tags {
@@ -36,6 +30,7 @@ resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool
3630
key = "keep-test-np1"
3731
value = "test1"
3832
}
33+
3934
tags {
4035
key = "keep-test-np3"
4136
value = "test3"
@@ -51,51 +46,59 @@ resource "tencentcloud_kubernetes_native_node_pool" "kubernetes_native_node_pool
5146
max_replicas = 10
5247
create_policy = "ZoneEquality"
5348
}
54-
subnet_ids = ["subnet-itb6d123"]
55-
instance_charge_type = "PREPAID"
49+
50+
subnet_ids = ["subnet-itb6d123"]
5651
system_disk {
57-
disk_type = "CLOUD_SSD"
52+
disk_type = "CLOUD_PREMIUM"
5853
disk_size = 50
5954
}
60-
instance_types = ["SA2.MEDIUM2"]
61-
security_group_ids = ["sg-7tum9120"]
62-
auto_repair = false
55+
56+
instance_types = ["SA2.MEDIUM2"]
57+
security_group_ids = ["sg-7tum9120"]
58+
auto_repair = false
59+
instance_charge_type = "PREPAID"
6360
instance_charge_prepaid {
6461
period = 1
6562
renew_flag = "NOTIFY_AND_MANUAL_RENEW"
6663
}
64+
6765
management {
6866
nameservers = ["183.60.83.19", "183.60.82.98"]
6967
hosts = ["192.168.2.42 static.fake.com", "192.168.2.42 static.fake.com2"]
7068
kernel_args = ["kernel.pid_max=65535", "fs.file-max=400000"]
7169
}
70+
7271
host_name_pattern = "aaa{R:3}"
7372
kubelet_args = ["allowed-unsafe-sysctls=net.core.somaxconn", "root-dir=/var/lib/test"]
7473
lifecycle {
7574
pre_init = "ZWNobyBoZWxsb3dvcmxk"
7675
post_init = "ZWNobyBoZWxsb3dvcmxk"
7776
}
77+
7878
runtime_root_dir = "/var/lib/docker"
7979
enable_autoscaling = true
8080
replicas = 2
8181
internet_accessible {
8282
max_bandwidth_out = 50
8383
charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
8484
}
85+
8586
data_disks {
8687
disk_type = "CLOUD_PREMIUM"
8788
file_system = "ext4"
88-
disk_size = 60
89+
disk_size = 100
8990
mount_target = "/var/lib/containerd"
9091
auto_format_and_mount = true
9192
}
93+
9294
key_ids = ["skey-9pcs2100"]
9395
}
9496
9597
annotations {
9698
name = "node.tke.cloud.tencent.com/test-anno"
9799
value = "test"
98100
}
101+
99102
annotations {
100103
name = "node.tke.cloud.tencent.com/test-label"
101104
value = "test"
@@ -227,9 +230,9 @@ In addition to all arguments above, the following attributes are exported:
227230

228231
## Import
229232

230-
tke kubernetes_native_node_pool can be imported using the id, e.g.
233+
TKE kubernetes native node pool can be imported using the id, e.g.
231234

232235
```
233-
terraform import tencentcloud_kubernetes_native_node_pool.kubernetes_native_node_pool cls-xxx#np-xxx
236+
terraform import tencentcloud_kubernetes_native_node_pool.kubernetes_native_node_pool cls-eyier120#np-4h43fuxj
234237
```
235238

0 commit comments

Comments
 (0)