diff --git a/test/e2e/storage/external/BUILD b/test/e2e/storage/external/BUILD index e6d2f68ea2c..2dd0d19e770 100644 --- a/test/e2e/storage/external/BUILD +++ b/test/e2e/storage/external/BUILD @@ -15,6 +15,7 @@ go_library( "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//test/e2e/framework: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/skipper:go_default_library", "//test/e2e/framework/volume:go_default_library", diff --git a/test/e2e/storage/external/external.go b/test/e2e/storage/external/external.go index fa682ab2012..b41de5b4fb1 100644 --- a/test/e2e/storage/external/external.go +++ b/test/e2e/storage/external/external.go @@ -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 diff --git a/test/e2e/storage/external/external_test.go b/test/e2e/storage/external/external_test.go index fbeeb55b9b6..82be68370db 100644 --- a/test/e2e/storage/external/external_test.go +++ b/test/e2e/storage/external/external_test.go @@ -33,9 +33,9 @@ func TestDriverParameter(t *testing.T) { SupportedFsType: sets.NewString( "", // Default fsType ), - }, - SupportedSizeRange: e2evolume.SizeRange{ - Min: "5Gi", + SupportedSizeRange: e2evolume.SizeRange{ + Min: "10Gi", + }, }, } testcases := []struct { diff --git a/test/e2e/storage/external/testdata/driver.json b/test/e2e/storage/external/testdata/driver.json index 3bf761098b2..25628b17341 100644 --- a/test/e2e/storage/external/testdata/driver.json +++ b/test/e2e/storage/external/testdata/driver.json @@ -1 +1 @@ -{"DriverInfo": {"Name": "foo.example.com"}, "ShortName": "foo"} +{"DriverInfo": {"Name": "foo.example.com", "SupportedSizeRange": { "Min": "10Gi"}}, "ShortName": "foo"} diff --git a/test/e2e/storage/external/testdata/driver.yaml b/test/e2e/storage/external/testdata/driver.yaml index cab58186c44..a75922313fd 100644 --- a/test/e2e/storage/external/testdata/driver.yaml +++ b/test/e2e/storage/external/testdata/driver.yaml @@ -1,3 +1,5 @@ DriverInfo: Name: foo.example.com + SupportedSizeRange: + Min: 10Gi ShortName: foo diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go index dcc0ab2b311..0c81367234c 100644 --- a/test/e2e/storage/testsuites/base.go +++ b/test/e2e/storage/testsuites/base.go @@ -236,7 +236,8 @@ func CreateVolumeResource(driver TestDriver, config *PerTestConfig, pattern test driverVolumeSizeRange := dDriver.GetDriverInfo().SupportedSizeRange claimSize, err := getSizeRangesIntersection(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) if pattern.BindingMode != "" {