From 1eff6fd07e2908b495f97b30a95034e331c1b1b6 Mon Sep 17 00:00:00 2001 From: Grant Griffiths Date: Thu, 1 Jul 2021 13:59:17 -0700 Subject: [PATCH 1/2] CSI: Snapshot volume create should use vol.Secrets Signed-off-by: Grant Griffiths --- nomad/csi_endpoint.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nomad/csi_endpoint.go b/nomad/csi_endpoint.go index f642441a724c..30a223cc33a9 100644 --- a/nomad/csi_endpoint.go +++ b/nomad/csi_endpoint.go @@ -1124,7 +1124,7 @@ func (v *CSIVolume) CreateSnapshot(args *structs.CSISnapshotCreateRequest, reply cReq := &cstructs.ClientCSIControllerCreateSnapshotRequest{ ExternalSourceVolumeID: vol.ExternalID, Name: snap.Name, - Secrets: snap.Secrets, + Secrets: vol.Secrets, Parameters: snap.Parameters, } cReq.PluginID = plugin.ID From 2a10218626b661bb354b2c80833668ea457f86d1 Mon Sep 17 00:00:00 2001 From: Tim Gross Date: Fri, 2 Jul 2021 08:27:49 -0400 Subject: [PATCH 2/2] added changelog entry --- .changelog/10840.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .changelog/10840.txt diff --git a/.changelog/10840.txt b/.changelog/10840.txt new file mode 100644 index 000000000000..100676693bd6 --- /dev/null +++ b/.changelog/10840.txt @@ -0,0 +1,3 @@ +```release-note:bug +csi: Fixed a bug where volume secrets were not used for creating snapshots. +```