mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 12:15:52 +00:00
Merge pull request #94885 from andyzhangx/detach-disk-azure-stack
fix: detach azure disk broken on Azure Stack
This commit is contained in:
commit
2cec7c61e4
@ -141,7 +141,11 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
|
||||
(disk.ManagedDisk != nil && diskURI != "" && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) {
|
||||
// found the disk
|
||||
klog.V(2).Infof("azureDisk - detach disk: name %q uri %q", diskName, diskURI)
|
||||
disks[i].ToBeDetached = to.BoolPtr(true)
|
||||
if strings.EqualFold(as.cloud.Environment.Name, "AZURESTACKCLOUD") {
|
||||
disks = append(disks[:i], disks[i+1:]...)
|
||||
} else {
|
||||
disks[i].ToBeDetached = to.BoolPtr(true)
|
||||
}
|
||||
bFoundDisk = true
|
||||
break
|
||||
}
|
||||
|
@ -143,7 +143,11 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
|
||||
(disk.ManagedDisk != nil && diskURI != "" && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) {
|
||||
// found the disk
|
||||
klog.V(2).Infof("azureDisk - detach disk: name %q uri %q", diskName, diskURI)
|
||||
disks[i].ToBeDetached = to.BoolPtr(true)
|
||||
if strings.EqualFold(ss.cloud.Environment.Name, "AZURESTACKCLOUD") {
|
||||
disks = append(disks[:i], disks[i+1:]...)
|
||||
} else {
|
||||
disks[i].ToBeDetached = to.BoolPtr(true)
|
||||
}
|
||||
bFoundDisk = true
|
||||
break
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user