github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

fix intree test

Browse Source 
remove azuredisk test
This commit is contained in:
andyzhangx 2023-03-06 14:38:33 +00:00
parent 5d0a54dcb5
commit 0b61e0d9f7
3 changed files with 0 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
plugin/pkg/admission/storage/persistentvolume/label/admission_test.go
View File

@ -431,72 +431,6 @@ func Test_PVLAdmission(t *testing.T) {
}, },
err: nil, 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", name: "vSphere PV non-conflicting affinity rules added",
handler: newPersistentVolumeLabel(), handler: newPersistentVolumeLabel(),

9
test/e2e/storage/drivers/in_tree.go
View File

@ -40,7 +40,6 @@ import (
"fmt" "fmt"
"strconv" "strconv"
"strings" "strings"
"time"
"github.com/onsi/ginkgo/v2" "github.com/onsi/ginkgo/v2"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
@ -1756,11 +1755,3 @@ func (v *azureFileVolume) DeleteVolume(ctx context.Context) {
err := e2epv.DeleteShare(v.accountName, v.shareName) err := e2epv.DeleteShare(v.accountName, v.shareName)
framework.ExpectNoError(err) 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
}

1
test/e2e/storage/in_tree_volumes.go
View File

@ -38,7 +38,6 @@ var testDrivers = []func() storageframework.TestDriver{
drivers.InitEmptydirDriver, drivers.InitEmptydirDriver,
drivers.InitCinderDriver, drivers.InitCinderDriver,
drivers.InitVSphereDriver, drivers.InitVSphereDriver,
drivers.InitAzureDiskDriver,
drivers.InitAzureFileDriver, drivers.InitAzureFileDriver,
drivers.InitAwsDriver, drivers.InitAwsDriver,
drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectory), drivers.InitLocalDriverWithVolumeType(utils.LocalVolumeDirectory),