mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-17 15:50:10 +00:00
fix expanding rbd volumes without ceph.conf
Ignore stderr of rbd info --format=json as without a ceph.conf it will print messages about no configuration onto stderr which break the json parsing. The actual json information the function wants is always on stdout. Closes: gh-88643 Signed-off-by: Julian Taylor <juliantaylor108@gmail.com>
This commit is contained in:
parent
a8e43038a4
commit
da01c8d472
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user