Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cluster intranet and internet field config #2511

Merged
merged 3 commits into from
Feb 5, 2024
Merged

Update cluster intranet and internet field config #2511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3113b6c
Update cluster intranet and internet field config
bruceybian Jan 31, 2024
b354602
add changelog 2511.txt
bruceybian Jan 31, 2024
47d368d
add change log 2511.txt
bruceybian Jan 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/2511.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/tencentcloud_kubernetes_cluster: Optimize `cluster_internet` and `cluster_intranet` fields
```
4 changes: 2 additions & 2 deletions tencentcloud/services/tke/resource_tc_kubernetes_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,8 +653,8 @@ func ResourceTencentCloudTkeCluster() *schema.Resource {
},
"cluster_internet": {
Type: schema.TypeBool,
Default: false,
Optional: true,
Computed: true,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

去掉 Default 会产生不兼容的变更吗

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这里是解决用户没有配置该字段时，再次apply产生change的问题，当去掉默认值，状态文件中的值会从查询接口中获取最新值，兼容用户原来的逻辑。如果用户这里配置了还是可能会产生change，这个目前无法避免。

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

如果没有配置时，不是会使用默认值吗，再次 apply 时为啥会提示 change 呢

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个网络配置现在有两个resource都可以修改（cluster和endpoint资源），当用户在cluster中没有配置，并通过endpoint开启网络时，再次apply时cluster会发生change

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个网络配置现在有两个resource都可以修改（cluster和endpoint资源），当用户在cluster中没有配置，并通过endpoint开启网络时，再次apply时cluster会发生change

针对这个场景，去掉 Default 后，是不是一样会有这个问题呢

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cluster中去掉默认值，增加Computed，如果用户没配置那么每次apply后会从查询接口中写入就不会有这个change问题，如果配置了以用户配置的为准

Description: "Open internet access or not." +
" If this field is set 'true', the field below `worker_config` must be set." +
" Because only cluster with node is allowed enable access endpoint. You may open it through `tencentcloud_kubernetes_cluster_endpoint`.",
Expand All @@ -667,8 +667,8 @@ func ResourceTencentCloudTkeCluster() *schema.Resource {
},
"cluster_intranet": {
Type: schema.TypeBool,
Default: false,
Optional: true,
Computed: true,
Description: "Open intranet access or not." +
" If this field is set 'true', the field below `worker_config` must be set." +
" Because only cluster with node is allowed enable access endpoint. You may open it through `tencentcloud_kubernetes_cluster_endpoint`.",
Expand Down
161 changes: 139 additions & 22 deletions tencentcloud/services/tke/resource_tc_kubernetes_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,7 +409,124 @@ variable "addons_update" {

const TkeDeps = tcacctest.TkeExclusiveNetwork + tcacctest.TkeInstanceType + tcacctest.TkeCIDRs + tcacctest.DefaultImages + tcacctest.DefaultSecurityGroupData

const testAccTkeCluster = TkeDeps + `
const TkeNewDeps = `
//TkeExclusiveNetwork
variable "vpc_cidr" {
default = "172.16.0.0/16"
}

variable "subnet_cidr1" {
default = "172.16.0.0/20"
}

variable "subnet_cidr2" {
default = "172.16.16.0/20"
}

resource "tencentcloud_vpc" "vpc" {
name = "tf_tke_vpc_test"
cidr_block = var.vpc_cidr
}

resource "tencentcloud_subnet" "subnet1" {
name = "tf_tke_subnet_test1"
vpc_id = tencentcloud_vpc.vpc.id
availability_zone = var.availability_zone
cidr_block = var.subnet_cidr1
is_multicast = false
}

resource "tencentcloud_subnet" "subnet2" {
name = "tf_tke_subnet_test2"
vpc_id = tencentcloud_vpc.vpc.id
availability_zone = var.availability_zone
cidr_block = var.subnet_cidr2
is_multicast = false
}

locals {
vpc_id = tencentcloud_vpc.vpc.id
subnet_id1 = tencentcloud_subnet.subnet1.id
subnet_id2 = tencentcloud_subnet.subnet2.id
}

//TkeInstanceType
data "tencentcloud_instance_types" "ins_type" {
filter {
name = "instance-family"
values = ["S2"]
}

cpu_core_count = 2
memory_size = 2
}

locals {
type1 = [
for i in data.tencentcloud_instance_types.ins_type.instance_types : i
if lookup(i, "instance_charge_type") == "POSTPAID_BY_HOUR"
]
type2 = [for i in data.tencentcloud_instance_types.ins_type.instance_types : i]
final_type = concat(local.type1, local.type2)[0].instance_type
}

//TkeCIDRs
variable "tke_cidr_a" {
default = [
"10.31.0.0/23",
"10.31.2.0/24",
"10.31.3.0/24",
"10.31.16.0/24",
"10.31.32.0/24"
]
}

variable "tke_cidr_b" {
default = [
"172.18.0.0/20",
"172.18.16.0/21",
"172.18.24.0/21",
"172.18.32.0/20",
"172.18.48.0/20"
]
}

variable "tke_cidr_c" {
default = [
"192.168.0.0/18",
"192.168.64.0/19",
"192.168.96.0/20",
"192.168.112.0/21",
"192.168.120.0/21"
]
}

//DefaultImages
variable "default_img_id" {
default = "img-2lr9q49h"
}

//DefaultSecurityGroupData
resource "tencentcloud_security_group" "example" {
name = "tf_tke_sg_test"
description = "sg test"
}

data "tencentcloud_security_groups" "internal" {
name = tencentcloud_security_group.example.name
}

data "tencentcloud_security_groups" "exclusive" {
name = tencentcloud_security_group.example.name
}

locals {
sg_id = data.tencentcloud_security_groups.internal.security_groups.0.security_group_id
sg_id2 = data.tencentcloud_security_groups.exclusive.security_groups.0.security_group_id
}
`

