Merge pull request #13788 from flouthoc/support-volume-opts

run, mount: allow setting driver specific option using `volume-opt=`

2 files changed, 17 insertions, 0 deletions

diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go
index 8a861077a..aa07de0af 100644
--- a/pkg/specgenutil/volumes.go
+++ b/pkg/specgenutil/volumes.go
@@ -523,6 +523,8 @@ func getNamedVolume(args []string) (*specgen.NamedVolume, error) {
 	for _, val := range args {
 		kv := strings.SplitN(val, "=", 2)
 		switch kv[0] {
+		case "volume-opt":
+			newVolume.Options = append(newVolume.Options, val)
 		case "ro", "rw":
 			if setRORW {
 				return nil, errors.Wrapf(optionArgError, "cannot pass 'ro' and 'rw' options more than once")
diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go
index 2a0101791..e37394619 100644
--- a/pkg/util/mountOpts.go
+++ b/pkg/util/mountOpts.go
@@ -57,6 +57,9 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string
 		switch splitOpt[0] {
 		case "O":
 			foundOverlay = true
+		case "volume-opt":
+			// Volume-opt should be relayed and processed by driver.
+			newOptions = append(newOptions, opt)
 		case "exec", "noexec":
 			if foundExec {
 				return nil, errors.Wrapf(ErrDupeMntOption, "only one of 'noexec' and 'exec' can be used")
@@ -175,3 +178,15 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string
 
 	return newOptions, nil
 }
+
+func ParseDriverOpts(option string) (string, string, error) {
+	token := strings.SplitN(option, "=", 2)
+	if len(token) != 2 {
+		return "", "", errors.Wrapf(ErrBadMntOption, "cannot parse driver opts")
+	}
+	opt := strings.SplitN(token[1], "=", 2)
+	if len(opt) != 2 {
+		return "", "", errors.Wrapf(ErrBadMntOption, "cannot parse driver opts")
+	}
+	return opt[0], opt[1], nil
+}