@@ -149,34 +149,39 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
149
149
Master : make ([]tke.InstanceAdvancedSettings , 0 ),
150
150
Work : make ([]tke.InstanceAdvancedSettings , 0 ),
151
151
}
152
- if masters , ok := d .GetOk ("master_config" ); ok {
153
- if clusterDeployType == TKE_DEPLOY_TYPE_MANAGED {
154
- return fmt .Errorf ("if `cluster_deploy_type` is `MANAGED_CLUSTER` , You don't need define the master yourself" )
155
- }
156
- var masterCount int64 = 0
157
- masterList := masters .([]interface {})
158
- for index := range masterList {
159
- master := masterList [index ].(map [string ]interface {})
160
- paraJson , count , err := tkeGetCvmRunInstancesPara (master , meta , vpcId , basic .ProjectId )
161
- if err != nil {
162
- return err
152
+
153
+ cdc_id := d .Get ("cdc_id" ).(string )
154
+
155
+ if cdc_id == "" {
156
+ if masters , ok := d .GetOk ("master_config" ); ok {
157
+ if clusterDeployType == TKE_DEPLOY_TYPE_MANAGED {
158
+ return fmt .Errorf ("if `cluster_deploy_type` is `MANAGED_CLUSTER` , You don't need define the master yourself" )
163
159
}
160
+ var masterCount int64 = 0
161
+ masterList := masters .([]interface {})
162
+ for index := range masterList {
163
+ master := masterList [index ].(map [string ]interface {})
164
+ paraJson , count , err := tkeGetCvmRunInstancesPara (master , meta , vpcId , basic .ProjectId )
165
+ if err != nil {
166
+ return err
167
+ }
164
168
165
- cvms .Master = append (cvms .Master , paraJson )
166
- masterCount += count
169
+ cvms .Master = append (cvms .Master , paraJson )
170
+ masterCount += count
167
171
168
- if v , ok := master ["desired_pod_num" ]; ok {
169
- dpNum := int64 (v .(int ))
170
- if dpNum != DefaultDesiredPodNum {
171
- overrideSettings .Master = append (overrideSettings .Master , tke.InstanceAdvancedSettings {DesiredPodNumber : helper .Int64 (dpNum )})
172
+ if v , ok := master ["desired_pod_num" ]; ok {
173
+ dpNum := int64 (v .(int ))
174
+ if dpNum != DefaultDesiredPodNum {
175
+ overrideSettings .Master = append (overrideSettings .Master , tke.InstanceAdvancedSettings {DesiredPodNumber : helper .Int64 (dpNum )})
176
+ }
172
177
}
173
178
}
179
+ if masterCount < 3 {
180
+ return fmt .Errorf ("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` len(master_config) should >=3" )
181
+ }
182
+ } else if clusterDeployType == TKE_DEPLOY_TYPE_INDEPENDENT {
183
+ return fmt .Errorf ("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` , You need define the master yourself" )
174
184
}
175
- if masterCount < 3 {
176
- return fmt .Errorf ("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` len(master_config) should >=3" )
177
- }
178
- } else if clusterDeployType == TKE_DEPLOY_TYPE_INDEPENDENT {
179
- return fmt .Errorf ("if `cluster_deploy_type` is `TKE_DEPLOY_TYPE_INDEPENDENT` , You need define the master yourself" )
180
185
}
181
186
182
187
if workers , ok := d .GetOk ("worker_config" ); ok {
@@ -261,6 +266,10 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
261
266
iAdvanced .DockerGraphPath = "/var/lib/docker"
262
267
}
263
268
269
+ if preStartUserScript , ok := d .GetOk ("pre_start_user_script" ); ok {
270
+ iAdvanced .DockerGraphPath = preStartUserScript .(string )
271
+ }
272
+
264
273
// ExistedInstancesForNode
265
274
existInstances := make ([]* tke.ExistedInstancesForNode , 0 )
266
275
if instances , ok := d .GetOk ("exist_instance" ); ok {
@@ -311,7 +320,9 @@ func resourceTencentCloudKubernetesClusterCreatePostFillRequest0(ctx context.Con
311
320
312
321
req .RunInstancesForNode = []* tke.RunInstancesForNode {}
313
322
314
- if len (cvms .Master ) != 0 {
323
+ if cdc_id != "" {
324
+ req .ClusterType = helper .String (clusterDeployType )
325
+ } else if len (cvms .Master ) != 0 {
315
326
316
327
var node tke.RunInstancesForNode
317
328
node .NodeRole = helper .String (TKE_ROLE_MASTER_ETCD )
0 commit comments