Skip to content

OCPBUGS-74245: Azure - Fix system-assigned managed identity authentication #10355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jianlinliu wants to merge 1 commit into from
+8 −1
Closed

OCPBUGS-74245: Azure - Fix system-assigned managed identity authentication #10355

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion pkg/asset/manifests/azure/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,21 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
},
Spec: capz.AzureClusterIdentitySpec{
AllowedNamespaces: &capz.AllowedNamespaces{}, // Allow all namespaces.
ClientID: session.Credentials.ClientID,
TenantID: session.Credentials.TenantID,
},
}

switch session.AuthType {
case azic.ManagedIdentityAuth:
// Only set ClientID if it's provided (user-assigned managed identity).
// For system-assigned managed identity, ClientID is empty and CAPZ will
// use the identity automatically assigned to the VM.
if session.Credentials.ClientID != "" {
id.Spec.ClientID = session.Credentials.ClientID
}
id.Spec.Type = capz.UserAssignedMSI
case azic.ClientSecretAuth:
id.Spec.ClientID = session.Credentials.ClientID
id.Spec.Type = capz.ServicePrincipal
azureClientSecret := &corev1.Secret{
ObjectMeta: metav1.ObjectMeta{
Expand All @@ -296,6 +302,7 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
Namespace: azureClientSecret.Namespace,
}
case azic.ClientCertificateAuth:
id.Spec.ClientID = session.Credentials.ClientID
id.Spec.Type = capz.ServicePrincipalCertificate
id.Spec.CertPath = session.Credentials.ClientCertificatePath
}
Expand Down