From e72e871ef73e82d7c84b2bc2cfc41491c6701476 Mon Sep 17 00:00:00 2001 From: Kagashino Date: Thu, 7 Apr 2022 15:46:07 +0800 Subject: [PATCH] fix: tke - testcases --- .../data_source_tc_kubernetes_clusters.go | 6 ++++++ .../resource_tc_container_cluster_instance.go | 2 +- ...ource_tc_container_cluster_instance_test.go | 3 ++- ...urce_tc_kubernetes_addon_attachment_test.go | 1 + ...urce_tc_kubernetes_as_scaling_group_test.go | 1 + ...ource_tc_kubernetes_auth_attachment_test.go | 18 ++++++------------ ...ce_tc_kubernetes_cluster_attachment_test.go | 9 ++------- .../resource_tc_kubernetes_node_pool_test.go | 2 +- ...resource_tc_kubernetes_scale_worker_test.go | 2 +- .../docs/d/kubernetes_clusters.html.markdown | 1 + .../r/container_cluster_instance.html.markdown | 2 +- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/tencentcloud/data_source_tc_kubernetes_clusters.go b/tencentcloud/data_source_tc_kubernetes_clusters.go index e224f34fab..2868736125 100644 --- a/tencentcloud/data_source_tc_kubernetes_clusters.go +++ b/tencentcloud/data_source_tc_kubernetes_clusters.go @@ -26,6 +26,11 @@ import ( func tkeClusterInfo() map[string]*schema.Schema { schemaBody := map[string]*schema.Schema{ + "cluster_id": { + Type: schema.TypeString, + Computed: true, + Description: "ID of cluster.", + }, "cluster_name": { Type: schema.TypeString, Computed: true, @@ -298,6 +303,7 @@ LOOP: } var infoMap = map[string]interface{}{} + infoMap["cluster_id"] = info.ClusterId infoMap["cluster_name"] = info.ClusterName infoMap["cluster_desc"] = info.ClusterDescription infoMap["cluster_os"] = tkeToShowClusterOs(info.ClusterOs) diff --git a/tencentcloud/resource_tc_container_cluster_instance.go b/tencentcloud/resource_tc_container_cluster_instance.go index 8445470a00..e3d6538d77 100644 --- a/tencentcloud/resource_tc_container_cluster_instance.go +++ b/tencentcloud/resource_tc_container_cluster_instance.go @@ -1,7 +1,7 @@ /* Provides a TencentCloud Container Cluster Instance resource. -~> **NOTE:** It has been deprecated and replaced by tencentcloud_kubernetes_scale_worker. +~> **NOTE:** It has been deprecated and replaced by tencentcloud_kubernetes_scale_worker. Example Usage diff --git a/tencentcloud/resource_tc_container_cluster_instance_test.go b/tencentcloud/resource_tc_container_cluster_instance_test.go index 2703a41d8d..aee57799b5 100644 --- a/tencentcloud/resource_tc_container_cluster_instance_test.go +++ b/tencentcloud/resource_tc_container_cluster_instance_test.go @@ -7,7 +7,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" ) -func TestAccTencentCloudContainerClusterInstance_basic(t *testing.T) { +// @Deprecated It has been deprecated and replaced by tencentcloud_kubernetes_scale_worker. +func testAccTencentCloudContainerClusterInstance_basic(t *testing.T) { t.Parallel() resource.Test(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, diff --git a/tencentcloud/resource_tc_kubernetes_addon_attachment_test.go b/tencentcloud/resource_tc_kubernetes_addon_attachment_test.go index 80c8931891..1ff29b441a 100644 --- a/tencentcloud/resource_tc_kubernetes_addon_attachment_test.go +++ b/tencentcloud/resource_tc_kubernetes_addon_attachment_test.go @@ -57,6 +57,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" { cluster_desc = "test cluster desc" cluster_version = "1.20.6" cluster_max_service_num = 32 + cluster_os = "tlinux2.2(tkernel3)x86_64" worker_config { count = 1 diff --git a/tencentcloud/resource_tc_kubernetes_as_scaling_group_test.go b/tencentcloud/resource_tc_kubernetes_as_scaling_group_test.go index ed48b262cc..eac060d8b7 100644 --- a/tencentcloud/resource_tc_kubernetes_as_scaling_group_test.go +++ b/tencentcloud/resource_tc_kubernetes_as_scaling_group_test.go @@ -140,6 +140,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" { cluster_desc = "test cluster desc" cluster_max_service_num = 32 cluster_version = "1.18.4" + cluster_os = "tlinux2.2(tkernel3)x86_64" worker_config { count = 1 diff --git a/tencentcloud/resource_tc_kubernetes_auth_attachment_test.go b/tencentcloud/resource_tc_kubernetes_auth_attachment_test.go index 5a407ff3e7..a048590920 100644 --- a/tencentcloud/resource_tc_kubernetes_auth_attachment_test.go +++ b/tencentcloud/resource_tc_kubernetes_auth_attachment_test.go @@ -15,10 +15,10 @@ func TestAccTencentCloudTkeAuthAttachResource(t *testing.T) { { Config: testAccTkeAuthAttach(), Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttrSet("resource_tc_kubernetes_auth_attachment.test_auth_attach", "cluster_id"), - resource.TestCheckResourceAttrSet("resource_tc_kubernetes_auth_attachment.test_auth_attach", "issuer"), - resource.TestCheckResourceAttrSet("resource_tc_kubernetes_auth_attachment.test_auth_attach", "jwks_uri"), - resource.TestCheckResourceAttr("resource_tc_kubernetes_auth_attachment.test_auth_attach", "auto_create_discovery_anonymous_auth", "true"), + resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_auth_attachment.test_auth_attach", "cluster_id"), + resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_auth_attachment.test_auth_attach", "issuer"), + resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_auth_attachment.test_auth_attach", "jwks_uri"), + resource.TestCheckResourceAttr("tencentcloud_kubernetes_auth_attachment.test_auth_attach", "auto_create_discovery_anonymous_auth", "true"), ), }, }, @@ -54,10 +54,11 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" { vpc_id = data.tencentcloud_vpc_subnets.vpc.instance_list.0.vpc_id cluster_cidr = "10.31.0.0/16" cluster_max_pod_num = 32 - cluster_name = "keep" + cluster_name = "for-auth-attachment" cluster_desc = "test cluster desc" cluster_version = "1.20.6" cluster_max_service_num = 32 + cluster_os = "tlinux2.2(tkernel3)x86_64" worker_config { count = 1 @@ -66,15 +67,8 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" { system_disk_type = "CLOUD_SSD" system_disk_size = 60 internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR" - internet_max_bandwidth_out = 100 - public_ip_assigned = true subnet_id = data.tencentcloud_vpc_subnets.vpc.instance_list.0.subnet_id - data_disk { - disk_type = "CLOUD_PREMIUM" - disk_size = 50 - } - enhanced_security_service = false enhanced_monitor_service = false user_data = "dGVzdA==" diff --git a/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go b/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go index 8e54147755..447749d7fc 100644 --- a/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go +++ b/tencentcloud/resource_tc_kubernetes_cluster_attachment_test.go @@ -142,12 +142,6 @@ variable "default_instance_type" { default = "S1.SMALL1" } -data "tencentcloud_images" "default" { - image_type = ["PUBLIC_IMAGE"] - os_name = "centos" -} - - data "tencentcloud_vpc_subnets" "vpc" { is_default = true availability_zone = var.availability_zone @@ -166,7 +160,7 @@ data "tencentcloud_instance_types" "default" { resource "tencentcloud_instance" "foo" { instance_name = "tf-auto-test-1-1" availability_zone = var.availability_zone - image_id = data.tencentcloud_images.default.images.0.image_id + image_id = ` + defaultTkeOSImageId + ` instance_type = var.default_instance_type system_disk_type = "CLOUD_PREMIUM" system_disk_size = 50 @@ -181,6 +175,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" { cluster_name = "keep" cluster_desc = "test cluster desc" cluster_max_service_num = 32 + cluster_os = "tlinux2.2(tkernel3)x86_64" worker_config { count = 1 diff --git a/tencentcloud/resource_tc_kubernetes_node_pool_test.go b/tencentcloud/resource_tc_kubernetes_node_pool_test.go index b4c953ef1e..22ea733fa8 100644 --- a/tencentcloud/resource_tc_kubernetes_node_pool_test.go +++ b/tencentcloud/resource_tc_kubernetes_node_pool_test.go @@ -217,7 +217,7 @@ data "tencentcloud_vpc_subnets" "vpc" { } data "tencentcloud_security_groups" "sg" { - name = "test_preset_sg" + name = "default" } variable "default_instance_type" { diff --git a/tencentcloud/resource_tc_kubernetes_scale_worker_test.go b/tencentcloud/resource_tc_kubernetes_scale_worker_test.go index cbca1e7da2..ac7c29e3af 100644 --- a/tencentcloud/resource_tc_kubernetes_scale_worker_test.go +++ b/tencentcloud/resource_tc_kubernetes_scale_worker_test.go @@ -159,7 +159,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" { cluster_version = "1.18.4" cluster_desc = "test cluster desc" cluster_max_service_num = 32 - + cluster_os = "tlinux2.2(tkernel3)x86_64" worker_config { count = 1 availability_zone = var.availability_zone diff --git a/website/docs/d/kubernetes_clusters.html.markdown b/website/docs/d/kubernetes_clusters.html.markdown index 85ff8f6878..6b0aab4cdd 100644 --- a/website/docs/d/kubernetes_clusters.html.markdown +++ b/website/docs/d/kubernetes_clusters.html.markdown @@ -48,6 +48,7 @@ In addition to all arguments above, the following attributes are exported: * `kube_apiserver` - The customized parameters for kube-apiserver. * `kube_controller_manager` - The customized parameters for kube-controller-manager. * `kube_scheduler` - The customized parameters for kube-scheduler. + * `cluster_id` - ID of cluster. * `cluster_ipvs` - Indicates whether ipvs is enabled. * `cluster_max_pod_num` - The maximum number of Pods per node in the cluster. * `cluster_max_service_num` - The maximum number of services in the cluster. diff --git a/website/docs/r/container_cluster_instance.html.markdown b/website/docs/r/container_cluster_instance.html.markdown index 3152c04219..8835b9d2fc 100644 --- a/website/docs/r/container_cluster_instance.html.markdown +++ b/website/docs/r/container_cluster_instance.html.markdown @@ -11,7 +11,7 @@ description: |- Provides a TencentCloud Container Cluster Instance resource. -~> **NOTE:** It has been deprecated and replaced by tencentcloud_kubernetes_scale_worker. +~> **NOTE:** It has been deprecated and replaced by tencentcloud_kubernetes_scale_worker. ## Example Usage