mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-03 17:30:00 +00:00
Merge pull request #121346 from carlory/fix-120840
fix volume conformance e2e test break other test
This commit is contained in:
commit
0a36bcd11d
@ -452,8 +452,9 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
|
||||
|
||||
pvNamePrefix := ns + "-"
|
||||
pvHostPathConfig := e2epv.PersistentVolumeConfig{
|
||||
NamePrefix: pvNamePrefix,
|
||||
Labels: volLabel,
|
||||
NamePrefix: pvNamePrefix,
|
||||
Labels: volLabel,
|
||||
StorageClassName: ns,
|
||||
PVSource: v1.PersistentVolumeSource{
|
||||
CSI: &v1.CSIPersistentVolumeSource{
|
||||
Driver: csiDriver.Name,
|
||||
@ -461,6 +462,9 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
|
||||
},
|
||||
},
|
||||
}
|
||||
pvcConfig := e2epv.PersistentVolumeClaimConfig{
|
||||
StorageClassName: &ns,
|
||||
}
|
||||
|
||||
numPVs, numPVCs := 1, 1
|
||||
pvols, claims, err = e2epv.CreatePVsPVCs(ctx, numPVs, numPVCs, c, f.Timeouts, ns, pvHostPathConfig, pvcConfig)
|
||||
@ -680,6 +684,10 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
|
||||
},
|
||||
}
|
||||
|
||||
pvcConfig := e2epv.PersistentVolumeClaimConfig{
|
||||
StorageClassName: &ns,
|
||||
}
|
||||
|
||||
numPVs, numPVCs := 1, 1
|
||||
pvols, claims, err = e2epv.CreatePVsPVCs(ctx, numPVs, numPVCs, c, f.Timeouts, ns, pvHostPathConfig, pvcConfig)
|
||||
framework.ExpectNoError(err, "Failed to create the requested storage resources")
|
||||
|
Loading…
Reference in New Issue
Block a user