From d75fb0a25e50036682379da7e9b503c22f4c6056 Mon Sep 17 00:00:00 2001 From: Matt Boersma Date: Mon, 2 Oct 2023 13:00:23 -0600 Subject: [PATCH] =?UTF-8?q?Revert=20"=E2=8F=AA=20reverted=20userAssignedId?= =?UTF-8?q?enties=20logic=20based=20pn=20PR=20#2214"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 48768e459880f295f1fdd77c1c044024ffde11ec. --- controllers/azurejson_machine_controller.go | 9 ++++++++- controllers/azurejson_machinepool_controller.go | 9 ++++++++- controllers/azurejson_machinetemplate_controller.go | 9 ++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/controllers/azurejson_machine_controller.go b/controllers/azurejson_machine_controller.go index 9425b4561c7..880727d2caa 100644 --- a/controllers/azurejson_machine_controller.go +++ b/controllers/azurejson_machine_controller.go @@ -31,6 +31,7 @@ import ( "k8s.io/utils/ptr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/identities" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" @@ -214,7 +215,13 @@ func (r *AzureJSONMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req // Construct secret for this machine userAssignedIdentityIfExists := "" if len(azureMachine.Spec.UserAssignedIdentities) > 0 { - userAssignedIdentityIfExists = azureMachine.Spec.UserAssignedIdentities[0].ProviderID + // TODO: remove this ClientID lookup code when the fixed cloud-provider-azure is default + idsClient := identities.NewClient(clusterScope) + userAssignedIdentityIfExists, err = idsClient.GetClientID( + ctx, azureMachine.Spec.UserAssignedIdentities[0].ProviderID) + if err != nil { + return reconcile.Result{}, errors.Wrap(err, "failed to get user-assigned identity ClientID") + } } if azureMachine.Spec.Identity == infrav1.VMIdentityNone { diff --git a/controllers/azurejson_machinepool_controller.go b/controllers/azurejson_machinepool_controller.go index 1573ee59dba..d94c95f084b 100644 --- a/controllers/azurejson_machinepool_controller.go +++ b/controllers/azurejson_machinepool_controller.go @@ -30,6 +30,7 @@ import ( "k8s.io/utils/ptr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/identities" infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" @@ -174,7 +175,13 @@ func (r *AzureJSONMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl // Construct secret for this machine userAssignedIdentityIfExists := "" if len(azureMachinePool.Spec.UserAssignedIdentities) > 0 { - userAssignedIdentityIfExists = azureMachinePool.Spec.UserAssignedIdentities[0].ProviderID + // TODO: remove this ClientID lookup code when the fixed cloud-provider-azure is default + idsClient := identities.NewClient(clusterScope) + userAssignedIdentityIfExists, err = idsClient.GetClientID( + ctx, azureMachinePool.Spec.UserAssignedIdentities[0].ProviderID) + if err != nil { + return reconcile.Result{}, errors.Wrap(err, "failed to get user-assigned identity ClientID") + } } apiVersion, kind := infrav1.GroupVersion.WithKind("AzureMachinePool").ToAPIVersionAndKind() diff --git a/controllers/azurejson_machinetemplate_controller.go b/controllers/azurejson_machinetemplate_controller.go index fa37ecc5155..90675cdd5ea 100644 --- a/controllers/azurejson_machinetemplate_controller.go +++ b/controllers/azurejson_machinetemplate_controller.go @@ -30,6 +30,7 @@ import ( "k8s.io/utils/ptr" infrav1 "sigs.k8s.io/cluster-api-provider-azure/api/v1beta1" "sigs.k8s.io/cluster-api-provider-azure/azure/scope" + "sigs.k8s.io/cluster-api-provider-azure/azure/services/identities" "sigs.k8s.io/cluster-api-provider-azure/util/reconciler" "sigs.k8s.io/cluster-api-provider-azure/util/tele" clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" @@ -174,7 +175,13 @@ func (r *AzureJSONTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Re // Construct secret for this machine template userAssignedIdentityIfExists := "" if len(azureMachineTemplate.Spec.Template.Spec.UserAssignedIdentities) > 0 { - userAssignedIdentityIfExists = azureMachineTemplate.Spec.Template.Spec.UserAssignedIdentities[0].ProviderID + // TODO: remove this ClientID lookup code when the fixed cloud-provider-azure is default + idsClient := identities.NewClient(clusterScope) + userAssignedIdentityIfExists, err = idsClient.GetClientID( + ctx, azureMachineTemplate.Spec.Template.Spec.UserAssignedIdentities[0].ProviderID) + if err != nil { + return reconcile.Result{}, errors.Wrap(err, "failed to get user-assigned identity ClientID") + } } if azureMachineTemplate.Spec.Template.Spec.Identity == infrav1.VMIdentityNone {