Skip to content

Commit c0f019e

Browse files
authored
Merge pull request #1350 from tencentcloudstack/feat/tem_worload_support_tcr
support tcr
2 parents 05ce615 + 86f0e8d commit c0f019e

File tree

12 files changed

+1330
-17
lines changed

12 files changed

+1330
-17
lines changed

.changelog/1350.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_tem_workload: support set tcr repo
3+
```

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ require (
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.445
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.412
37-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.524
37+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.527
3838
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445
3939
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488
4040
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
@@ -61,7 +61,7 @@ require (
6161
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcm v1.0.519
6262
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.503
6363
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
64-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472
64+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.527
6565
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.500
6666
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.519
6767
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.519 h1:Euhh
510510
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.519/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
511511
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.524 h1:wyEALuNNpyGVx/sEjgLsHKT+mzQPujrzZ+59IpSDsGo=
512512
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.524/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
513+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.527 h1:hpZMjoYnR+ma5HMWWNaNc5fshpFXXaUPrZMo4OXPxYQ=
514+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.527/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
513515
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445 h1:Bh7XD0ypNMHYyBOM8hhKsSu+y0VVKUnJVS+YKKhfpGg=
514516
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.445/go.mod h1:jMDD351efCFpT1+KVFbcpu6SbmP4TYmp4qkoCfr63nQ=
515517
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.488 h1:A1seXWtMf2atBjSNYvcwxyDoFzCMgqyVnsxnWzhqJEA=
@@ -579,6 +581,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268 h1:ez5lvK
579581
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268/go.mod h1:fchXZhmqaYaG2c4wTCBTdnW6TFAtxl3D/P/yuuuLMfA=
580582
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472 h1:9Jzrgx78+5XnZ8myNYjCYZn5ZF+tbSIpF6KWGgWr0uY=
581583
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.472/go.mod h1:ayIL2FNqk7HH5fPQrkWtYjgU4jL7if63f7x+yRwb4a0=
584+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.527 h1:nRFYv2eZ+qMsOYID+ZmI4nSJuuXUgm2SCLFVu3bQmnw=
585+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tem v1.0.527/go.mod h1:mWXRd5WNzX7ypg1MNliZvz5mlfIJ9h0KvyOGnH86KFc=
582586
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.500 h1:8pOrQK3GLskFEHGYR3s6is0YLAgSe7vYs7wdC+brA30=
583587
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/teo v1.0.500/go.mod h1:eQfp4Z6W1vg5vBVkR6i/ZdgKeXWoMECCvQKGTvU5dP0=
584588
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.489 h1:61QTzF5vjDthscsPh2WGL1bLlmOjIJ6PB2+pIihzeTI=

tencentcloud/resource_tc_tem_application.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ func resourceTencentCloudTemApplication() *schema.Resource {
7272
"repo_type": {
7373
Type: schema.TypeInt,
7474
Optional: true,
75-
Description: "repo type, 0: tcr personal, 1: tcr enterprise, 2: public repository, 4: demo image.",
75+
Description: "repo type, 0: tcr personal, 1: tcr enterprise, 2: public repository, 3: tcr hosted by tem, 4: demo image.",
7676
},
7777

7878
"repo_server": {

tencentcloud/resource_tc_tem_workload.go

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,24 @@ func resourceTencentCloudTemWorkload() *schema.Resource {
147147
Description: "security groups.",
148148
},
149149

150+
"repo_type": {
151+
Type: schema.TypeInt,
152+
Optional: true,
153+
Description: "repo type when deploy: 0: tcr personal; 1: tcr enterprise; 2: public repository; 3: tem host tcr; 4: demo repo.",
154+
},
155+
156+
"repo_server": {
157+
Type: schema.TypeString,
158+
Optional: true,
159+
Description: "repo server addr when deploy by image.",
160+
},
161+
162+
"tcr_instance_id": {
163+
Type: schema.TypeString,
164+
Optional: true,
165+
Description: "tcr instance id when deploy by image.",
166+
},
167+
150168
"env_conf": {
151169
Type: schema.TypeList,
152170
Optional: true,
@@ -487,6 +505,18 @@ func resourceTencentCloudTemWorkloadCreate(d *schema.ResourceData, meta interfac
487505
}
488506
}
489507

508+
if v, ok := d.GetOk("repo_type"); ok {
509+
request.RepoType = helper.IntInt64(v.(int))
510+
}
511+
512+
if v, ok := d.GetOk("repo_server"); ok {
513+
request.RepoServer = helper.String(v.(string))
514+
}
515+
516+
if v, ok := d.GetOk("tcr_instance_id"); ok {
517+
request.TcrInstanceId = helper.String(v.(string))
518+
}
519+
490520
if v, ok := d.GetOk("env_conf"); ok {
491521
for _, item := range v.([]interface{}) {
492522
dMap := item.(map[string]interface{})
@@ -747,6 +777,18 @@ func resourceTencentCloudTemWorkloadRead(d *schema.ResourceData, meta interface{
747777
_ = d.Set("security_group_ids", workload.SecurityGroupIds)
748778
}
749779

780+
if workload.RepoType != nil {
781+
_ = d.Set("repo_type", workload.RepoType)
782+
}
783+
784+
if workload.RepoServer != nil {
785+
_ = d.Set("repo_server", workload.RepoServer)
786+
}
787+
788+
if workload.TcrInstanceId != nil {
789+
_ = d.Set("tcr_instance_id", workload.TcrInstanceId)
790+
}
791+
750792
if workload.EnvConf != nil {
751793
envConfList := []interface{}{}
752794
for _, envConf := range workload.EnvConf {
@@ -924,8 +966,9 @@ func resourceTencentCloudTemWorkloadUpdate(d *schema.ResourceData, meta interfac
924966

925967
if d.HasChange("deploy_version") || d.HasChange("deploy_mode") || d.HasChange("img_repo") || d.HasChange("init_pod_num") ||
926968
d.HasChange("cpu_spec") || d.HasChange("memory_spec") || d.HasChange("post_start") || d.HasChange("pre_stop") || d.HasChange("security_group_ids") ||
927-
d.HasChange("env_conf") || d.HasChange("storage_confs") || d.HasChange("storage_mount_confs") || d.HasChange("liveness") ||
928-
d.HasChange("readiness") || d.HasChange("startup_probe") || d.HasChange("deploy_strategy_conf") {
969+
d.HasChange("repo_type") || d.HasChange("repo_server") || d.HasChange("tcr_instance_id") || d.HasChange("env_conf") || d.HasChange("storage_confs") ||
970+
d.HasChange("storage_mount_confs") || d.HasChange("liveness") || d.HasChange("readiness") || d.HasChange("startup_probe") || d.HasChange("deploy_strategy_conf") {
971+
929972
if v, ok := d.GetOk("deploy_version"); ok {
930973
request.DeployVersion = helper.String(v.(string))
931974
}
@@ -966,6 +1009,18 @@ func resourceTencentCloudTemWorkloadUpdate(d *schema.ResourceData, meta interfac
9661009
}
9671010
}
9681011

1012+
if v, ok := d.GetOk("repo_type"); ok {
1013+
request.RepoType = helper.IntInt64(v.(int))
1014+
}
1015+
1016+
if v, ok := d.GetOk("repo_server"); ok {
1017+
request.RepoServer = helper.String(v.(string))
1018+
}
1019+
1020+
if v, ok := d.GetOk("tcr_instance_id"); ok {
1021+
request.TcrInstanceId = helper.String(v.(string))
1022+
}
1023+
9691024
if v, ok := d.GetOk("env_conf"); ok {
9701025
for _, item := range v.([]interface{}) {
9711026
dMap := item.(map[string]interface{})

vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common/http/request.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)