Skip to content

Commit ebf10d1

Browse files
author
ivan
committed
fix enable_customized_pod_cidr force replace when edit tf
1 parent 79cefdc commit ebf10d1

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

tencentcloud/extension_tke.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,3 +99,7 @@ type OverrideSettings struct {
9999
Master []tke.InstanceAdvancedSettings
100100
Work []tke.InstanceAdvancedSettings
101101
}
102+
103+
const (
104+
DefaultDesiredPodNum = 0
105+
)

tencentcloud/resource_tc_kubernetes_cluster.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ func TkeCvmCreateInfo() map[string]*schema.Schema {
561561
Type: schema.TypeInt,
562562
ForceNew: true,
563563
Optional: true,
564-
Default: -1,
564+
Default: DefaultDesiredPodNum,
565565
Description: "Indicate to set desired pod number in node. valid when enable_customized_pod_cidr=true, " +
566566
"and it override `[globe_]desired_pod_num` for current node. Either all the fields `desired_pod_num` or none.",
567567
},
@@ -793,8 +793,8 @@ func resourceTencentCloudTkeCluster() *schema.Resource {
793793
Description: "Cluster network type, GR or VPC-CNI. Default is GR.",
794794
},
795795
"enable_customized_pod_cidr": {
796-
Type: schema.TypeBool,
797-
ForceNew: true,
796+
Type: schema.TypeBool,
797+
//ForceNew: true,
798798
Optional: true,
799799
Default: false,
800800
Description: "Whether to enable the custom mode of node podCIDR size. Default is false.",
@@ -1645,7 +1645,7 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
16451645

16461646
if v, ok := master["desired_pod_num"]; ok {
16471647
dpNum := int64(v.(int))
1648-
if dpNum != -1 {
1648+
if dpNum != DefaultDesiredPodNum {
16491649
overrideSettings.Master = append(overrideSettings.Master, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
16501650
}
16511651
}
@@ -1672,7 +1672,7 @@ func resourceTencentCloudTkeClusterCreate(d *schema.ResourceData, meta interface
16721672

16731673
if v, ok := worker["desired_pod_num"]; ok {
16741674
dpNum := int64(v.(int))
1675-
if dpNum != -1 {
1675+
if dpNum != DefaultDesiredPodNum {
16761676
overrideSettings.Work = append(overrideSettings.Work, tke.InstanceAdvancedSettings{DesiredPodNumber: helper.Int64(dpNum)})
16771677
}
16781678
}

0 commit comments

Comments
 (0)