Merge pull request kubernetes#80377 from davidz627/fix/testAMDefault

k8s-ci-robot · web-flow · commit 7dc5d1f0646e · 2019-07-22T23:52:55.000-07:00
Change default PVC AccessModes to RWO in test framework
diff --git a/test/e2e/framework/pv_util.go b/test/e2e/framework/pv_util.go
@@ -621,8 +621,8 @@ func MakePersistentVolumeClaim(cfg PersistentVolumeClaimConfig, ns string) *v1.P
 	// Specs are expected to match this test's PersistentVolume
 
 	if len(cfg.AccessModes) == 0 {
-		e2elog.Logf("AccessModes unspecified, default: all modes (RWO, RWX, ROX).")
-		cfg.AccessModes = append(cfg.AccessModes, v1.ReadWriteOnce, v1.ReadOnlyMany, v1.ReadOnlyMany)
+		e2elog.Logf("AccessModes unspecified, default: ReadWriteOnce (RWO).")
+		cfg.AccessModes = append(cfg.AccessModes, v1.ReadWriteOnce)
 	}
 
 	return &v1.PersistentVolumeClaim{

Original file line number	Diff line number	Diff line change
`@@ -621,8 +621,8 @@ func MakePersistentVolumeClaim(cfg PersistentVolumeClaimConfig, ns string) *v1.P`
`621`	`621`	`// Specs are expected to match this test's PersistentVolume`
`622`	`622`
`623`	`623`	`if len(cfg.AccessModes) == 0 {`
`624`		`- e2elog.Logf("AccessModes unspecified, default: all modes (RWO, RWX, ROX).")`
`625`		`- cfg.AccessModes = append(cfg.AccessModes, v1.ReadWriteOnce, v1.ReadOnlyMany, v1.ReadOnlyMany)`
	`624`	`+ e2elog.Logf("AccessModes unspecified, default: ReadWriteOnce (RWO).")`
	`625`	`+ cfg.AccessModes = append(cfg.AccessModes, v1.ReadWriteOnce)`
`626`	`626`	`}`
`627`	`627`
`628`	`628`	`return &v1.PersistentVolumeClaim{`