Skip to content

Commit 2aced90

Browse files
bruceybianbruceybian
authored
Update cluster intranet and internet field config (#2511)
* Update cluster intranet and internet field config * add changelog 2511.txt * add change log 2511.txt
1 parent 888be0a commit 2aced90

File tree

3 files changed

+144
-24
lines changed

3 files changed

+144
-24
lines changed

‎.changelog/2511.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
resource/tencentcloud_kubernetes_cluster: Optimize `cluster_internet` and `cluster_intranet` fields
3+
```

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -653,8 +653,8 @@ func ResourceTencentCloudTkeCluster() *schema.Resource {
653653
},
654654
"cluster_internet": {
655655
Type: schema.TypeBool,
656-
Default: false,
657656
Optional: true,
657+
Computed: true,
658658
Description: "Open internet access or not." +
659659
" If this field is set 'true', the field below `worker_config` must be set." +
660660
" Because only cluster with node is allowed enable access endpoint. You may open it through `tencentcloud_kubernetes_cluster_endpoint`.",
@@ -667,8 +667,8 @@ func ResourceTencentCloudTkeCluster() *schema.Resource {
667667
},
668668
"cluster_intranet": {
669669
Type: schema.TypeBool,
670-
Default: false,
671670
Optional: true,
671+
Computed: true,
672672
Description: "Open intranet access or not." +
673673
" If this field is set 'true', the field below `worker_config` must be set." +
674674
" Because only cluster with node is allowed enable access endpoint. You may open it through `tencentcloud_kubernetes_cluster_endpoint`.",

‎tencentcloud/services/tke/resource_tc_kubernetes_cluster_test.go‎

Lines changed: 139 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,124 @@ variable "addons_update" {
409409

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

412-
const testAccTkeCluster = TkeDeps + `
412+
const TkeNewDeps = `
413+
//TkeExclusiveNetwork
414+
variable "vpc_cidr" {
415+
default = "172.16.0.0/16"
416+
}
417+
418+
variable "subnet_cidr1" {
419+
default = "172.16.0.0/20"
420+
}
421+
422+
variable "subnet_cidr2" {
423+
default = "172.16.16.0/20"
424+
}
425+
426+
resource "tencentcloud_vpc" "vpc" {
427+
name = "tf_tke_vpc_test"
428+
cidr_block = var.vpc_cidr
429+
}
430+
431+
resource "tencentcloud_subnet" "subnet1" {
432+
name = "tf_tke_subnet_test1"
433+
vpc_id = tencentcloud_vpc.vpc.id
434+
availability_zone = var.availability_zone
435+
cidr_block = var.subnet_cidr1
436+
is_multicast = false
437+
}
438+
439+
resource "tencentcloud_subnet" "subnet2" {
440+
name = "tf_tke_subnet_test2"
441+
vpc_id = tencentcloud_vpc.vpc.id
442+
availability_zone = var.availability_zone
443+
cidr_block = var.subnet_cidr2
444+
is_multicast = false
445+
}
446+
447+
locals {
448+
vpc_id = tencentcloud_vpc.vpc.id
449+
subnet_id1 = tencentcloud_subnet.subnet1.id
450+
subnet_id2 = tencentcloud_subnet.subnet2.id
451+
}
452+
453+
//TkeInstanceType
454+
data "tencentcloud_instance_types" "ins_type" {
455+
filter {
456+
name = "instance-family"
457+
values = ["S2"]
458+
}
459+
460+
cpu_core_count = 2
461+
memory_size = 2
462+
}
463+
464+
locals {
465+
type1 = [
466+
for i in data.tencentcloud_instance_types.ins_type.instance_types : i
467+
if lookup(i, "instance_charge_type") == "POSTPAID_BY_HOUR"
468+
]
469+
type2 = [for i in data.tencentcloud_instance_types.ins_type.instance_types : i]
470+
final_type = concat(local.type1, local.type2)[0].instance_type
471+
}
472+
473+
//TkeCIDRs
474+
variable "tke_cidr_a" {
475+
default = [
476+
"10.31.0.0/23",
477+
"10.31.2.0/24",
478+
"10.31.3.0/24",
479+
"10.31.16.0/24",
480+
"10.31.32.0/24"
481+
]
482+
}
483+
484+
variable "tke_cidr_b" {
485+
default = [
486+
"172.18.0.0/20",
487+
"172.18.16.0/21",
488+
"172.18.24.0/21",
489+
"172.18.32.0/20",
490+
"172.18.48.0/20"
491+
]
492+
}
493+
494+
variable "tke_cidr_c" {
495+
default = [
496+
"192.168.0.0/18",
497+
"192.168.64.0/19",
498+
"192.168.96.0/20",
499+
"192.168.112.0/21",
500+
"192.168.120.0/21"
501+
]
502+
}
503+
504+
//DefaultImages
505+
variable "default_img_id" {
506+
default = "img-2lr9q49h"
507+
}
508+
509+
//DefaultSecurityGroupData
510+
resource "tencentcloud_security_group" "example" {
511+
name = "tf_tke_sg_test"
512+
description = "sg test"
513+
}
514+
515+
data "tencentcloud_security_groups" "internal" {
516+
name = tencentcloud_security_group.example.name
517+
}
518+
519+
data "tencentcloud_security_groups" "exclusive" {
520+
name = tencentcloud_security_group.example.name
521+
}
522+
523+
locals {
524+
sg_id = data.tencentcloud_security_groups.internal.security_groups.0.security_group_id
525+
sg_id2 = data.tencentcloud_security_groups.exclusive.security_groups.0.security_group_id
526+
}
527+
`
528+
529+
const testAccTkeCluster = TkeNewDeps + `
413530
variable "availability_zone" {
414531
default = "ap-guangzhou-3"
415532
}
@@ -429,7 +546,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
429546
cluster_os = "tlinux2.2(tkernel3)x86_64"
430547
cluster_level = "L5"
431548
auto_upgrade_cluster_level = true
432-
cluster_intranet_subnet_id = local.subnet_id
549+
cluster_intranet_subnet_id = local.subnet_id1
433550
cluster_internet_security_group = local.sg_id
434551
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
435552
worker_config {
@@ -441,7 +558,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
441558
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
442559
internet_max_bandwidth_out = 100
443560
public_ip_assigned = true
444-
subnet_id = local.subnet_id
561+
subnet_id = local.subnet_id1
445562
img_id = var.default_img_id
446563
security_group_ids = [local.sg_id]
447564
@@ -478,7 +595,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
478595
}
479596
`
480597

481-
const testAccTkeClusterUpdateAccess = TkeDeps + `
598+
const testAccTkeClusterUpdateAccess = TkeNewDeps + `
482599
variable "availability_zone" {
483600
default = "ap-guangzhou-3"
484601
}
@@ -508,7 +625,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
508625
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
509626
internet_max_bandwidth_out = 100
510627
public_ip_assigned = true
511-
subnet_id = local.subnet_id
628+
subnet_id = local.subnet_id1
512629
img_id = var.default_img_id
513630
security_group_ids = [local.sg_id]
514631
@@ -549,7 +666,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
549666
}
550667
}
551668
`
552-
const testAccTkeClusterUpdateLevel = TkeDeps + `
669+
const testAccTkeClusterUpdateLevel = TkeNewDeps + `
553670
variable "availability_zone" {
554671
default = "ap-guangzhou-3"
555672
}
@@ -576,7 +693,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
576693
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
577694
internet_max_bandwidth_out = 100
578695
public_ip_assigned = true
579-
subnet_id = local.subnet_id
696+
subnet_id = local.subnet_id1
580697
img_id = var.default_img_id
581698
security_group_ids = [local.sg_id]
582699
@@ -613,7 +730,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
613730
}
614731
`
615732

