Merge pull request #96875 from Jiawei0227/externaldriver2

Remove external driver duplicated misleading SupportedSizeRange
This commit is contained in:
Kubernetes Prow Robot
2020-12-08 20:04:24 -08:00
committed by GitHub
6 changed files with 14 additions and 12 deletions

View File

@@ -35,6 +35,7 @@ import (
klog "k8s.io/klog/v2"
"k8s.io/kubernetes/test/e2e/framework"
e2econfig "k8s.io/kubernetes/test/e2e/framework/config"
e2elog "k8s.io/kubernetes/test/e2e/framework/log"
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
e2evolume "k8s.io/kubernetes/test/e2e/framework/volume"
@@ -123,10 +124,6 @@ type driverDefinition struct {
ReadOnly bool
}
// SupportedSizeRange defines the desired size of dynamically
// provisioned volumes.
SupportedSizeRange e2evolume.SizeRange
// ClientNodeName selects a specific node for scheduling test pods.
// Can be left empty. Most drivers should not need this and instead
// use topology to ensure that pods land on the right node(s).
@@ -166,6 +163,7 @@ func (t testDriverParameter) Set(filename string) error {
// to define the tests.
func AddDriverDefinition(filename string) error {
driver, err := loadDriverDefinition(filename)
e2elog.Logf("Driver loaded from path [%s]: %+v", filename, driver)
if err != nil {
return err
}
@@ -195,9 +193,9 @@ func loadDriverDefinition(filename string) (*driverDefinition, error) {
SupportedFsType: sets.NewString(
"", // Default fsType
),
},
SupportedSizeRange: e2evolume.SizeRange{
Min: "5Gi",
SupportedSizeRange: e2evolume.SizeRange{
Min: "5Gi",
},
},
}
// TODO: strict checking of the file content once https://github.com/kubernetes/kubernetes/pull/71589