Skip to content

Commit 41487d5

Browse files
committed
1.add base64 support. 2.add update e2e
1 parent 17bb86d commit 41487d5

File tree

2 files changed

+51
-15
lines changed

2 files changed

+51
-15
lines changed

tencentcloud/services/tke/resource_tc_kubernetes_addon.go

Lines changed: 6 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tencentcloud/services/tke/resource_tc_kubernetes_addon_test.go

Lines changed: 45 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,25 @@ func TestAccTencentCloudKubernetesAddonResource_basic(t *testing.T) {
1414
tcacctest.AccPreCheck(t)
1515
},
1616
Providers: tcacctest.AccProviders,
17-
Steps: []resource.TestStep{{
18-
Config: testAccKubernetesAddon,
19-
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "id"),
20-
resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon.kubernetes_addon", "addon_name", "cos"),
21-
resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon.kubernetes_addon", "addon_version", "2018-05-25"),
22-
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "phase"),
23-
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "reason"),
24-
),
25-
},
17+
Steps: []resource.TestStep{
18+
{
19+
Config: testAccKubernetesAddon,
20+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "id"),
21+
resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon.kubernetes_addon", "addon_name", "cos"),
22+
resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon.kubernetes_addon", "addon_version", "2018-05-25"),
23+
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "phase"),
24+
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "reason"),
25+
),
26+
},
27+
{
28+
Config: testAccKubernetesAddonUpdate,
29+
Check: resource.ComposeTestCheckFunc(resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "id"),
30+
resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon.kubernetes_addon", "addon_name", "cos"),
31+
resource.TestCheckResourceAttr("tencentcloud_kubernetes_addon.kubernetes_addon", "addon_version", "2018-05-25"),
32+
resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "phase"),
33+
// resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_addon.kubernetes_addon", "reason"),
34+
),
35+
},
2636
{
2737
ResourceName: "tencentcloud_kubernetes_addon.kubernetes_addon",
2838
ImportState: true,
@@ -33,11 +43,34 @@ func TestAccTencentCloudKubernetesAddonResource_basic(t *testing.T) {
3343
}
3444

3545
const testAccKubernetesAddon = `
46+
// resource "tencentcloud_kubernetes_cluster" "example" {
47+
// vpc_id = "` + tcacctest.DefaultTmpVpcId + `"
48+
// cluster_cidr = "10.31.0.0/16"
49+
// cluster_max_pod_num = 32
50+
// cluster_name = "tf_example_cluster"
51+
// cluster_desc = "example for tke cluster"
52+
// cluster_max_service_num = 32
53+
// cluster_internet = false # (can be ignored) open it after the nodes added
54+
// cluster_version = "1.22.5"
55+
// cluster_deploy_type = "MANAGED_CLUSTER"
56+
// # without any worker config
57+
// }
58+
59+
resource "tencentcloud_kubernetes_addon" "kubernetes_addon" {
60+
# cluster_id = tencentcloud_kubernetes_cluster.example.id
61+
cluster_id = "cls-lv0y4v68"
62+
addon_name = "cos"
63+
addon_version = "2018-05-25"
64+
raw_values = "{}"
65+
}
66+
`
67+
68+
const testAccKubernetesAddonUpdate = `
3669
resource "tencentcloud_kubernetes_cluster" "example" {
3770
vpc_id = "` + tcacctest.DefaultTmpVpcId + `"
3871
cluster_cidr = "10.31.0.0/16"
3972
cluster_max_pod_num = 32
40-
cluster_name = "tf_example_cluster"
73+
cluster_name = "tf_example_cluster"
4174
cluster_desc = "example for tke cluster"
4275
cluster_max_service_num = 32
4376
cluster_internet = false # (can be ignored) open it after the nodes added
@@ -47,10 +80,9 @@ resource "tencentcloud_kubernetes_cluster" "example" {
4780
}
4881
4982
resource "tencentcloud_kubernetes_addon" "kubernetes_addon" {
50-
cluster_id = tencentcloud_kubernetes_cluster.example.id
51-
# cluster_id = "cls-lv0y4v68"
83+
cluster_id = tencentcloud_kubernetes_cluster.example.id
5284
addon_name = "cos"
5385
addon_version = "2018-05-25"
54-
raw_values = "e30="
86+
raw_values = "{\"tolerations\":[{\"key\":\"test\",\"value\":\"100\",\"operator\":\"Equal\"}]}"
5587
}
5688
`

0 commit comments

Comments
 (0)