From 56dcdcf3403babf4c36920b2470e1361aeae59c6 Mon Sep 17 00:00:00 2001 From: Marcin Maciaszczyk Date: Thu, 5 Oct 2023 13:44:20 +0200 Subject: [PATCH] add and use aso_assigned_identity_client_id output --- bootstrap/helm/cluster-api-provider-azure/values.yaml.tpl | 1 + bootstrap/terraform/azure-bootstrap/deps.yaml | 1 + bootstrap/terraform/azure-bootstrap/outputs.tf | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/bootstrap/helm/cluster-api-provider-azure/values.yaml.tpl b/bootstrap/helm/cluster-api-provider-azure/values.yaml.tpl index e8875bbe5..d2e586964 100644 --- a/bootstrap/helm/cluster-api-provider-azure/values.yaml.tpl +++ b/bootstrap/helm/cluster-api-provider-azure/values.yaml.tpl @@ -2,3 +2,4 @@ cluster-api-provider-azure: asoControllerSettings: azureSubscriptionId: {{ .Context.SubscriptionId }} azureTenantId: {{ .Context.TenantId }} + azureClientId: {{ importValue "Terraform" "aso_assigned_identity_client_id" }} \ No newline at end of file diff --git a/bootstrap/terraform/azure-bootstrap/deps.yaml b/bootstrap/terraform/azure-bootstrap/deps.yaml index 321dde70a..323657a80 100644 --- a/bootstrap/terraform/azure-bootstrap/deps.yaml +++ b/bootstrap/terraform/azure-bootstrap/deps.yaml @@ -17,6 +17,7 @@ spec: kubelet_msi_id: kubelet_msi_id node_resource_group: node_resource_group capz_assigned_identity_client_id: capz_assigned_identity_client_id + aso_assigned_identity_client_id: aso_assigned_identity_client_id provider_wirings: cluster: module.azure-bootstrap.cluster provider_vsn: "0.1.4" diff --git a/bootstrap/terraform/azure-bootstrap/outputs.tf b/bootstrap/terraform/azure-bootstrap/outputs.tf index efe752e56..b2e16e4f0 100644 --- a/bootstrap/terraform/azure-bootstrap/outputs.tf +++ b/bootstrap/terraform/azure-bootstrap/outputs.tf @@ -31,3 +31,7 @@ output "network" { output "capz_assigned_identity_client_id" { value = azurerm_user_assigned_identity.capz.client_id } + +output "aso_assigned_identity_client_id" { + value = azurerm_user_assigned_identity.aso.client_id +}