Skip to content

Commit 946519f

Browse files
committed
wip
1 parent 7dc399e commit 946519f

File tree

5 files changed

+38
-24
lines changed

5 files changed

+38
-24
lines changed

_examples/aks/aks-cluster/main.tf

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
resource "azurerm_resource_group" "test" {
1+
resource "azurerm_resource_group" "default" {
22
name = var.cluster_name
33
location = var.location
44
}
55

6-
resource "azurerm_kubernetes_cluster" "test" {
6+
resource "azurerm_kubernetes_cluster" "default" {
77
name = var.cluster_name
8-
location = azurerm_resource_group.test.location
9-
resource_group_name = azurerm_resource_group.test.name
8+
location = azurerm_resource_group.default.location
9+
resource_group_name = azurerm_resource_group.default.name
1010
dns_prefix = var.cluster_name
1111

1212
default_node_pool {
13-
name = "default"
13+
name = "test"
1414
node_count = 1
1515
vm_size = "Standard_DS2_v2"
1616
}
@@ -19,9 +19,3 @@ resource "azurerm_kubernetes_cluster" "test" {
1919
type = "SystemAssigned"
2020
}
2121
}
22-
23-
resource "local_file" "kubeconfig" {
24-
content = azurerm_kubernetes_cluster.test.kube_config_raw
25-
filename = "${path.root}/kubeconfig"
26-
}
27-
Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
output "client_cert" {
2-
value = azurerm_kubernetes_cluster.test.kube_config.0.client_certificate
2+
value = azurerm_kubernetes_cluster.default.kube_config.0.client_certificate
33
}
44

55
output "client_key" {
6-
value = azurerm_kubernetes_cluster.test.kube_config.0.client_key
6+
value = azurerm_kubernetes_cluster.default.kube_config.0.client_key
77
}
88

99
output "ca_cert" {
10-
value = azurerm_kubernetes_cluster.test.kube_config.0.cluster_ca_certificate
10+
value = azurerm_kubernetes_cluster.default.kube_config.0.cluster_ca_certificate
1111
}
1212

1313
output "endpoint" {
14-
value = azurerm_kubernetes_cluster.test.kube_config.0.host
14+
value = azurerm_kubernetes_cluster.default.kube_config.0.host
15+
}
16+
17+
output "cluster_id" {
18+
value = azurerm_kubernetes_cluster.default.id
1519
}

_examples/aks/kubernetes-config/main.tf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,8 @@ resource helm_release nginx_ingress {
5454
value = "ClusterIP"
5555
}
5656
}
57+
58+
resource "local_file" "kubeconfig" {
59+
content = var.kubeconfig
60+
filename = "${path.root}/kubeconfig"
61+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
variable "cluster_name" {
22
type = string
33
}
4+
5+
variable "kubeconfig" {
6+
type = string
7+
}

_examples/aks/main.tf

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ terraform {
22
required_providers {
33
kubernetes = {
44
source = "hashicorp/kubernetes"
5-
version = ">= 2.0.0"
5+
version = ">= 2.0.1"
66
}
77
azurerm = {
88
source = "hashicorp/azurerm"
@@ -15,19 +15,25 @@ terraform {
1515
}
1616
}
1717

18+
data "azurerm_kubernetes_cluster" "default" {
19+
depends_on = [module.aks-cluster.cluster_id] # refresh cluster state before reading
20+
name = local.cluster_name
21+
resource_group_name = local.cluster_name
22+
}
23+
1824
provider "kubernetes" {
19-
host = module.aks-cluster.endpoint
20-
client_key = base64decode(module.aks-cluster.client_key)
21-
client_certificate = base64decode(module.aks-cluster.client_cert)
22-
cluster_ca_certificate = base64decode(module.aks-cluster.ca_cert)
25+
host = data.azurerm_kubernetes_cluster.default.kube_config.0.host
26+
client_certificate = base64decode(data.azurerm_kubernetes_cluster.default.kube_config.0.client_certificate)
27+
client_key = base64decode(data.azurerm_kubernetes_cluster.default.kube_config.0.client_key)
28+
cluster_ca_certificate = base64decode(data.azurerm_kubernetes_cluster.default.kube_config.0.cluster_ca_certificate)
2329
}
2430

2531
provider "helm" {
2632
kubernetes {
27-
host = module.aks-cluster.endpoint
28-
client_key = base64decode(module.aks-cluster.client_key)
29-
client_certificate = base64decode(module.aks-cluster.client_cert)
30-
cluster_ca_certificate = base64decode(module.aks-cluster.ca_cert)
33+
host = data.azurerm_kubernetes_cluster.default.kube_config.0.host
34+
client_certificate = base64decode(data.azurerm_kubernetes_cluster.default.kube_config.0.client_certificate)
35+
client_key = base64decode(data.azurerm_kubernetes_cluster.default.kube_config.0.client_key)
36+
cluster_ca_certificate = base64decode(data.azurerm_kubernetes_cluster.default.kube_config.0.cluster_ca_certificate)
3137
}
3238
}
3339

@@ -47,4 +53,5 @@ module "kubernetes-config" {
4753
depends_on = [module.aks-cluster]
4854
source = "./kubernetes-config"
4955
cluster_name = local.cluster_name
56+
kubeconfig = data.azurerm_kubernetes_cluster.default.kube_config_raw
5057
}

0 commit comments

Comments
 (0)