mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
fix: azure data disk should use same key as os disk by default
This commit is contained in:
parent
ec4f3e3064
commit
6e789e9d52
@ -46,6 +46,15 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri
|
||||
|
||||
if isManagedDisk {
|
||||
managedDisk := &compute.ManagedDiskParameters{ID: &diskURI}
|
||||
if diskEncryptionSetID == "" {
|
||||
if vm.StorageProfile.OsDisk != nil &&
|
||||
vm.StorageProfile.OsDisk.ManagedDisk != nil &&
|
||||
vm.StorageProfile.OsDisk.ManagedDisk.DiskEncryptionSet != nil &&
|
||||
vm.StorageProfile.OsDisk.ManagedDisk.DiskEncryptionSet.ID != nil {
|
||||
// set diskEncryptionSet as value of os disk by default
|
||||
diskEncryptionSetID = *vm.StorageProfile.OsDisk.ManagedDisk.DiskEncryptionSet.ID
|
||||
}
|
||||
}
|
||||
if diskEncryptionSetID != "" {
|
||||
managedDisk.DiskEncryptionSet = &compute.DiskEncryptionSetParameters{ID: &diskEncryptionSetID}
|
||||
}
|
||||
|
@ -48,6 +48,15 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
|
||||
}
|
||||
if isManagedDisk {
|
||||
managedDisk := &compute.ManagedDiskParameters{ID: &diskURI}
|
||||
if diskEncryptionSetID == "" {
|
||||
if vm.StorageProfile.OsDisk != nil &&
|
||||
vm.StorageProfile.OsDisk.ManagedDisk != nil &&
|
||||
vm.StorageProfile.OsDisk.ManagedDisk.DiskEncryptionSet != nil &&
|
||||
vm.StorageProfile.OsDisk.ManagedDisk.DiskEncryptionSet.ID != nil {
|
||||
// set diskEncryptionSet as value of os disk by default
|
||||
diskEncryptionSetID = *vm.StorageProfile.OsDisk.ManagedDisk.DiskEncryptionSet.ID
|
||||
}
|
||||
}
|
||||
if diskEncryptionSetID != "" {
|
||||
managedDisk.DiskEncryptionSet = &compute.DiskEncryptionSetParameters{ID: &diskEncryptionSetID}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user