diff --git a/tencentcloud/provider.go b/tencentcloud/provider.go index e647a2b22b..a18be16d39 100644 --- a/tencentcloud/provider.go +++ b/tencentcloud/provider.go @@ -2319,7 +2319,7 @@ func Provider() *schema.Provider { "tencentcloud_kubernetes_node_pool": resourceTencentCloudKubernetesNodePool(), "tencentcloud_kubernetes_serverless_node_pool": resourceTkeServerLessNodePool(), "tencentcloud_kubernetes_backup_storage_location": resourceTencentCloudTkeBackupStorageLocation(), - "tencentcloud_kubernetes_encryption_protection": resourceTencentCloudTkeEncryptionProtection(), + "tencentcloud_kubernetes_encryption_protection": resourceTencentCloudKubernetesEncryptionProtection(), "tencentcloud_mysql_backup_policy": resourceTencentCloudMysqlBackupPolicy(), "tencentcloud_mysql_account": resourceTencentCloudMysqlAccount(), "tencentcloud_mysql_account_privilege": resourceTencentCloudMysqlAccountPrivilege(), diff --git a/tencentcloud/resource_tc_kubernetes_cluster.go b/tencentcloud/resource_tc_kubernetes_cluster.go index bd6c96062e..06971f4701 100644 --- a/tencentcloud/resource_tc_kubernetes_cluster.go +++ b/tencentcloud/resource_tc_kubernetes_cluster.go @@ -934,6 +934,7 @@ func resourceTencentCloudTkeCluster() *schema.Resource { "cluster_version": { Type: schema.TypeString, Optional: true, + Computed: true, Description: "Version of the cluster. Use `tencentcloud_kubernetes_available_cluster_versions` to get the upgradable cluster version.", }, "upgrade_instances_follow_cluster": { diff --git a/tencentcloud/resource_tc_kubernetes_encryption_protection.go b/tencentcloud/resource_tc_kubernetes_encryption_protection.go index 50f87c4088..de9e33a3bc 100644 --- a/tencentcloud/resource_tc_kubernetes_encryption_protection.go +++ b/tencentcloud/resource_tc_kubernetes_encryption_protection.go @@ -11,7 +11,7 @@ variable "example_region" { } variable "example_cluster_cidr" { - default = "10.31.0.0/16" + default = "10.32.0.0/16" } variable "availability_zone" { @@ -30,13 +30,11 @@ resource "tencentcloud_kubernetes_cluster" "example" { cluster_name = "tf_example_cluster" cluster_desc = "a tf example cluster for the kms test" cluster_max_service_num = 32 - cluster_internet = true - cluster_version = "1.24.4" cluster_deploy_type = "MANAGED_CLUSTER" } resource "tencentcloud_kms_key" "example" { - alias = "tf-example-kms-key-ed-%s" + alias = "tf-example-kms-key" description = "example of kms key instance" key_usage = "ENCRYPT_DECRYPT" is_enabled = true @@ -64,11 +62,11 @@ import ( "github.com/tencentcloudstack/terraform-provider-tencentcloud/tencentcloud/internal/helper" ) -func resourceTencentCloudTkeEncryptionProtection() *schema.Resource { +func resourceTencentCloudKubernetesEncryptionProtection() *schema.Resource { return &schema.Resource{ - Create: resourceTencentCloudTkeEncryptionProtectionCreate, - Read: resourceTencentCloudTkeEncryptionProtectionRead, - Delete: resourceTencentCloudTkeEncryptionProtectionDelete, + Create: resourceTencentCloudKubernetesEncryptionProtectionCreate, + Read: resourceTencentCloudKubernetesEncryptionProtectionRead, + Delete: resourceTencentCloudKubernetesEncryptionProtectionDelete, Schema: map[string]*schema.Schema{ "cluster_id": { Required: true, @@ -107,7 +105,7 @@ func resourceTencentCloudTkeEncryptionProtection() *schema.Resource { } } -func resourceTencentCloudTkeEncryptionProtectionCreate(d *schema.ResourceData, meta interface{}) error { +func resourceTencentCloudKubernetesEncryptionProtectionCreate(d *schema.ResourceData, meta interface{}) error { defer logElapsed("resource.tencentcloud_tke_encryption_protection.create")() defer inconsistentCheck(d, meta)() @@ -157,10 +155,10 @@ func resourceTencentCloudTkeEncryptionProtectionCreate(d *schema.ResourceData, m return e } - return resourceTencentCloudTkeEncryptionProtectionRead(d, meta) + return resourceTencentCloudKubernetesEncryptionProtectionRead(d, meta) } -func resourceTencentCloudTkeEncryptionProtectionRead(d *schema.ResourceData, meta interface{}) error { +func resourceTencentCloudKubernetesEncryptionProtectionRead(d *schema.ResourceData, meta interface{}) error { defer logElapsed("resource.tencentcloud_tke_encryption_protection.read")() defer inconsistentCheck(d, meta)() @@ -190,7 +188,7 @@ func resourceTencentCloudTkeEncryptionProtectionRead(d *schema.ResourceData, met return nil } -func resourceTencentCloudTkeEncryptionProtectionDelete(d *schema.ResourceData, meta interface{}) error { +func resourceTencentCloudKubernetesEncryptionProtectionDelete(d *schema.ResourceData, meta interface{}) error { defer logElapsed("resource.tencentcloud_tke_encryption_protection.delete")() defer inconsistentCheck(d, meta)() diff --git a/tencentcloud/resource_tc_kubernetes_encryption_protection_test.go b/tencentcloud/resource_tc_kubernetes_encryption_protection_test.go index 4c5acbfa58..01de5e3076 100644 --- a/tencentcloud/resource_tc_kubernetes_encryption_protection_test.go +++ b/tencentcloud/resource_tc_kubernetes_encryption_protection_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" ) -func TestAccTencentCloudTkeEncryptionProtectionResource_basic(t *testing.T) { +func TestAccTencentCloudKubernetesEncryptionProtectionResource_basic(t *testing.T) { t.Parallel() rName := acctest.RandString(10) resource.Test(t, resource.TestCase{ @@ -21,7 +21,7 @@ func TestAccTencentCloudTkeEncryptionProtectionResource_basic(t *testing.T) { Config: fmt.Sprintf(testAccTkeEncryptionProtection, rName), Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "id"), - resource.TestCheckResourceAttr("tencentcloud_kubernetes_encryption_protection.example", "cluster_id", defaultTkeClusterId), + resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "cluster_id"), resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "kms_configuration.#"), resource.TestCheckResourceAttrSet("tencentcloud_kubernetes_encryption_protection.example", "kms_configuration.0.key_id"), resource.TestCheckResourceAttr("tencentcloud_kubernetes_encryption_protection.example", "kms_configuration.0.kms_region", "ap-guangzhou"), @@ -39,7 +39,7 @@ variable "example_region" { } variable "example_cluster_cidr" { - default = "10.31.0.0/16" + default = "10.32.0.0/16" } variable "availability_zone" { @@ -58,8 +58,6 @@ resource "tencentcloud_kubernetes_cluster" "example" { cluster_name = "tf_example_cluster" cluster_desc = "a tf example cluster for the kms test" cluster_max_service_num = 32 - cluster_internet = true - cluster_version = "1.24.4" cluster_deploy_type = "MANAGED_CLUSTER" } diff --git a/website/docs/r/kubernetes_encryption_protection.html.markdown b/website/docs/r/kubernetes_encryption_protection.html.markdown index 08451c5ef7..ea080435e6 100644 --- a/website/docs/r/kubernetes_encryption_protection.html.markdown +++ b/website/docs/r/kubernetes_encryption_protection.html.markdown @@ -21,7 +21,7 @@ variable "example_region" { } variable "example_cluster_cidr" { - default = "10.31.0.0/16" + default = "10.32.0.0/16" } variable "availability_zone" { @@ -40,13 +40,11 @@ resource "tencentcloud_kubernetes_cluster" "example" { cluster_name = "tf_example_cluster" cluster_desc = "a tf example cluster for the kms test" cluster_max_service_num = 32 - cluster_internet = true - cluster_version = "1.24.4" cluster_deploy_type = "MANAGED_CLUSTER" } resource "tencentcloud_kms_key" "example" { - alias = "tf-example-kms-key-ed-%s" + alias = "tf-example-kms-key" description = "example of kms key instance" key_usage = "ENCRYPT_DECRYPT" is_enabled = true