github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

fix: azure disk name matching issue

Browse Source
This commit is contained in:
andyzhangx 2019-08-21 12:59:19 +00:00
parent bfb69dbb8f
commit fbf430741c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common.go
View File

@ -20,6 +20,7 @@ import (
"context" "context"
"fmt" "fmt"
"path" "path"
"strings"
"time" "time"
"github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute" "github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2019-07-01/compute"
@ -206,9 +207,9 @@ func (c *controllerCommon) GetDiskLun(diskName, diskURI string, nodeName types.N
} }
for _, disk := range disks { for _, disk := range disks {
if disk.Lun != nil && (disk.Name != nil && diskName != "" && *disk.Name == diskName) || if disk.Lun != nil && (disk.Name != nil && diskName != "" && strings.EqualFold(*disk.Name, diskName)) ||
(disk.Vhd != nil && disk.Vhd.URI != nil && diskURI != "" && *disk.Vhd.URI == diskURI) || (disk.Vhd != nil && disk.Vhd.URI != nil && diskURI != "" && strings.EqualFold(*disk.Vhd.URI, diskURI)) ||
(disk.ManagedDisk != nil && *disk.ManagedDisk.ID == diskURI) { (disk.ManagedDisk != nil && strings.EqualFold(*disk.ManagedDisk.ID, diskURI)) {
// found the disk // found the disk
klog.V(2).Infof("azureDisk - find disk: lun %d name %q uri %q", *disk.Lun, diskName, diskURI) klog.V(2).Infof("azureDisk - find disk: lun %d name %q uri %q", *disk.Lun, diskName, diskURI)
return *disk.Lun, nil return *disk.Lun, nil
@ -260,7 +261,7 @@ func (c *controllerCommon) DisksAreAttached(diskNames []string, nodeName types.N
for _, disk := range disks { for _, disk := range disks {
for _, diskName := range diskNames { for _, diskName := range diskNames {
if disk.Name != nil && diskName != "" && *disk.Name == diskName { if disk.Name != nil && diskName != "" && strings.EqualFold(*disk.Name, diskName) {
attached[diskName] = true attached[diskName] = true
} }
} }