github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #71941 from andyzhangx/azuredisk-hardware-profile 

fix issue: vm sku restriction policy does not work in azure disk attach/detach
pull/564/head
Kubernetes Prow Robot 2018-12-11 05:09:31 -08:00 committed by GitHub
parent 9d80e7522a 7f3a66efb6
commit d8419f86aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/azure/azure_controller_standard.go
View File

@ -68,6 +68,7 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri
newVM := compute.VirtualMachine{ newVM := compute.VirtualMachine{
Location: vm.Location, Location: vm.Location,
VirtualMachineProperties: &compute.VirtualMachineProperties{ VirtualMachineProperties: &compute.VirtualMachineProperties{
HardwareProfile: vm.HardwareProfile,
StorageProfile: &compute.StorageProfile{ StorageProfile: &compute.StorageProfile{
DataDisks: &disks, DataDisks: &disks,
}, },
@ -132,6 +133,7 @@ func (as *availabilitySet) DetachDiskByName(diskName, diskURI string, nodeName t
newVM := compute.VirtualMachine{ newVM := compute.VirtualMachine{
Location: vm.Location, Location: vm.Location,
VirtualMachineProperties: &compute.VirtualMachineProperties{ VirtualMachineProperties: &compute.VirtualMachineProperties{
HardwareProfile: vm.HardwareProfile,
StorageProfile: &compute.StorageProfile{ StorageProfile: &compute.StorageProfile{
DataDisks: &disks, DataDisks: &disks,
}, },