const testAccTkeCluster = TkeNewDeps + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand All @@ -429,7 +546,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
cluster_os = "tlinux2.2(tkernel3)x86_64"
cluster_level = "L5"
auto_upgrade_cluster_level = true
cluster_intranet_subnet_id = local.subnet_id
cluster_intranet_subnet_id = local.subnet_id1
cluster_internet_security_group = local.sg_id
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
worker_config {
Expand All @@ -441,7 +558,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 100
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]

Expand Down Expand Up @@ -478,7 +595,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
`

const testAccTkeClusterUpdateAccess = TkeDeps + `
const testAccTkeClusterUpdateAccess = TkeNewDeps + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand Down Expand Up @@ -508,7 +625,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 100
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]

Expand Down Expand Up @@ -549,7 +666,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
}
`
const testAccTkeClusterUpdateLevel = TkeDeps + `
const testAccTkeClusterUpdateLevel = TkeNewDeps + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand All @@ -576,7 +693,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 100
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]

Expand Down Expand Up @@ -613,7 +730,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
`

const testAccTkeClusterLogsAddons = TkeDeps + testAccTkeExtensionAddons + `
const testAccTkeClusterLogsAddons = TkeNewDeps + testAccTkeExtensionAddons + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand All @@ -640,7 +757,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 10
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]
enhanced_security_service = false
Expand Down Expand Up @@ -670,7 +787,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
}`

const testAccTkeClusterLogsAddonsUpdate = TkeDeps + testAccTkeExtensionAddons + `
const testAccTkeClusterLogsAddonsUpdate = TkeNewDeps + testAccTkeExtensionAddons + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand Down Expand Up @@ -705,7 +822,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 10
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]
enhanced_security_service = false
Expand All @@ -729,7 +846,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
}`

const testAccTkeClusterEnableVpcCni = TkeDeps + `
const testAccTkeClusterEnableVpcCni = TkeNewDeps + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand All @@ -749,13 +866,13 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
cluster_os = "tlinux2.2(tkernel3)x86_64"
cluster_level = "L5"
auto_upgrade_cluster_level = true
cluster_intranet_subnet_id = local.subnet_id
cluster_intranet_subnet_id = local.subnet_id1
cluster_internet_security_group = local.sg_id
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]

vpc_cni_type = "tke-route-eni"
is_non_static_ip_mode = false
eni_subnet_ids = ["subnet-ljyn7h30"]
eni_subnet_ids = [local.subnet_id1]
claim_expired_seconds = 300

worker_config {
Expand All @@ -767,7 +884,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 100
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]

Expand Down Expand Up @@ -804,7 +921,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
`

const testAccTkeClusterUpdateVpcCni = TkeDeps + `
const testAccTkeClusterUpdateVpcCni = TkeNewDeps + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand All @@ -824,13 +941,13 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
cluster_os = "tlinux2.2(tkernel3)x86_64"
cluster_level = "L5"
auto_upgrade_cluster_level = true
cluster_intranet_subnet_id = local.subnet_id
cluster_intranet_subnet_id = local.subnet_id1
cluster_internet_security_group = local.sg_id
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]

vpc_cni_type = "tke-route-eni"
is_non_static_ip_mode = false
eni_subnet_ids = ["subnet-ljyn7h30", "subnet-domfffi4"]
eni_subnet_ids = [local.subnet_id1, local.subnet_id2]
claim_expired_seconds = 300

worker_config {
Expand All @@ -842,7 +959,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 100
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]

Expand Down Expand Up @@ -879,7 +996,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
}
`

const testAccTkeClusterCloseVpcCni = TkeDeps + `
const testAccTkeClusterCloseVpcCni = TkeNewDeps + `
variable "availability_zone" {
default = "ap-guangzhou-3"
}
Expand All @@ -899,7 +1016,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
cluster_os = "tlinux2.2(tkernel3)x86_64"
cluster_level = "L5"
auto_upgrade_cluster_level = true
cluster_intranet_subnet_id = local.subnet_id
cluster_intranet_subnet_id = local.subnet_id1
cluster_internet_security_group = local.sg_id
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]

Expand All @@ -915,7 +1032,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
internet_max_bandwidth_out = 100
public_ip_assigned = true
subnet_id = local.subnet_id
subnet_id = local.subnet_id1
img_id = var.default_img_id
security_group_ids = [local.sg_id]

Expand Down
Loading