diff --git a/jx-requirements.yml.tpl b/jx-requirements.yml.tpl index cb33c09..071f428 100644 --- a/jx-requirements.yml.tpl +++ b/jx-requirements.yml.tpl @@ -17,6 +17,8 @@ spec: tenantId: ${dns_tenant_id} subscriptionId: ${dns_subscription_id} %{ endif } + clusterNodes: + clientID: ${kubelet_client_id} environments: - key: dev ingress: diff --git a/requirements.tf b/requirements.tf index 39e9a02..d23ba5b 100644 --- a/requirements.tf +++ b/requirements.tf @@ -14,6 +14,7 @@ locals { log_container_name = module.storage.log_container_name storage_account_name = module.storage.storage_account_name vault_installed = module.jx-boot.vault_instance_release_id != "" ? true : false + kubelet_client_id = module.cluster.kubelet_identity_id }) jx_requirements_split_content = split("\n", local.jx_requirements_interpolated_content) diff --git a/terraform-jx-cluster-aks/cluster/outputs.tf b/terraform-jx-cluster-aks/cluster/outputs.tf index d996402..7c4838b 100644 --- a/terraform-jx-cluster-aks/cluster/outputs.tf +++ b/terraform-jx-cluster-aks/cluster/outputs.tf @@ -25,6 +25,9 @@ output "node_resource_group" { output "kubelet_identity_id" { value = azurerm_kubernetes_cluster.aks.kubelet_identity.0.object_id } +output "kubelet_client_id" { + value = azurerm_kubernetes_cluster.aks.kubelet_identity.0.client_id +} output "kubernetes_cluster" { value = azurerm_kubernetes_cluster.aks } diff --git a/terraform-jx-cluster-aks/outputs.tf b/terraform-jx-cluster-aks/outputs.tf index be8b405..997fae0 100644 --- a/terraform-jx-cluster-aks/outputs.tf +++ b/terraform-jx-cluster-aks/outputs.tf @@ -4,6 +4,9 @@ output "connect" { output "kubelet_identity_id" { value = module.cluster.kubelet_identity_id } +output "kubelet_client_id" { + value = module.cluster.kubelet_client_id +} output "cluster_endpoint" { value = module.cluster.cluster_endpoint }