Skip to content

Commit e999378

Browse files
authored
fix(tke): [122390667] tencentcloud_kubernetes_cluster_endpoint optimize code logic and documentation (#3207)
* add * add
1 parent fd22afd commit e999378

File tree

4 files changed

+58
-43
lines changed

4 files changed

+58
-43
lines changed

.changelog/3207.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_endpoint: optimize code logic and documentation
3+
```

tencentcloud/services/tke/resource_tc_kubernetes_cluster_endpoint.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@ func ResourceTencentCloudTkeClusterEndpoint() *schema.Resource {
2121
Create: resourceTencentCloudTkeClusterEndpointCreate,
2222
Update: resourceTencentCloudTkeClusterEndpointUpdate,
2323
Delete: resourceTencentCloudTkeClusterEndpointDelete,
24-
Importer: &schema.ResourceImporter{
25-
State: schema.ImportStatePassthrough,
26-
},
2724
Schema: map[string]*schema.Schema{
2825
"cluster_id": {
2926
Type: schema.TypeString,
@@ -378,6 +375,11 @@ func resourceTencentCloudTkeClusterEndpointDelete(d *schema.ResourceData, meta i
378375
err = tencentCloudClusterIntranetSwitch(ctx, &service, id, "", false, "")
379376
if err != nil {
380377
errs = *multierror.Append(err)
378+
} else {
379+
taskErr := waitForClusterEndpointFinish(ctx, &service, id, false, false)
380+
if taskErr != nil {
381+
errs = *multierror.Append(taskErr)
382+
}
381383
}
382384
}
383385

tencentcloud/services/tke/resource_tc_kubernetes_cluster_endpoint.md

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,34 @@
1-
Provide a resource to create a KubernetesClusterEndpoint. This resource allows you to create an empty cluster first without any workers. Only all attached node depends create complete, cluster endpoint will finally be enabled.
1+
Provide a resource to create a kubernetes cluster endpoint. This resource allows you to create an empty cluster first without any workers. Only all attached node depends create complete, cluster endpoint will finally be enabled.
22

33
~> **NOTE:** Recommend using `depends_on` to make sure endpoint create after node pools or workers does.
44

55
Example Usage
66

7-
```hcl
8-
resource "tencentcloud_kubernetes_node_pool" "pool1" {}
7+
Open intranet access for kubernetes cluster
98

10-
resource "tencentcloud_kubernetes_cluster_endpoint" "foo" {
11-
cluster_id = "cls-xxxxxxxx"
12-
cluster_internet = true
13-
cluster_intranet = true
14-
# managed_cluster_internet_security_policies = [
15-
"192.168.0.0/24"
16-
]
17-
cluster_intranet_subnet_id = "subnet-xxxxxxxx"
18-
depends_on = [
19-
tencentcloud_kubernetes_node_pool.pool1
20-
]
9+
```hcl
10+
resource "tencentcloud_kubernetes_cluster_endpoint" "example" {
11+
cluster_id = "cls-fdy7hm1q"
12+
cluster_intranet = true
13+
cluster_intranet_subnet_id = "subnet-7nl0sswi"
14+
cluster_intranet_domain = "intranet_demo.com"
2115
}
2216
```
2317

24-
Import
18+
Open internet access for kubernetes cluster
2519

26-
KubernetesClusterEndpoint instance can be imported by passing cluster id, e.g.
20+
```hcl
21+
resource "tencentcloud_kubernetes_cluster_endpoint" "example" {
22+
cluster_id = "cls-fdy7hm1q"
23+
cluster_internet = true
24+
cluster_internet_security_group = "sg-e6a8xxib"
25+
cluster_internet_domain = "internet_demo.com"
26+
extensive_parameters = jsonencode({
27+
"AddressIPVersion" : "IPV4",
28+
"InternetAccessible" : {
29+
"InternetChargeType" : "TRAFFIC_POSTPAID_BY_HOUR",
30+
"InternetMaxBandwidthOut" : 10
31+
}
32+
})
33+
}
2734
```
28-
$ terraform import tencentcloud_kubernetes_cluster_endpoint.test cluster-id
29-
```

website/docs/r/kubernetes_cluster_endpoint.html.markdown

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,43 @@ layout: "tencentcloud"
44
page_title: "TencentCloud: tencentcloud_kubernetes_cluster_endpoint"
55
sidebar_current: "docs-tencentcloud-resource-kubernetes_cluster_endpoint"
66
description: |-
7-
Provide a resource to create a KubernetesClusterEndpoint. This resource allows you to create an empty cluster first without any workers. Only all attached node depends create complete, cluster endpoint will finally be enabled.
7+
Provide a resource to create a kubernetes cluster endpoint. This resource allows you to create an empty cluster first without any workers. Only all attached node depends create complete, cluster endpoint will finally be enabled.
88
---
99

1010
# tencentcloud_kubernetes_cluster_endpoint
1111

12-
Provide a resource to create a KubernetesClusterEndpoint. This resource allows you to create an empty cluster first without any workers. Only all attached node depends create complete, cluster endpoint will finally be enabled.
12+
Provide a resource to create a kubernetes cluster endpoint. This resource allows you to create an empty cluster first without any workers. Only all attached node depends create complete, cluster endpoint will finally be enabled.
1313

1414
~> **NOTE:** Recommend using `depends_on` to make sure endpoint create after node pools or workers does.
1515

1616
## Example Usage
1717

18+
### Open intranet access for kubernetes cluster
19+
20+
```hcl
21+
resource "tencentcloud_kubernetes_cluster_endpoint" "example" {
22+
cluster_id = "cls-fdy7hm1q"
23+
cluster_intranet = true
24+
cluster_intranet_subnet_id = "subnet-7nl0sswi"
25+
cluster_intranet_domain = "intranet_demo.com"
26+
}
27+
```
28+
29+
### Open internet access for kubernetes cluster
30+
1831
```hcl
19-
resource "tencentcloud_kubernetes_node_pool" "pool1" {}
20-
21-
resource "tencentcloud_kubernetes_cluster_endpoint" "foo" {
22-
cluster_id = "cls-xxxxxxxx"
23-
cluster_internet = true
24-
cluster_intranet = true
25-
# managed_cluster_internet_security_policies = [
26-
"192.168.0.0/24"
27-
]
28-
cluster_intranet_subnet_id = "subnet-xxxxxxxx"
29-
depends_on = [
30-
tencentcloud_kubernetes_node_pool.pool1
31-
]
32+
resource "tencentcloud_kubernetes_cluster_endpoint" "example" {
33+
cluster_id = "cls-fdy7hm1q"
34+
cluster_internet = true
35+
cluster_internet_security_group = "sg-e6a8xxib"
36+
cluster_internet_domain = "internet_demo.com"
37+
extensive_parameters = jsonencode({
38+
"AddressIPVersion" : "IPV4",
39+
"InternetAccessible" : {
40+
"InternetChargeType" : "TRAFFIC_POSTPAID_BY_HOUR",
41+
"InternetMaxBandwidthOut" : 10
42+
}
43+
})
3244
}
3345
```
3446

@@ -60,10 +72,3 @@ In addition to all arguments above, the following attributes are exported:
6072
* `user_name` - User name of account.
6173

6274

63-
## Import
64-
65-
KubernetesClusterEndpoint instance can be imported by passing cluster id, e.g.
66-
```
67-
$ terraform import tencentcloud_kubernetes_cluster_endpoint.test cluster-id
68-
```
69-

0 commit comments

Comments
 (0)