Merge pull request #104863 from pohly/restore-volume-life-cycle-check

e2e: restore volume lifecycle check for most tests
This commit is contained in:
Kubernetes Prow Robot 2021-09-20 12:46:24 -07:00 committed by GitHub
commit 06796b7c7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -235,14 +235,24 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframewo
// testsuites/volumelimits.go `should support volume limits` // testsuites/volumelimits.go `should support volume limits`
// test. // test.
"--maxvolumespernode=10", "--maxvolumespernode=10",
// Disable volume lifecycle checks due to issue #103651 // Enable volume lifecycle checks, to report failure if
// TODO: enable this check once issue is resolved for csi-host-path driver. // the volume is not unpublished / unstaged correctly.
"--check-volume-lifecycle=false", "--check-volume-lifecycle=true",
}, },
ProvisionerContainerName: "csi-provisioner", ProvisionerContainerName: "csi-provisioner",
SnapshotterContainerName: "csi-snapshotter", SnapshotterContainerName: "csi-snapshotter",
NodeName: node.Name, NodeName: node.Name,
} }
// Disable volume lifecycle checks due to issue #103651 for the one
// test that it breaks.
// TODO: enable this check once issue is resolved for csi-host-path driver
// (https://github.com/kubernetes/kubernetes/pull/104858).
if strings.Contains(ginkgo.CurrentGinkgoTestDescription().FullTestText,
"should unmount if pod is gracefully deleted while kubelet is down") {
o.DriverContainerArguments = append(o.DriverContainerArguments, "--check-volume-lifecycle=false")
}
cleanup, err := utils.CreateFromManifests(config.Framework, driverNamespace, func(item interface{}) error { cleanup, err := utils.CreateFromManifests(config.Framework, driverNamespace, func(item interface{}) error {
if err := utils.PatchCSIDeployment(config.Framework, o, item); err != nil { if err := utils.PatchCSIDeployment(config.Framework, o, item); err != nil {
return err return err