Deprecate --storage-option for --storage-opt
container-storage-setup (Formerly docker-storage-setup) is being converted to run with container runtimes outside of docker. Specifically we want to use it with CRI-O/ocid. It does not know anything about the container runtimes it is generating options for, so it generates them based on the storage CLI of docker. I see no reason to have the storage option for ocid to be different and we can just depracate the option for now. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
parent
3690f4c971
commit
cf5b0ae57f
4 changed files with 9 additions and 9 deletions
|
@ -57,8 +57,8 @@ func mergeConfig(config *server.Config, ctx *cli.Context) error {
|
||||||
if ctx.GlobalIsSet("storage-driver") {
|
if ctx.GlobalIsSet("storage-driver") {
|
||||||
config.Storage = ctx.GlobalString("storage-driver")
|
config.Storage = ctx.GlobalString("storage-driver")
|
||||||
}
|
}
|
||||||
if ctx.GlobalIsSet("storage-option") {
|
if ctx.GlobalIsSet("storage-opt") {
|
||||||
config.StorageOptions = ctx.GlobalStringSlice("storage-option")
|
config.StorageOptions = ctx.GlobalStringSlice("storage-opt")
|
||||||
}
|
}
|
||||||
if ctx.GlobalIsSet("default-transport") {
|
if ctx.GlobalIsSet("default-transport") {
|
||||||
config.DefaultTransport = ctx.GlobalString("default-transport")
|
config.DefaultTransport = ctx.GlobalString("default-transport")
|
||||||
|
@ -175,7 +175,7 @@ func main() {
|
||||||
Usage: "storage driver",
|
Usage: "storage driver",
|
||||||
},
|
},
|
||||||
cli.StringSliceFlag{
|
cli.StringSliceFlag{
|
||||||
Name: "storage-option",
|
Name: "storage-opt",
|
||||||
Usage: "storage driver option",
|
Usage: "storage driver option",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
|
|
|
@ -21,7 +21,7 @@ ocid - Enable OCI Kubernetes Container Runtime daemon
|
||||||
[**--runtime**=[*value*]]
|
[**--runtime**=[*value*]]
|
||||||
[**--signature-policy**=[*value*]]
|
[**--signature-policy**=[*value*]]
|
||||||
[**--storage-driver**=[*value*]]
|
[**--storage-driver**=[*value*]]
|
||||||
[**--storage-option**=[*value*]]
|
[**--storage-opt**=[*value*]]
|
||||||
[**--selinux**]
|
[**--selinux**]
|
||||||
[**--seccomp-profile**=[*value*]]
|
[**--seccomp-profile**=[*value*]]
|
||||||
[**--apparmor-profile**=[*value*]]
|
[**--apparmor-profile**=[*value*]]
|
||||||
|
@ -101,7 +101,7 @@ ocid is meant to provide an integration path between OCI conformant runtimes and
|
||||||
**--storage-driver**
|
**--storage-driver**
|
||||||
OCI storage driver (default: "devicemapper")
|
OCI storage driver (default: "devicemapper")
|
||||||
|
|
||||||
**--storage-option**
|
**--storage-opt**
|
||||||
OCI storage driver option (no default)
|
OCI storage driver option (no default)
|
||||||
|
|
||||||
**--cni-config-dir**=""
|
**--cni-config-dir**=""
|
||||||
|
|
|
@ -47,7 +47,7 @@ func main() {
|
||||||
Usage: "storage driver",
|
Usage: "storage driver",
|
||||||
},
|
},
|
||||||
cli.StringSliceFlag{
|
cli.StringSliceFlag{
|
||||||
Name: "storage-option",
|
Name: "storage-opt",
|
||||||
Usage: "storage option",
|
Usage: "storage option",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
|
@ -72,7 +72,7 @@ func main() {
|
||||||
rootDir := c.GlobalString("root")
|
rootDir := c.GlobalString("root")
|
||||||
runrootDir := c.GlobalString("runroot")
|
runrootDir := c.GlobalString("runroot")
|
||||||
storageDriver := c.GlobalString("storage-driver")
|
storageDriver := c.GlobalString("storage-driver")
|
||||||
storageOptions := c.GlobalStringSlice("storage-option")
|
storageOptions := c.GlobalStringSlice("storage-opt")
|
||||||
imageName := c.GlobalString("image-name")
|
imageName := c.GlobalString("image-name")
|
||||||
sourceBinary := c.GlobalString("source-binary")
|
sourceBinary := c.GlobalString("source-binary")
|
||||||
imageBinary := c.GlobalString("image-binary")
|
imageBinary := c.GlobalString("image-binary")
|
||||||
|
|
|
@ -42,7 +42,7 @@ func main() {
|
||||||
Usage: "storage driver",
|
Usage: "storage driver",
|
||||||
},
|
},
|
||||||
cli.StringSliceFlag{
|
cli.StringSliceFlag{
|
||||||
Name: "storage-option",
|
Name: "storage-opt",
|
||||||
Usage: "storage option",
|
Usage: "storage option",
|
||||||
},
|
},
|
||||||
cli.StringFlag{
|
cli.StringFlag{
|
||||||
|
@ -76,7 +76,7 @@ func main() {
|
||||||
rootDir := c.GlobalString("root")
|
rootDir := c.GlobalString("root")
|
||||||
runrootDir := c.GlobalString("runroot")
|
runrootDir := c.GlobalString("runroot")
|
||||||
storageDriver := c.GlobalString("storage-driver")
|
storageDriver := c.GlobalString("storage-driver")
|
||||||
storageOptions := c.GlobalStringSlice("storage-option")
|
storageOptions := c.GlobalStringSlice("storage-opt")
|
||||||
signaturePolicy := c.GlobalString("signature-policy")
|
signaturePolicy := c.GlobalString("signature-policy")
|
||||||
imageName := c.GlobalString("image-name")
|
imageName := c.GlobalString("image-name")
|
||||||
addName := c.GlobalString("add-name")
|
addName := c.GlobalString("add-name")
|
||||||
|
|
Loading…
Reference in a new issue