Skip to content

Commit 704abf4

Browse files
committed
feat(terraform): enhance Kubernetes provider configuration with detailed cluster data sources for common and folo clusters
1 parent 2d9d9cd commit 704abf4

1 file changed

Lines changed: 20 additions & 7 deletions

File tree

ack.tf

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ locals {
55
}
66
}
77

8+
data "alicloud_cs_kubernetes_clusters" "common" {
9+
ids = local.cluster_ids.common
10+
enable_details = true
11+
}
12+
13+
data "alicloud_cs_kubernetes_clusters" "folo" {
14+
ids = local.cluster_ids.folo
15+
enable_details = true
16+
}
17+
818
data "alicloud_cs_cluster_credential" "common" {
919
cluster_id = local.cluster_ids.common
1020
}
@@ -14,17 +24,20 @@ data "alicloud_cs_cluster_credential" "folo" {
1424
}
1525

1626
provider "kubernetes" {
17-
alias = "ack-common"
18-
host = data.alicloud_cs_cluster_credential.common.kube_config.host
19-
token = data.alicloud_cs_cluster_credential.common.kube_config.token
20-
cluster_ca_certificate = base64decode(data.alicloud_cs_cluster_credential.common.kube_config.cluster_ca_certificate)
27+
alias = "ack-common"
28+
29+
host = data.alicloud_cs_kubernetes_clusters.common.connections.api_server_internet
30+
client_certificate = data.alicloud_cs_cluster_credential.common.certificate_authority.client_cert
31+
client_key = data.alicloud_cs_cluster_credential.common.certificate_authority.client_key
32+
cluster_ca_certificate = data.alicloud_cs_cluster_credential.common.certificate_authority.cluster_cert
2133
}
2234

2335
provider "kubernetes" {
2436
alias = "ack-folo"
25-
host = data.alicloud_cs_cluster_credential.folo.kube_config.host
26-
token = data.alicloud_cs_cluster_credential.folo.kube_config.token
27-
cluster_ca_certificate = base64decode(data.alicloud_cs_cluster_credential.folo.kube_config.cluster_ca_certificate)
37+
host = data.alicloud_cs_kubernetes_clusters.folo.connections.api_server_internet
38+
client_certificate = data.alicloud_cs_cluster_credential.folo.certificate_authority.client_cert
39+
client_key = data.alicloud_cs_cluster_credential.folo.certificate_authority.client_key
40+
cluster_ca_certificate = data.alicloud_cs_cluster_credential.folo.certificate_authority.cluster_cert
2841
}
2942

3043
module "folo-argocd-manager" {

0 commit comments

Comments
 (0)