Skip to content

Commit 545a0d9

Browse files
committed
apply works
1 parent daf8be4 commit 545a0d9

File tree

4 files changed

+12
-24
lines changed

4 files changed

+12
-24
lines changed
Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
1-
output "cluster_ca_cert" {
2-
value = azurerm_kubernetes_cluster.test.kube_config.0.client_certificate
3-
}
4-
5-
output "cluster_endpoint" {
6-
value = azurerm_kubernetes_cluster.test.kube_config.0.host
7-
}
8-
9-
output "cluster_name" {
1+
output "cluster_id" {
102
value = azurerm_kubernetes_cluster.test.id
113
}
124

135
output "data_disk_uri" {
146
value = azurerm_managed_disk.test.id
157
}
16-

_examples/aks/kubernetes-config/main.tf

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,27 @@ provider "azurerm" {
77
# This data source fetches new authentication certificates.
88
# Alternatively, use `terraform refresh` to fetch them manually.
99
data "azurerm_kubernetes_cluster" "main" {
10+
depends_on = [var.cluster_id]
1011
name = var.cluster_name
1112
resource_group_name = var.cluster_name
1213
}
1314

1415
provider "kubernetes" {
15-
host = var.cluster_endpoint
16-
cluster_ca_certificate = var.cluster_ca_cert
16+
host = data.azurerm_kubernetes_cluster.main.kube_config.0.host
1717
client_key = base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.client_key)
1818
client_certificate = base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.client_certificate)
19+
cluster_ca_certificate = base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.cluster_ca_certificate)
1920
}
2021

2122
resource "kubernetes_namespace" "test" {
22-
depends_on = [var.cluster_name]
23+
depends_on = [var.cluster_id]
2324
metadata {
2425
name = "test"
2526
}
2627
}
2728

2829
resource "kubernetes_persistent_volume" "test" {
29-
depends_on = [var.cluster_name]
30+
depends_on = [var.cluster_id]
3031
metadata {
3132
name = "test"
3233
}
@@ -47,6 +48,7 @@ depends_on = [var.cluster_name]
4748
}
4849

4950
resource "kubernetes_deployment" "test" {
51+
depends_on = [var.cluster_id]
5052
metadata {
5153
name = "test"
5254
namespace= kubernetes_namespace.test.metadata.0.name
@@ -87,9 +89,9 @@ resource "kubernetes_deployment" "test" {
8789

8890
provider "helm" {
8991
kubernetes {
90-
host = var.cluster_endpoint
91-
client_certificate = var.cluster_ca_cert
92+
host = data.azurerm_kubernetes_cluster.main.kube_config.0.host
9293
client_key = base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.client_key)
94+
client_certificate = base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.client_certificate)
9395
cluster_ca_certificate = base64decode(data.azurerm_kubernetes_cluster.main.kube_config.0.cluster_ca_certificate)
9496
}
9597
}

_examples/aks/kubernetes-config/variables.tf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
variable "cluster_ca_cert" {
2-
type = string
3-
}
4-
5-
variable "cluster_endpoint" {
1+
variable "cluster_id" {
62
type = string
73
}
84

_examples/aks/main.tf

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ module "aks-cluster" {
3030
# any Kubernetes resources are created.
3131
module "kubernetes-config" {
3232
source = "./kubernetes-config"
33-
cluster_name = module.aks-cluster.cluster_name
34-
cluster_endpoint = module.aks-cluster.cluster_endpoint
35-
cluster_ca_cert = module.aks-cluster.cluster_ca_cert
33+
cluster_id = module.aks-cluster.cluster_id
34+
cluster_name = local.cluster_name
3635
data_disk_uri = module.aks-cluster.data_disk_uri
3736
}

0 commit comments

Comments
 (0)