github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84958 from kkmsft/disk_fixes

Browse Source 
Azure : filter disks with ToBeDetached flag
This commit is contained in:
Kubernetes Prow Robot 2019-11-14 00:59:34 -08:00 committed by GitHub
commit 84318d9f40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
staging/src/k8s.io/legacy-cloud-providers/azure/BUILD
View File

@ -122,6 +122,7 @@ go_test(
"//vendor/github.com/Azure/go-autorest/autorest:go_default_library",
"//vendor/github.com/Azure/go-autorest/autorest/to:go_default_library",
"//vendor/github.com/stretchr/testify/assert:go_default_library",
"//vendor/k8s.io/utils/pointer:go_default_library",
"//vendor/sigs.k8s.io/yaml:go_default_library",
],
)

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

@ -300,3 +300,17 @@ func (c *controllerCommon) DisksAreAttached(diskNames []string, nodeName types.N
return attached, nil
}
func filterDetachingDisks(unfilteredDisks []compute.DataDisk) []compute.DataDisk {
filteredDisks := []compute.DataDisk{}
for _, disk := range unfilteredDisks {
if disk.ToBeDetached != nil && *disk.ToBeDetached {
if disk.Name != nil {
klog.V(2).Infof("Filtering disk: %s with ToBeDetached flag set.", *disk.Name)
}
} else {
filteredDisks = append(filteredDisks, disk)
}
}
return filteredDisks
}

36
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_common_test.go
View File

@ -26,6 +26,7 @@ import (
"github.com/stretchr/testify/assert"
"k8s.io/apimachinery/pkg/types"
"k8s.io/utils/pointer"
)
func TestCommonAttachDisk(t *testing.T) {
@ -248,3 +249,38 @@ func TestDisksAreAttached(t *testing.T) {
assert.Equal(t, test.expectedErr, err != nil, "TestCase[%d]: %s", i, test.desc)
}
}
func TestFilteredDetatchingDisks(t *testing.T) {
disks := []compute.DataDisk{
{
Name: pointer.StringPtr("DiskName1"),
ToBeDetached: pointer.BoolPtr(false),
ManagedDisk: &compute.ManagedDiskParameters{
ID: pointer.StringPtr("ManagedID"),
},
},
{
Name: pointer.StringPtr("DiskName2"),
ToBeDetached: pointer.BoolPtr(true),
},
{
Name: pointer.StringPtr("DiskName3"),
ToBeDetached: nil,
},
{
Name: pointer.StringPtr("DiskName4"),
ToBeDetached: nil,
},
}
filteredDisks := filterDetachingDisks(disks)
assert.Equal(t, 3, len(filteredDisks))
assert.Equal(t, "DiskName1", *filteredDisks[0].Name)
assert.Equal(t, "ManagedID", *filteredDisks[0].ManagedDisk.ID)
assert.Equal(t, "DiskName3", *filteredDisks[1].Name)
disks = []compute.DataDisk{}
filteredDisks = filterDetachingDisks(disks)
assert.Equal(t, 0, len(filteredDisks))
}

6
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_standard.go
View File

@ -42,8 +42,7 @@ func (as *availabilitySet) AttachDisk(isManagedDisk bool, diskName, diskURI stri
return err
}
disks := make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
disks := filterDetachingDisks(*vm.StorageProfile.DataDisks)
if isManagedDisk {
managedDisk := &compute.ManagedDiskParameters{ID: &diskURI}
@ -117,8 +116,7 @@ func (as *availabilitySet) DetachDisk(diskName, diskURI string, nodeName types.N
return nil, err
}
disks := make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
disks := filterDetachingDisks(*vm.StorageProfile.DataDisks)
bFoundDisk := false
for i, disk := range disks {

6
staging/src/k8s.io/legacy-cloud-providers/azure/azure_controller_vmss.go
View File

@ -44,8 +44,7 @@ func (ss *scaleSet) AttachDisk(isManagedDisk bool, diskName, diskURI string, nod
disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
disks = filterDetachingDisks(*vm.StorageProfile.DataDisks)
}
if isManagedDisk {
managedDisk := &compute.ManagedDiskParameters{ID: &diskURI}
@ -121,8 +120,7 @@ func (ss *scaleSet) DetachDisk(diskName, diskURI string, nodeName types.NodeName
disks := []compute.DataDisk{}
if vm.StorageProfile != nil && vm.StorageProfile.DataDisks != nil {
disks = make([]compute.DataDisk, len(*vm.StorageProfile.DataDisks))
copy(disks, *vm.StorageProfile.DataDisks)
disks = filterDetachingDisks(*vm.StorageProfile.DataDisks)
}
bFoundDisk := false
for i, disk := range disks {