vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove now-unnecessary "conflicts with" language from create opts

Browse source 
Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2017-10-05 15:12:16 -04:00
parent 51b72d856d
commit 65542ee322
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
cmd/kpod/create.go
View file

@ -122,45 +122,45 @@ var createFlags = []cli.Flag{
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "dns", Name: "dns",
Usage: "Set custom DNS servers. Conflicts with --pod", Usage: "Set custom DNS servers",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "dns-search", Name: "dns-search",
Usage: "Set custom DNS search domains. Conflicts with --pod", Usage: "Set custom DNS search domains",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "dns-opt", Name: "dns-opt",
Usage: "Set custom DNS options. Conflicts with --pod", Usage: "Set custom DNS options",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "expose", Name: "expose",
Usage: "Expose a port. Conflicts with --pod", Usage: "Expose a port",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "hostname, h", Name: "hostname, h",
Usage: "Set hostname. Conflicts with --pod", Usage: "Set hostname",
Value: defaultHostname, Value: defaultHostname,
}, },
cli.StringFlag{ cli.StringFlag{
Name: "cgroup-parent", Name: "cgroup-parent",
Usage: "Set CGroup parent. Conflicts with --pod", Usage: "Set CGroup parent",
Value: defaultCgroupParent, Value: defaultCgroupParent,
}, },
cli.StringFlag{ cli.StringFlag{
Name: "sysctl", Name: "sysctl",
Usage: "Set namespaces SYSCTL. Conflicts with --pod", Usage: "Set namespaced SYSCTLs",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "user, u", Name: "user, u",
Usage: "Specify user to run as. Conflicts with --pod", Usage: "Specify user to run as",
}, },
cli.StringFlag{ cli.StringFlag{
Name: "group-add", Name: "group-add",
Usage: "Specify additional groups to run as. Conflicts with --pod", Usage: "Specify additional groups to run as",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "read-only", Name: "read-only",
Usage: "Make root filesystem read-only. Conflicts with --pod", Usage: "Make root filesystem read-only",
}, },
} }