Skip to content

Commit ba157e8

Browse files
sadasuopenshift-cherrypick-robot
authored andcommitted
Azure CAPI: Add disk securityProfile to CAPI machine manifests
Upadte CAPZ's VMDiskSecurityProfile with the configuration provided in `platform.azure.osDisk.securityProfile`.
1 parent f6c334e commit ba157e8

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

pkg/asset/machines/azure/azuremachines.go

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ func GenerateMachines(clusterID, resourceGroup, subscriptionID string, in *Machi
9393
image = &capz.Image{ID: &imageID}
9494
}
9595

96+
// Set up OSDisk
9697
osDisk := capz.OSDisk{
9798
OSType: "Linux",
9899
DiskSizeGB: &mpool.DiskSizeGB,
@@ -101,16 +102,31 @@ func GenerateMachines(clusterID, resourceGroup, subscriptionID string, in *Machi
101102
},
102103
CachingType: "ReadWrite",
103104
}
104-
ultrassd := mpool.UltraSSDCapability == "Enabled"
105-
additionalCapabilities := &capz.AdditionalCapabilities{
106-
UltraSSDEnabled: &ultrassd,
107-
}
108105
if in.Pool.Platform.Azure.DiskEncryptionSet != nil {
109106
osDisk.ManagedDisk.DiskEncryptionSet = &capz.DiskEncryptionSetParameters{
110107
ID: mpool.OSDisk.DiskEncryptionSet.ToID(),
111108
}
112109
}
113110

111+
var diskSecurityProfile capz.VMDiskSecurityProfile
112+
if mpool.OSDisk.SecurityProfile != nil && mpool.OSDisk.SecurityProfile.SecurityEncryptionType != "" {
113+
diskSecurityProfile = capz.VMDiskSecurityProfile{
114+
SecurityEncryptionType: capz.SecurityEncryptionType(mpool.OSDisk.SecurityProfile.SecurityEncryptionType),
115+
}
116+
117+
if mpool.OSDisk.SecurityProfile.DiskEncryptionSet != nil {
118+
diskSecurityProfile.DiskEncryptionSet = &capz.DiskEncryptionSetParameters{
119+
ID: mpool.OSDisk.SecurityProfile.DiskEncryptionSet.ToID(),
120+
}
121+
}
122+
osDisk.ManagedDisk.SecurityProfile = &diskSecurityProfile
123+
}
124+
125+
ultrassd := mpool.UltraSSDCapability == "Enabled"
126+
additionalCapabilities := &capz.AdditionalCapabilities{
127+
UltraSSDEnabled: &ultrassd,
128+
}
129+
114130
machineProfile := generateSecurityProfile(mpool)
115131
securityProfile := &capz.SecurityProfile{
116132
EncryptionAtHost: machineProfile.EncryptionAtHost,

0 commit comments

Comments
 (0)