diff --git a/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go b/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go index 206f8ae9d96..7db6ff0f187 100644 --- a/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go +++ b/plugin/pkg/admission/storage/persistentvolume/label/admission_test.go @@ -431,72 +431,6 @@ func Test_PVLAdmission(t *testing.T) { }, err: nil, }, - { - name: "Azure Disk PV labeled correctly", - handler: newPersistentVolumeLabel(), - pvlabeler: mockVolumeLabels(map[string]string{ - "a": "1", - "b": "2", - v1.LabelFailureDomainBetaZone: "1__2__3", - }), - preAdmissionPV: &api.PersistentVolume{ - ObjectMeta: metav1.ObjectMeta{ - Name: "azurepd", - Namespace: "myns", - }, - Spec: api.PersistentVolumeSpec{ - PersistentVolumeSource: api.PersistentVolumeSource{ - AzureDisk: &api.AzureDiskVolumeSource{ - DiskName: "123", - }, - }, - }, - }, - postAdmissionPV: &api.PersistentVolume{ - ObjectMeta: metav1.ObjectMeta{ - Name: "azurepd", - Namespace: "myns", - Labels: map[string]string{ - "a": "1", - "b": "2", - v1.LabelFailureDomainBetaZone: "1__2__3", - }, - }, - Spec: api.PersistentVolumeSpec{ - PersistentVolumeSource: api.PersistentVolumeSource{ - AzureDisk: &api.AzureDiskVolumeSource{ - DiskName: "123", - }, - }, - NodeAffinity: &api.VolumeNodeAffinity{ - Required: &api.NodeSelector{ - NodeSelectorTerms: []api.NodeSelectorTerm{ - { - MatchExpressions: []api.NodeSelectorRequirement{ - { - Key: "a", - Operator: api.NodeSelectorOpIn, - Values: []string{"1"}, - }, - { - Key: "b", - Operator: api.NodeSelectorOpIn, - Values: []string{"2"}, - }, - { - Key: v1.LabelFailureDomainBetaZone, - Operator: api.NodeSelectorOpIn, - Values: []string{"1", "2", "3"}, - }, - }, - }, - }, - }, - }, - }, - }, - err: nil, - }, { name: "vSphere PV non-conflicting affinity rules added", handler: newPersistentVolumeLabel(), diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 28e19990bfd..11f83b04cb5 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -40,7 +40,6 @@ import ( "fmt" "strconv" "strings" - "time" "github.com/onsi/ginkgo/v2" v1 "k8s.io/api/core/v1" @@ -1756,11 +1755,3 @@ func (v *azureFileVolume) DeleteVolume(ctx context.Context) { err := e2epv.DeleteShare(v.accountName, v.shareName) framework.ExpectNoError(err) } - -func (a *azureDiskDriver) GetTimeouts() *framework.TimeoutContext { - timeouts := framework.NewTimeoutContext() - timeouts.PodStart = time.Minute * 15 - timeouts.PodDelete = time.Minute * 15 - timeouts.PVDelete = time.Minute * 20 - return timeouts -} diff --git a/test/e2e/storage/in_tree_volumes.go b/test/e2e/storage/in_tree_volumes.go index 53764bcbc5c..5b81c682580 100644 --- a/test/e2e/storage/in_tree_volumes.go +++ b/test/e2e/storage/in_tree_volumes.go @@ -38,7 +38,6 @@ var testDrivers = []func() storageframework.TestDriver{ drivers.InitEmptydirDriver, drivers.InitCinderDriver, drivers.InitVSphereDriver, - drivers.InitAzureDiskDriver, drivers.InitAzureFileDriver, drivers.InitAwsDriver, drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectory),