Skip to content

Commit

Permalink
e2e: restore volume lifecycle checks for hostpath driver
Browse files Browse the repository at this point in the history
These tests were previously disabled to work around kubernetes#61446 and kubernetes#79980
kubernetes@f1e1f3a
  • Loading branch information
dobsonj committed Mar 25, 2022
1 parent 6fcbb2c commit caec4ad
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
9 changes: 0 additions & 9 deletions test/e2e/storage/drivers/csi.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ import (
"encoding/json"
"errors"
"fmt"
"regexp"
"strconv"
"strings"
"sync"
Expand Down Expand Up @@ -245,14 +244,6 @@ func (h *hostpathCSIDriver) PrepareTest(f *framework.Framework) (*storageframewo
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 regexp.MustCompile("should unmount if pod is.*deleted while kubelet is down").MatchString(ginkgo.CurrentGinkgoTestDescription().FullTestText) {
o.DriverContainerArguments = append(o.DriverContainerArguments, "--check-volume-lifecycle=false")
}

cleanup, err := utils.CreateFromManifests(config.Framework, driverNamespace, func(item interface{}) error {
if err := utils.PatchCSIDeployment(config.Framework, o, item); err != nil {
return err
Expand Down
10 changes: 0 additions & 10 deletions test/e2e/storage/testsuites/subpath.go
Original file line number Diff line number Diff line change
Expand Up @@ -342,23 +342,13 @@ func (s *subPathTestSuite) DefineTests(driver storageframework.TestDriver, patte
init()
defer cleanup()

if strings.HasPrefix(driverName, "hostPath") {
// TODO: This skip should be removed once #61446 is fixed
e2eskipper.Skipf("Driver %s does not support reconstruction, skipping", driverName)
}

testSubpathReconstruction(f, l.hostExec, l.pod, false)
})

ginkgo.It("should unmount if pod is force deleted while kubelet is down [Disruptive][Slow][LinuxOnly]", func() {
init()
defer cleanup()

if strings.HasPrefix(driverName, "hostPath") {
// TODO: This skip should be removed once #61446 is fixed
e2eskipper.Skipf("Driver %s does not support reconstruction, skipping", driverName)
}

testSubpathReconstruction(f, l.hostExec, l.pod, true)
})

Expand Down

0 comments on commit caec4ad

Please sign in to comment.