616-
const testAccTkeClusterLogsAddons = TkeDeps + testAccTkeExtensionAddons + `
733+
const testAccTkeClusterLogsAddons = TkeNewDeps + testAccTkeExtensionAddons + `
617734
variable "availability_zone" {
618735
default = "ap-guangzhou-3"
619736
}
@@ -640,7 +757,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
640757
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
641758
internet_max_bandwidth_out = 10
642759
public_ip_assigned = true
643-
subnet_id = local.subnet_id
760+
subnet_id = local.subnet_id1
644761
img_id = var.default_img_id
645762
security_group_ids = [local.sg_id]
646763
enhanced_security_service = false
@@ -670,7 +787,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
670787
}
671788
}`
672789

673-
const testAccTkeClusterLogsAddonsUpdate = TkeDeps + testAccTkeExtensionAddons + `
790+
const testAccTkeClusterLogsAddonsUpdate = TkeNewDeps + testAccTkeExtensionAddons + `
674791
variable "availability_zone" {
675792
default = "ap-guangzhou-3"
676793
}
@@ -705,7 +822,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
705822
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
706823
internet_max_bandwidth_out = 10
707824
public_ip_assigned = true
708-
subnet_id = local.subnet_id
825+
subnet_id = local.subnet_id1
709826
img_id = var.default_img_id
710827
security_group_ids = [local.sg_id]
711828
enhanced_security_service = false
@@ -729,7 +846,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
729846
}
730847
}`
731848

