Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-07-22 23:10:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

azure: fix ccm config with correct uami client_id (#2144)

Browse source 
* fix azure ccm config with correct uami client_id

* fix tests
This commit is contained in:
Adrian Stobbe 2023-08-01 08:40:44 +02:00 • committed by GitHub
parent 5fa50c7fcc
commit 26480016a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
cli/internal/terraform/terraform/azure/main.tf
View file

@ -38,6 +38,8 @@ locals {
// wildcard_lb_dns_name is the DNS name of the load balancer with a wildcard for the name.
// example: given "name-1234567890.location.cloudapp.azure.com" it will return "*.location.cloudapp.azure.com"
wildcard_lb_dns_name = replace(data.azurerm_public_ip.loadbalancer_ip.fqdn, "/^[^.]*\\./", "*.")
uai_resource_group = element(split("/", var.user_assigned_identity), 4) // deduce from format /$ID/resourceGroups/$RG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$NAME"
uai_name = element(split("/", var.user_assigned_identity), length(split("/", var.user_assigned_identity)) - 1) // deduce as above
}
resource "random_id" "uid" {
@ -280,6 +282,11 @@ module "scale_set_group" {
data "azurerm_subscription" "current" {
}
data "azurerm_user_assigned_identity" "uaid" {
name = local.uai_name
resource_group_name = local.uai_resource_group
}
moved {
from = module.scale_set_control_plane
to = module.scale_set_group["control_plane_default"]

4
cli/internal/terraform/terraform/azure/outputs.tf
View file

@ -28,8 +28,8 @@ output "loadbalancer_name" {
}
output "user_assigned_identity" {
value = var.user_assigned_identity
output "user_assigned_identity_client_id" {
value = data.azurerm_user_assigned_identity.uaid.client_id
}
output "resource_group" {

2
cli/internal/terraform/terraform/azure/variables.tf
View file

@ -59,7 +59,7 @@ variable "resource_group" {
}
variable "user_assigned_identity" {
type = string
description = "The name of the user assigned identity to attache to the nodes of the cluster."
description = "The name of the user assigned identity to attach to the nodes of the cluster. Should be of format: /subscriptions/$ID/resourceGroups/$RG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$NAME"
}
variable "custom_endpoint" {

3
cli/internal/terraform/terraform/iam/azure/outputs.tf
View file

@ -7,5 +7,6 @@ output "tenant_id" {
}
output "uami_id" {
value = azurerm_user_assigned_identity.identity_uami.id
description = "Outputs the id in the format: /$ID/resourceGroups/$RG/providers/Microsoft.ManagedIdentity/userAssignedIdentities/$NAME. Not to be confused with the client_id"
value = azurerm_user_assigned_identity.identity_uami.id
}