Merge pull request #92027 from juliantaylor/fix-rbd-expand

fix expanding rbd volumes without ceph.conf
This commit is contained in:
Kubernetes Prow Robot 2020-09-17 05:24:45 -07:00 committed by GitHub
commit 550b83b293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -712,7 +712,7 @@ func (util *rbdUtil) rbdInfo(b *rbdMounter) (int, error) {
//
klog.V(4).Infof("rbd: info %s using mon %s, pool %s id %s key %s", b.Image, mon, b.Pool, id, secret)
output, err = b.exec.Command("rbd",
"info", b.Image, "--pool", b.Pool, "-m", mon, "--id", id, "--key="+secret, "-k=/dev/null", "--format=json").CombinedOutput()
"info", b.Image, "--pool", b.Pool, "-m", mon, "--id", id, "--key="+secret, "-k=/dev/null", "--format=json").Output()
if err, ok := err.(*exec.Error); ok {
if err.Err == exec.ErrNotFound {