732-
const testAccTkeClusterEnableVpcCni = TkeDeps + `
849+
const testAccTkeClusterEnableVpcCni = TkeNewDeps + `
733850
variable "availability_zone" {
734851
default = "ap-guangzhou-3"
735852
}
@@ -749,13 +866,13 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
749866
cluster_os = "tlinux2.2(tkernel3)x86_64"
750867
cluster_level = "L5"
751868
auto_upgrade_cluster_level = true
752-
cluster_intranet_subnet_id = local.subnet_id
869+
cluster_intranet_subnet_id = local.subnet_id1
753870
cluster_internet_security_group = local.sg_id
754871
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
755872
756873
vpc_cni_type = "tke-route-eni"
757874
is_non_static_ip_mode = false
758-
eni_subnet_ids = ["subnet-ljyn7h30"]
875+
eni_subnet_ids = [local.subnet_id1]
759876
claim_expired_seconds = 300
760877
761878
worker_config {
@@ -767,7 +884,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
767884
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
768885
internet_max_bandwidth_out = 100
769886
public_ip_assigned = true
770-
subnet_id = local.subnet_id
887+
subnet_id = local.subnet_id1
771888
img_id = var.default_img_id
772889
security_group_ids = [local.sg_id]
773890
@@ -804,7 +921,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
804921
}
805922
`
806923

807-
const testAccTkeClusterUpdateVpcCni = TkeDeps + `
924+
const testAccTkeClusterUpdateVpcCni = TkeNewDeps + `
808925
variable "availability_zone" {
809926
default = "ap-guangzhou-3"
810927
}
@@ -824,13 +941,13 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
824941
cluster_os = "tlinux2.2(tkernel3)x86_64"
825942
cluster_level = "L5"
826943
auto_upgrade_cluster_level = true
827-
cluster_intranet_subnet_id = local.subnet_id
944+
cluster_intranet_subnet_id = local.subnet_id1
828945
cluster_internet_security_group = local.sg_id
829946
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
830947
831948
vpc_cni_type = "tke-route-eni"
832949
is_non_static_ip_mode = false
833-
eni_subnet_ids = ["subnet-ljyn7h30", "subnet-domfffi4"]
950+
eni_subnet_ids = [local.subnet_id1, local.subnet_id2]
834951
claim_expired_seconds = 300
835952
836953
worker_config {
@@ -842,7 +959,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
842959
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
843960
internet_max_bandwidth_out = 100
844961
public_ip_assigned = true
845-
subnet_id = local.subnet_id
962+
subnet_id = local.subnet_id1
846963
img_id = var.default_img_id
847964
security_group_ids = [local.sg_id]
848965
@@ -879,7 +996,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
879996
}
880997
`
881998

882-
const testAccTkeClusterCloseVpcCni = TkeDeps + `
999+
const testAccTkeClusterCloseVpcCni = TkeNewDeps + `
8831000
variable "availability_zone" {
8841001
default = "ap-guangzhou-3"
8851002
}
@@ -899,7 +1016,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
8991016
cluster_os = "tlinux2.2(tkernel3)x86_64"
9001017
cluster_level = "L5"
9011018
auto_upgrade_cluster_level = true
902-
cluster_intranet_subnet_id = local.subnet_id
1019+
cluster_intranet_subnet_id = local.subnet_id1
9031020
cluster_internet_security_group = local.sg_id
9041021
managed_cluster_internet_security_policies = ["3.3.3.3", "1.1.1.1"]
9051022
@@ -915,7 +1032,7 @@ resource "tencentcloud_kubernetes_cluster" "managed_cluster" {
9151032
internet_charge_type = "TRAFFIC_POSTPAID_BY_HOUR"
9161033
internet_max_bandwidth_out = 100
9171034
public_ip_assigned = true
918-
subnet_id = local.subnet_id
1035+
subnet_id = local.subnet_id1
9191036
img_id = var.default_img_id
9201037
security_group_ids = [local.sg_id]
9211038

0 commit comments

Comments
 (0)