Merge pull request openshift#8756 from jhixson74/OCPBUGS-36302

openshift-merge-bot[bot] · web-flow · commit 24907c38b046 · 2024-07-24T20:57:05.000Z
OCPBUGS-36302: pkg/asset/machines/azure: Don't set disk encryption set to nil
diff --git a/pkg/asset/machines/azure/azuremachines.go b/pkg/asset/machines/azure/azuremachines.go
@@ -184,7 +184,6 @@ func GenerateMachines(platform *azure.Platform, pool *types.MachinePool, userDat
 		})
 	}
 
-	osDisk.ManagedDisk.DiskEncryptionSet = nil
 	bootstrapAzureMachine := &capz.AzureMachine{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: capiutils.GenerateBoostrapMachineName(clusterID),

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,6 @@ func GenerateMachines(platform azure.Platform, pool types.MachinePool, userDat`
`184`	`184`	`})`
`185`	`185`	`}`
`186`	`186`
`187`		`- osDisk.ManagedDisk.DiskEncryptionSet = nil`
`188`	`187`	`bootstrapAzureMachine := &capz.AzureMachine{`
`189`	`188`	`ObjectMeta: metav1.ObjectMeta{`
`190`	`189`	`Name: capiutils.GenerateBoostrapMachineName(clusterID),`