From a0eb69b73ee7323e95521c911128cef775f2b422 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Tue, 14 May 2019 18:41:27 -0700 Subject: [PATCH] Allow the volume argument to be specified multiple times Most k3d arguments are using in "stringSlice" style, allowing the argument to supplied multiple times. Currently "volume" is an exception to this style, require multiple arguments to be supplied in a single argument, separated by comma. This commit improve the k3d usability by improve the consistency of its argument style. --- cli/commands.go | 4 ++-- main.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cli/commands.go b/cli/commands.go index 622620ae..c8864a94 100644 --- a/cli/commands.go +++ b/cli/commands.go @@ -117,7 +117,7 @@ func CreateCluster(c *cli.Context) error { k3sServerArgs, env, c.String("name"), - strings.Split(c.String("volume"), ","), + c.StringSlice("volume"), portmap, ) if err != nil { @@ -184,7 +184,7 @@ func CreateCluster(c *cli.Context) error { k3sWorkerArgs, env, c.String("name"), - strings.Split(c.String("volume"), ","), + c.StringSlice("volume"), i, c.String("api-port"), portmap, diff --git a/main.go b/main.go index bac021e9..a703d5b0 100644 --- a/main.go +++ b/main.go @@ -56,9 +56,9 @@ func main() { Value: defaultK3sClusterName, Usage: "Set a name for the cluster", }, - cli.StringFlag{ + cli.StringSliceFlag{ Name: "volume, v", - Usage: "Mount one or more volumes into every node of the cluster (Docker notation: `source:destination[,source:destination]`)", + Usage: "Mount one or more volumes into every node of the cluster (Docker notation: `source:destination`)", }, cli.StringSliceFlag{ Name: "publish, add-port",