github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 03:11:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #96875 from Jiawei0227/externaldriver2

Browse Source 
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
commit 31d55baf63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/e2e/storage/external/BUILD vendored
View File

@ -15,6 +15,7 @@ go_library(
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/framework/config:go_default_library", "//test/e2e/framework/config:go_default_library",
"//test/e2e/framework/log:go_default_library",
"//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/pod:go_default_library",
"//test/e2e/framework/skipper:go_default_library", "//test/e2e/framework/skipper:go_default_library",
"//test/e2e/framework/volume:go_default_library", "//test/e2e/framework/volume:go_default_library",

12
test/e2e/storage/external/external.go vendored
View File

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

6
test/e2e/storage/external/external_test.go vendored
View File

@ -33,9 +33,9 @@ func TestDriverParameter(t *testing.T) {
SupportedFsType: sets.NewString( SupportedFsType: sets.NewString(
"", // Default fsType "", // Default fsType
), ),
}, SupportedSizeRange: e2evolume.SizeRange{
SupportedSizeRange: e2evolume.SizeRange{ Min: "10Gi",
Min: "5Gi", },
}, },
} }
testcases := []struct { testcases := []struct {

2
test/e2e/storage/external/testdata/driver.json vendored
View File

@ -1 +1 @@
{"DriverInfo": {"Name": "foo.example.com"}, "ShortName": "foo"} {"DriverInfo": {"Name": "foo.example.com", "SupportedSizeRange": { "Min": "10Gi"}}, "ShortName": "foo"}

2
test/e2e/storage/external/testdata/driver.yaml vendored
View File

@ -1,3 +1,5 @@
DriverInfo: DriverInfo:
Name: foo.example.com Name: foo.example.com
SupportedSizeRange:
Min: 10Gi
ShortName: foo ShortName: foo

3
test/e2e/storage/testsuites/base.go
View File

@ -236,7 +236,8 @@ func CreateVolumeResource(driver TestDriver, config *PerTestConfig, pattern test
driverVolumeSizeRange := dDriver.GetDriverInfo().SupportedSizeRange driverVolumeSizeRange := dDriver.GetDriverInfo().SupportedSizeRange
claimSize, err := getSizeRangesIntersection(testVolumeSizeRange, driverVolumeSizeRange) claimSize, err := getSizeRangesIntersection(testVolumeSizeRange, driverVolumeSizeRange)
framework.ExpectNoError(err, "determine intersection of test size range %+v and driver size range %+v", testVolumeSizeRange, driverVolumeSizeRange) framework.ExpectNoError(err, "determine intersection of test size range %+v and driver size range %+v", testVolumeSizeRange, driverVolumeSizeRange)
framework.Logf("Using claimSize:%s, test suite supported size:%v, driver(%s) supported size:%v ", claimSize, testVolumeSizeRange, dDriver.GetDriverInfo().Name, testVolumeSizeRange) framework.Logf("Using claimSize:%s, test suite supported size:%v, driver(%s) supported size:%v ",
claimSize, testVolumeSizeRange, dDriver.GetDriverInfo().Name, driverVolumeSizeRange)
r.Sc = dDriver.GetDynamicProvisionStorageClass(r.Config, pattern.FsType) r.Sc = dDriver.GetDynamicProvisionStorageClass(r.Config, pattern.FsType)
if pattern.BindingMode != "" { if pattern.BindingMode != "" {