This includes and is based on the changes of:
https://github.com/rook/rook/pull/14894
Co-authored-by: Blaine Gardner <b.blaine.gardner@gmail.com>
Co-authored-by: subhamkrai <srai@redhat.com>
Signed-off-by: Michael Adam <obnox@samba.org>
Fixes: #14894
(cherry picked from commit 9e725b6214)