Merge pull request #2251 from motiejus/release-1.23-blkid

[btrfs csi driver] fix blkid argument

Author: k8s-ci-robot

pkg/gce-pd-csi-driver/node.go

@@ -538,7 +538,7 @@ func (ns *GCENodeServer) NodeStageVolume(ctx context.Context, req *csi.NodeStage
 
 	// Part 6: if configured, write sysfs values
 	if len(btrfsSysfs) > 0 {
-		args := []string{"--match-tag", "UUID", "--output", "value", stagingTargetPath}
+		args := []string{"--match-tag", "UUID", "--output", "value", devicePath}
 		cmd := ns.Mounter.Exec.Command("blkid", args...)
 		var stderr bytes.Buffer
 		cmd.SetStderr(&stderr)

pkg/gce-pd-csi-driver/node_test.go

@@ -958,7 +958,7 @@ func TestNodeStageVolume(t *testing.T) {
 				},
 				{
 					cmd:    "blkid",
-					args:   fmt.Sprintf("--match-tag UUID --output value %v", stagingPath),
+					args:   fmt.Sprintf("--match-tag UUID --output value /dev/disk/fake-path"),
 					stdout: btrfsUUID + "\n",
 				},
 			},
@@ -1027,7 +1027,7 @@ func TestNodeStageVolume(t *testing.T) {
 				},
 				{
 					cmd:    "blkid",
-					args:   fmt.Sprintf("--match-tag UUID --output value %v", stagingPath),
+					args:   fmt.Sprintf("--match-tag UUID --output value /dev/disk/fake-path"),
 					stdout: btrfsUUID + "\n",
 				},
 			},