Skip to content

K
k3s
Commit 55798b26 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51281 from verult/GCEDiskCleanup

Automatic merge from submit-queue (batch tested with PRs 43016, 50503, 51281, 51518, 51582). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Refactor: Moving disk-related cloud provider operations to gce_disks.go **What this PR does / why we need it**: The main GCE cloud provider code (pkg/cloudprovider/providers/gce/gce.go) should not contain disk-related operations. Moved them to gce_disks.go **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #51280 **Release note**: ```release-note NONE ``` /release-note-none /sig storage /assign @msau42 @bowei
parents 980a8e63 d285c5a9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
pkg/cloudprovider/providers/gce/gce_disks_test.go
View file @ 55798b26
...@@ -386,8 +386,8 @@ func TestDeleteDisk_SameDiskMultiZone(t *testing.T) { ...@@ -386,8 +386,8 @@ func TestDeleteDisk_SameDiskMultiZone(t *testing.T) {
} }
/* Act */ /* Act */
// DeleteDisk will call FakeServiceManager.GetDisk() with all zones, // DeleteDisk will call FakeServiceManager.GetDiskFromCloudProvider() with all zones,
// and FakeServiceManager.GetDisk() always returns a disk, // and FakeServiceManager.GetDiskFromCloudProvider() always returns a disk,
// so DeleteDisk thinks a disk with diskName exists in all zones. // so DeleteDisk thinks a disk with diskName exists in all zones.
err := gce.DeleteDisk(diskName) err := gce.DeleteDisk(diskName)
...@@ -662,7 +662,7 @@ func newFakeManager(gceProjectID string, gceRegion string) *FakeServiceManager { ...@@ -662,7 +662,7 @@ func newFakeManager(gceProjectID string, gceRegion string) *FakeServiceManager {
* Upon disk creation, disk info is stored in FakeServiceManager * Upon disk creation, disk info is stored in FakeServiceManager
* to be used by other tested methods. * to be used by other tested methods.
*/ */
func (manager *FakeServiceManager) CreateDisk( func (manager *FakeServiceManager) CreateDiskOnCloudProvider(
name string, name string,
sizeGb int64, sizeGb int64,
tagsStr string, tagsStr string,
...@@ -716,7 +716,7 @@ func (manager *FakeServiceManager) CreateDisk( ...@@ -716,7 +716,7 @@ func (manager *FakeServiceManager) CreateDisk(
* Upon disk creation, disk info is stored in FakeServiceManager * Upon disk creation, disk info is stored in FakeServiceManager
* to be used by other tested methods. * to be used by other tested methods.
*/ */
func (manager *FakeServiceManager) CreateRegionalDisk( func (manager *FakeServiceManager) CreateRegionalDiskOnCloudProvider(
name string, name string,
sizeGb int64, sizeGb int64,
tagsStr string, tagsStr string,
...@@ -746,7 +746,7 @@ func (manager *FakeServiceManager) CreateRegionalDisk( ...@@ -746,7 +746,7 @@ func (manager *FakeServiceManager) CreateRegionalDisk(
} }
} }
func (manager *FakeServiceManager) AttachDisk( func (manager *FakeServiceManager) AttachDiskOnCloudProvider(
disk *GCEDisk, disk *GCEDisk,
readWrite string, readWrite string,
instanceZone string, instanceZone string,
...@@ -767,7 +767,7 @@ func (manager *FakeServiceManager) AttachDisk( ...@@ -767,7 +767,7 @@ func (manager *FakeServiceManager) AttachDisk(
} }
} }
func (manager *FakeServiceManager) DetachDisk( func (manager *FakeServiceManager) DetachDiskOnCloudProvider(
instanceZone string, instanceZone string,
instanceName string, instanceName string,
devicePath string) (gceObject, error) { devicePath string) (gceObject, error) {
...@@ -789,7 +789,7 @@ func (manager *FakeServiceManager) DetachDisk( ...@@ -789,7 +789,7 @@ func (manager *FakeServiceManager) DetachDisk(
/** /**
* Gets disk info stored in the FakeServiceManager. * Gets disk info stored in the FakeServiceManager.
*/ */
func (manager *FakeServiceManager) GetDisk( func (manager *FakeServiceManager) GetDiskFromCloudProvider(
zone string, diskName string) (*GCEDisk, error) { zone string, diskName string) (*GCEDisk, error) {
if manager.zonalDisks[zone] == "" { if manager.zonalDisks[zone] == "" {
...@@ -814,7 +814,7 @@ func (manager *FakeServiceManager) GetDisk( ...@@ -814,7 +814,7 @@ func (manager *FakeServiceManager) GetDisk(
/** /**
* Gets disk info stored in the FakeServiceManager. * Gets disk info stored in the FakeServiceManager.
*/ */
func (manager *FakeServiceManager) GetRegionalDisk( func (manager *FakeServiceManager) GetRegionalDiskFromCloudProvider(
diskName string) (*GCEDisk, error) { diskName string) (*GCEDisk, error) {
if _, ok := manager.regionalDisks[diskName]; !ok { if _, ok := manager.regionalDisks[diskName]; !ok {
...@@ -839,7 +839,7 @@ func (manager *FakeServiceManager) GetRegionalDisk( ...@@ -839,7 +839,7 @@ func (manager *FakeServiceManager) GetRegionalDisk(
/** /**
* Disk info is removed from the FakeServiceManager. * Disk info is removed from the FakeServiceManager.
*/ */
func (manager *FakeServiceManager) DeleteDisk( func (manager *FakeServiceManager) DeleteDiskOnCloudProvider(
zone string, zone string,
disk string) (gceObject, error) { disk string) (gceObject, error) {
...@@ -861,7 +861,7 @@ func (manager *FakeServiceManager) DeleteDisk( ...@@ -861,7 +861,7 @@ func (manager *FakeServiceManager) DeleteDisk(
} }
} }
func (manager *FakeServiceManager) DeleteRegionalDisk( func (manager *FakeServiceManager) DeleteRegionalDiskOnCloudProvider(
disk string) (gceObject, error) { disk string) (gceObject, error) {
manager.deleteDiskCalled = true manager.deleteDiskCalled = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment