mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #66414 from verult/flex-detach-delay
Automatic merge from submit-queue (batch tested with PRs 58755, 66414). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Flexvolume e2e test for attachable driver: Introduced delay after pod… … deletion to ensure detach happens **What this PR does / why we need it**: Removes the possibility of verbose logs from controller manager caused by this issue. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #66408 **Release note**: ```release-note NONE ```
This commit is contained in:
commit
d2721eccd9
@ -47,6 +47,7 @@ const (
|
||||
gciVolumePluginDir = "/home/kubernetes/flexvolume"
|
||||
gciVolumePluginDirLegacy = "/etc/srv/kubernetes/kubelet-plugins/volume/exec"
|
||||
gciVolumePluginDirVersion = "1.10.0"
|
||||
detachTimeout = 10 * time.Second
|
||||
)
|
||||
|
||||
// testFlexVolume tests that a client pod using a given flexvolume driver
|
||||
@ -253,6 +254,9 @@ var _ = utils.SIGDescribe("Flexvolumes", func() {
|
||||
framework.ExpectNoError(err, "Failed to wait client pod terminated: %v", err)
|
||||
}
|
||||
|
||||
// Detach might occur after pod deletion. Wait before deleting driver.
|
||||
time.Sleep(detachTimeout)
|
||||
|
||||
By(fmt.Sprintf("uninstalling flexvolume %s from node %s", driverInstallAs, node.Name))
|
||||
uninstallFlex(cs, &node, "k8s", driverInstallAs)
|
||||
By(fmt.Sprintf("uninstalling flexvolume %s from master", driverInstallAs))
|
||||
|
Loading…
Reference in New Issue
Block a user