Skip to content

Commit 8c25ccb

Browse files
committed
update e2e and example
1 parent 279a61c commit 8c25ccb

File tree

3 files changed

+25
-20
lines changed

3 files changed

+25
-20
lines changed

tencentcloud/services/tke/resource_tc_kubernetes_log_config.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,14 @@ resource "tencentcloud_kubernetes_cluster" "example" {
3636
cluster_version = "1.22.5"
3737
cluster_os = "tlinux2.2(tkernel3)x86_64"
3838
cluster_deploy_type = "MANAGED_CLUSTER"
39+
log_agent {
40+
enabled = true
41+
}
3942
# without any worker config
4043
}
4144
4245
resource "tencentcloud_cls_logset" "logset" {
43-
logset_name = "example"
46+
logset_name = "tf-test-example"
4447
tags = {
4548
"createdBy" = "terraform"
4649
}
@@ -115,8 +118,6 @@ Create a ckafka log config
115118
```hcl
116119
locals {
117120
ckafka_topic = tencentcloud_ckafka_topic.example.topic_name
118-
kafka_ip = tencentcloud_ckafka_instance.example.vip
119-
kafka_port = tencentcloud_ckafka_instance.example.vport
120121
}
121122
122123
resource "tencentcloud_ckafka_instance" "example" {
@@ -175,7 +176,7 @@ resource "tencentcloud_kubernetes_log_config" "kubernetes_log_config_ckafka" {
175176
"type" : "container_stdout"
176177
},
177178
"kafkaDetail" : {
178-
"brokers" : "${local.kafka_ip}:${local.kafka_port}",
179+
"brokers" : "172.16.0.30:9092", # your ckafka brokers
179180
"extractRule" : {},
180181
"instanceId" : "",
181182
"kafkaType" : "SelfBuildKafka",

tencentcloud/services/tke/resource_tc_kubernetes_log_config_test.go

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ func TestAccTencentCloudKubernetesLogConfigResource_basic(t *testing.T) {
2626
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_cls", "log_config"),
2727
),
2828
},
29-
{
30-
Config: testAccKubernetesLogConfig_ckafka,
31-
Check: resource.ComposeTestCheckFunc(
32-
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "id"),
33-
resource.TestCheckResourceAttr("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "log_config_name", "tf-test-ckafka"),
34-
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "cluster_id"),
35-
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "logset_id"),
36-
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "log_config"),
37-
),
38-
},
29+
// {
30+
// Config: testAccKubernetesLogConfig_ckafka,
31+
// Check: resource.ComposeTestCheckFunc(
32+
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "id"),
33+
// resource.TestCheckResourceAttr("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "log_config_name", "tf-test-ckafka"),
34+
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "cluster_id"),
35+
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "logset_id"),
36+
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_log_config.kubernetes_log_config_ckafka", "log_config"),
37+
// ),
38+
// },
3939
},
4040
})
4141
}
@@ -73,14 +73,17 @@ resource "tencentcloud_kubernetes_cluster" "example" {
7373
cluster_version = "1.22.5"
7474
cluster_os = "tlinux2.2(tkernel3)x86_64"
7575
cluster_deploy_type = "MANAGED_CLUSTER"
76+
log_agent {
77+
enabled = true
78+
}
7679
# without any worker config
7780
}
7881
`
7982

8083
const testAccKubernetesLogConfig_cls = testAccKubernetesCluster + `
8184
8285
resource "tencentcloud_cls_logset" "logset" {
83-
logset_name = "example"
86+
logset_name = "tf-test-example"
8487
tags = {
8588
"createdBy" = "terraform"
8689
}
@@ -152,7 +155,7 @@ resource "tencentcloud_kubernetes_log_config" "kubernetes_log_config_cls" {
152155
}
153156
`
154157

155-
const testAccKubernetesLogConfig_ckafka = testAccKubernetesCluster + `
158+
const testAccKubernetesLogConfig_ckafka = `
156159
157160
locals {
158161
ckafka_topic = tencentcloud_ckafka_topic.example.topic_name

website/docs/r/kubernetes_log_config.html.markdown

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,14 @@ resource "tencentcloud_kubernetes_cluster" "example" {
4747
cluster_version = "1.22.5"
4848
cluster_os = "tlinux2.2(tkernel3)x86_64"
4949
cluster_deploy_type = "MANAGED_CLUSTER"
50+
log_agent {
51+
enabled = true
52+
}
5053
# without any worker config
5154
}
5255
5356
resource "tencentcloud_cls_logset" "logset" {
54-
logset_name = "example"
57+
logset_name = "tf-test-example"
5558
tags = {
5659
"createdBy" = "terraform"
5760
}
@@ -126,8 +129,6 @@ resource "tencentcloud_kubernetes_log_config" "kubernetes_log_config_cls" {
126129
```hcl
127130
locals {
128131
ckafka_topic = tencentcloud_ckafka_topic.example.topic_name
129-
kafka_ip = tencentcloud_ckafka_instance.example.vip
130-
kafka_port = tencentcloud_ckafka_instance.example.vport
131132
}
132133
133134
resource "tencentcloud_ckafka_instance" "example" {
@@ -186,7 +187,7 @@ resource "tencentcloud_kubernetes_log_config" "kubernetes_log_config_ckafka" {
186187
"type" : "container_stdout"
187188
},
188189
"kafkaDetail" : {
189-
"brokers" : "${local.kafka_ip}:${local.kafka_port}",
190+
"brokers" : "172.16.0.30:9092", # your ckafka brokers
190191
"extractRule" : {},
191192
"instanceId" : "",
192193
"kafkaType" : "SelfBuildKafka",

0 commit comments

Comments
 (0)