Merge pull request #2781 from jrvaldes/e2e-fix-azure-machineset

Allow Azure machineSet to conditionally set ManagedIdentity

Author: openshift-merge-bot[bot]

hack/machineset.sh

@@ -176,7 +176,6 @@ $(get_spec $infraID $az $provider $byoh)
             version: $release
           kind: AzureMachineProviderSpec
           location: ${region}
-          managedIdentity: ${infraID}-identity
           metadata:
             creationTimestamp: null
           networkResourceGroup: ${infraID}-rg

test/e2e/providers/azure/azure.go

@@ -88,7 +88,6 @@ func (p *Provider) newAzureMachineProviderSpec(location string, zone string, win
 		},
 		PublicIP:             false,
 		Subnet:               fmt.Sprintf("%s-worker-subnet", p.InfrastructureName),
-		ManagedIdentity:      fmt.Sprintf("%s-identity", p.InfrastructureName),
 		Vnet:                 fmt.Sprintf("%s-vnet", p.InfrastructureName),
 		ResourceGroup:        p.PlatformStatus.Azure.ResourceGroupName,
 		NetworkResourceGroup: p.PlatformStatus.Azure.NetworkResourceGroupName,