From ded75eb09954c2a04b9fb45993d5ff3d23b1c457 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Fri, 1 Oct 2021 11:16:20 +0530 Subject: [PATCH] rbd: copyEncryptionConfig for thickProvisioned snap restore too This commit adds bugfix to copy encryption passphrase for thick provisioned PVC restored from snapshot. Signed-off-by: Rakshith R --- internal/rbd/controllerserver.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/internal/rbd/controllerserver.go b/internal/rbd/controllerserver.go index 8dd8e77d0..42346e2fb 100644 --- a/internal/rbd/controllerserver.go +++ b/internal/rbd/controllerserver.go @@ -603,6 +603,10 @@ func (cs *ControllerServer) createVolumeFromSnapshot( if err != nil { return status.Errorf(codes.Internal, "failed to mark %q thick-provisioned: %s", rbdVol, err) } + err = parentVol.copyEncryptionConfig(&rbdVol.rbdImage, true) + if err != nil { + return status.Errorf(codes.Internal, err.Error()) + } } else { // create clone image and delete snapshot err = rbdVol.cloneRbdImageFromSnapshot(ctx, rbdSnap, parentVol)