Skip to content

Commit 3dd3f64

Browse files
KagashinoKagashino
authored
feat: eks - add kubeconfig (#920)
1 parent 10f7d14 commit 3dd3f64

File tree

13 files changed

+45
-6
lines changed

13 files changed

+45
-6
lines changed

‎go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ require (
3030
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/clb v1.0.283
3131
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cloudaudit v1.0.199
3232
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cls v1.0.291
33-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.369
33+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.370
3434
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351
3535
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cynosdb v1.0.359
3636
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/dayu v1.0.335
@@ -54,7 +54,7 @@ require (
5454
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcaplusdb v1.0.199
5555
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tcr v1.0.267
5656
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tdmq v1.0.268
57-
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.369
57+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.370
5858
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199
5959
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.357
6060
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/wss v1.0.199

‎go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.368 h1:FS5r
505505
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.368/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
506506
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.369 h1:Ipg0vbH3s/9QnImiQYp7GSW4dg9OZv7TUzFKtABKPko=
507507
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.369/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
508+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.370 h1:FlmNH0W03TG5uBwXuSp4RZz7N56Y1+FAYYBFc8+wFTQ=
509+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.370/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y=
508510
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199 h1:ajgJogYSIQ5u1PIbiV5nsvr5K0fYpm1/T7Dy+mxEM6U=
509511
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.199/go.mod h1:AqyM/ZZMD7q5mHBqNY9YImbSpEpoEe7E/vrTbUWX+po=
510512
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/cvm v1.0.351 h1:zqJsH5pxGT57La7NAOOyMQxsuM11pupNBwV1dzXcT24=
@@ -570,6 +572,8 @@ github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.368 h1:QvbcfEh
570572
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.368/go.mod h1:uucDJ3gbMlKE4jsie2cTwf/BcoASjATuIWmuKxvTvss=
571573
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.369 h1:bp9vCewHqy2rZMdl191LohVjIeb8udntY+AoSNO5eNA=
572574
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.369/go.mod h1:HlPCDRZ3zUnEXifuTNbCiEOwKn/2LmA6ziPkCr3VHsk=
575+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.370 h1:rzExiYuyKD9JhRAyQzoECLz8RRyT0bNgLxmDjPQxTRg=
576+
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke v1.0.370/go.mod h1:qs+mOMyRpnBtCNHBl70LMH826P1kbYDIjgX2+p5nqMg=
573577
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199 h1:6Yt74l4pA5QtzhwMNIEUt0spXdSBKH744DDqTHJOCP0=
574578
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vod v1.0.199/go.mod h1:Yw6OQ33z3s4k0HVYTNSffB12qOzEJ2Zf1Vj4+5S3sRs=
575579
github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/vpc v1.0.199 h1:UDZ59pvaqjDy2QIsMsv9hxm0BEJLmPIbHF1ms0MqaRk=

‎tencentcloud/data_source_tc_eks_cluster_credential.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@ func datasourceTencentCloudEksClusterCredential() *schema.Resource {
162162
Computed: true,
163163
Description: "Indicates whether the new internal/public network function.",
164164
},
165+
"kube_config": {
166+
Type: schema.TypeString,
167+
Computed: true,
168+
Description: "EKS cluster kubeconfig.",
169+
},
165170
},
166171
}
167172
}
@@ -191,6 +196,8 @@ func datasourceTencentCloudEksClusterCredentialRead(d *schema.ResourceData, meta
191196

192197
_ = d.Set("proxy_lb", info.ProxyLB)
193198

199+
_ = d.Set("kube_config", info.KubeConfig)
200+
194201
addresses := make([]map[string]interface{}, 0)
195202

196203
for i := range info.Addresses {
@@ -242,6 +249,7 @@ func datasourceTencentCloudEksClusterCredentialRead(d *schema.ResourceData, meta
242249
"public_lb": publicLB,
243250
"internal_lb": internalLB,
244251
"proxy_lb": info.ProxyLB,
252+
"kube_config": info.KubeConfig,
245253
}
246254

247255
if output, ok := d.GetOk("result_output_file"); ok {

‎tencentcloud/data_source_tc_eks_cluster_credential_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func TestAccTencentCloudEksClusterCredentialDataSource(t *testing.T) {
2323
resource.TestCheckResourceAttrSet("data.tencentcloud_eks_cluster_credential.cred", "public_lb.0.security_policies.#"),
2424
resource.TestCheckResourceAttr("data.tencentcloud_eks_cluster_credential.cred", "internal_lb.0.enabled", "true"),
2525
resource.TestCheckResourceAttrSet("data.tencentcloud_eks_cluster_credential.cred", "proxy_lb"),
26+
resource.TestCheckResourceAttrSet("data.tencentcloud_eks_cluster_credential.cred", "kube_config"),
2627
),
2728
},
2829
},

‎tencentcloud/resource_tc_eks_cluster.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,12 @@ func resourceTencentCloudEksCluster() *schema.Resource {
210210
Optional: true,
211211
Description: "Tags of EKS cluster.",
212212
},
213+
// computed
214+
"kube_config": {
215+
Type: schema.TypeString,
216+
Computed: true,
217+
Description: "EKS cluster kubeconfig.",
218+
},
213219
},
214220
}
215221
}
@@ -248,6 +254,8 @@ func resourceTencentcloudEKSClusterRead(d *schema.ResourceData, meta interface{}
248254
return err
249255
}
250256

257+
_ = d.Set("kube_config", info.KubeConfig)
258+
251259
if _, ok := d.GetOk("internal_lb"); ok && info.InternalLB != nil {
252260
internalLB := make([]map[string]interface{}, 0)
253261
lb := map[string]interface{}{

‎tencentcloud/resource_tc_eks_cluster_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ func TestAccTencentCloudEKSCluster_basic(t *testing.T) {
9191
resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "subnet_ids.0"),
9292
resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "vpc_id"),
9393
resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "service_subnet_id"),
94+
resource.TestCheckResourceAttrSet("tencentcloud_eks_cluster.foo", "kube_config"),
9495
),
9596
},
9697
{

‎tencentcloud/service_tencentcloud_eks.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ type EksClusterCredentialResponse struct {
4242

4343
InternalLB *tke.ClusterInternalLB `json:"InternalLB,omitempty" name:"InternalLB"`
4444

45+
KubeConfig string
46+
4547
ProxyLB bool
4648
}
4749

@@ -273,6 +275,7 @@ func (me *EksService) DescribeEKSClusterCredential(ctx context.Context, request
273275
PublicLB: body.PublicLB,
274276
InternalLB: body.InternalLB,
275277
ProxyLB: *body.ProxyLB,
278+
KubeConfig: *body.Kubeconfig,
276279
}
277280
}
278281

‎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.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/client.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/tke/v20180525/models.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)