Merge pull request #79760 from andyzhangx/automated-cherry-pick-of-#79529-upstream-release-1.14

Automated cherry pick of #79529: fix: change timeout value in csi plugin
k3s-v1.14.6
Kubernetes Prow Robot 2019-08-06 18:57:02 -07:00 committed by GitHub
commit 8c595af962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions

View File

@ -54,7 +54,7 @@ const (
// TODO (vladimirvivien) would be nice to name socket with a .sock extension // TODO (vladimirvivien) would be nice to name socket with a .sock extension
// for consistency. // for consistency.
csiAddrTemplate = "/var/lib/kubelet/plugins/%v/csi.sock" csiAddrTemplate = "/var/lib/kubelet/plugins/%v/csi.sock"
csiTimeout = 15 * time.Second csiTimeout = 2 * time.Minute
volNameSep = "^" volNameSep = "^"
volDataFileName = "vol_data.json" volDataFileName = "vol_data.json"
fsTypeBlockName = "block" fsTypeBlockName = "block"