Merge pull request #1116 from bryan-cox/HOSTEDCP-1872

OCPBUGS-42004: Set the Managed Identity client ID

Author: openshift-merge-bot[bot]

pkg/storage/azure/azure.go

@@ -370,13 +370,14 @@ func (d *driver) storageAccountsClient(cfg *Azure, environment autorestazure.Env
 		cred azcore.TokenCredential
 		err  error
 	)
-	// MSI Override for ARO HCP
-	msi := os.Getenv("AZURE_MSI_AUTHENTICATION")
-	if msi == "true" {
+	// Managed Identity Override for ARO HCP
+	managedIdentityClientID := os.Getenv("ARO_HCP_MI_CLIENT_ID")
+	if managedIdentityClientID != "" {
 		options := azidentity.ManagedIdentityCredentialOptions{
 			ClientOptions: azcore.ClientOptions{
 				Cloud: cloudConfig,
 			},
+			ID: azidentity.ClientID(managedIdentityClientID),
 		}
 
 		var err error

pkg/storage/azure/azureclient/azureclient.go

@@ -84,13 +84,14 @@ func New(opts *Options) (*Client, error) {
 	if creds == nil {
 		var err error
 
-		// MSI Override for ARO HCP
-		msi := os.Getenv("AZURE_MSI_AUTHENTICATION")
-		if msi == "true" {
+		// Managed Identity Override for ARO HCP
+		managedIdentityClientID := os.Getenv("ARO_HCP_MI_CLIENT_ID")
+		if managedIdentityClientID != "" {
 			options := azidentity.ManagedIdentityCredentialOptions{
 				ClientOptions: azcore.ClientOptions{
 					Cloud: cloudConfig,
 				},
+				ID: azidentity.ClientID(managedIdentityClientID),
 			}
 			creds, err = azidentity.NewManagedIdentityCredential(&options)
 			if err != nil {