Skip to content

Commit c1ca036

Browse files
committed
Refactor AKS kube_config output and update Helm provider configuration for consistency
1 parent c9a85da commit c1ca036

4 files changed

Lines changed: 17 additions & 13 deletions

File tree

terraform/modules/aks/outputs.tf

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ output "cluster_name" {
44
}
55

66
output "kube_config" {
7-
description = "The kube config of the AKS cluster"
8-
value = azurerm_kubernetes_cluster.this.kube_config_raw
7+
value = {
8+
host = azurerm_kubernetes_cluster.this.kube_config[0].host
9+
client_certificate = azurerm_kubernetes_cluster.this.kube_config[0].client_certificate
10+
client_key = azurerm_kubernetes_cluster.this.kube_config[0].client_key
11+
cluster_ca_certificate = azurerm_kubernetes_cluster.this.kube_config[0].cluster_ca_certificate
12+
}
913
}

terraform/modules/helm-deploy/main.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
provider "helm" {
2-
kubernetes {
3-
host = var.kube_config["host"]
4-
client_certificate = base64encode(var.kube_config["client_certificate"])
5-
client_key = base64encode(var.kube_config["client_key"])
6-
cluster_ca_certificate = base64encode(var.kube_config["cluster_ca_certificate"])
2+
kubernetes = {
3+
host = var.kube_config["host"]
4+
client_certificate = base64decode(var.kube_config["client_certificate"])
5+
client_key = base64decode(var.kube_config["client_key"])
6+
cluster_ca_certificate = base64decode(var.kube_config["cluster_ca_certificate"])
77
}
88
}
99

terraform/modules/network/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ resource "azurerm_network_security_group" "aks_nsg" {
2222
name = "${var.vnet_name}-aks-nsg"
2323
location = var.location
2424
resource_group_name = var.resource_group_name
25-
security_rule = {
25+
security_rule {
2626
name = "AllowKubeAPI"
2727
priority = 100
2828
direction = "Inbound"

terraform/shared/providers.tf

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ provider "kubernetes" {
1010
}
1111

1212
provider "helm" {
13-
kubernetes {
14-
host = var.kube_config["host"]
15-
client_certificate = base64decode(var.kube_config["client_certificate"])
16-
client_key = base64decode(var.kube_config["client_key"])
17-
cluster_ca_certificate = base64decode(var.kube_config["cluster_ca_certificate"])
13+
kubernetes = {
14+
host = azurerm_kubernetes_cluster.this.kube_config[0].host
15+
client_certificate = base64decode(azurerm_kubernetes_cluster.this.kube_config[0].client_certificate)
16+
client_key = base64decode(azurerm_kubernetes_cluster.this.kube_config[0].client_key)
17+
cluster_ca_certificate = base64decode(azurerm_kubernetes_cluster.this.kube_config[0].cluster_ca_certificate)
1818
}
1919
}

0 commit comments

Comments
 (0)