Skip to content

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

Merge pull request #34961 from kubernetes/revert-32485-e2e-provisioning-class

Automatic merge from submit-queue Revert "Add e2e tests for storageclass" Reverts kubernetes/kubernetes#32485 This PR broke the multizone tests on GCE/GKE, and broke the AWS tests, e.g.: * https://k8s-testgrid.appspot.com/google-aws * https://k8s-testgrid.appspot.com/google-gke#gke-multizone * https://k8s-testgrid.appspot.com/google-gke#gci-gke-multizone Suggest revert. Fixes #34794 cc @k8s-oncall
parents 4a13431a 22352d28
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 17 deletions
pkg/cloudprovider/providers/gce/gce.go
View file @ 1da120ca
...@@ -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