Commit 22352d28 authored by Zach Loafman's avatar Zach Loafman Committed by GitHub

Revert "Add e2e tests for storageclass"

parent 1448b87d
...@@ -2562,21 +2562,6 @@ func (gce *GCECloud) GetAutoLabelsForPD(name string, zone string) (map[string]st ...@@ -2562,21 +2562,6 @@ func (gce *GCECloud) GetAutoLabelsForPD(name string, zone string) (map[string]st
return labels, nil return labels, nil
} }
// TestDisk checks that a disk has given type. It should be used only for
// testing!
func (gce *GCECloud) TestDisk(diskName, volumeType string) error {
disk, err := gce.getDiskByNameUnknownZone(diskName)
if err != nil {
return err
}
if strings.HasSuffix(disk.Type, volumeType) {
return nil
}
return fmt.Errorf("unexpected disk type %q, expected suffix %q", disk.Type, volumeType)
}
func (gce *GCECloud) AttachDisk(diskName string, nodeName types.NodeName, readOnly bool) error { func (gce *GCECloud) AttachDisk(diskName string, nodeName types.NodeName, readOnly bool) error {
instanceName := mapNodeNameToInstanceName(nodeName) instanceName := mapNodeNameToInstanceName(nodeName)
instance, err := gce.getInstanceByName(instanceName) instance, err := gce.getInstanceByName(instanceName)
...@@ -2660,7 +2645,6 @@ func (gce *GCECloud) findDiskByName(diskName string, zone string) (*gceDisk, err ...@@ -2660,7 +2645,6 @@ func (gce *GCECloud) findDiskByName(diskName string, zone string) (*gceDisk, err
Zone: lastComponent(disk.Zone), Zone: lastComponent(disk.Zone),
Name: disk.Name, Name: disk.Name,
Kind: disk.Kind, Kind: disk.Kind,
Type: disk.Type,
} }
return d, nil return d, nil
} }
...@@ -2781,7 +2765,6 @@ type gceDisk struct { ...@@ -2781,7 +2765,6 @@ type gceDisk struct {
Zone string Zone string
Name string Name string
Kind string Kind string
Type string
} }
// Gets the named instances, returning cloudprovider.InstanceNotFound if any instance is not found // Gets the named instances, returning cloudprovider.InstanceNotFound if any instance is not found
......
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