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

Update kpod commands to use getConfig()

Browse source 
Make getStore() take a config struct from which it pulls the store
options, then update the kpod commands so that they call getConfig()
and pass the config into getStore()

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
This commit is contained in:
Ryan Cole 2017-07-27 13:18:07 -04:00
parent 0c8f106ee8
commit a8b6f2ad8a
12 changed files with 55 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cmd/kpod/info.go
View file

@ -10,6 +10,7 @@ import (
"github.com/docker/docker/pkg/system"
"github.com/ghodss/yaml"
"github.com/pkg/errors"
"github.com/urfave/cli"
)
@ -125,9 +126,14 @@ func hostInfo(c *cli.Context) (string, map[string]interface{}, error) {
// top-level "store" info
func storeInfo(c *cli.Context) (string, map[string]interface{}, error) {
store, err := getStore(c)
storeStr := "store"
config, err := getConfig(c)
if err != nil {
return "store", nil, err
return storeStr, nil, errors.Wrapf(err, "Could not get config")
}
store, err := getStore(config)
if err != nil {
return storeStr, nil, err
}
// lets say storage driver in use, number of images, number of containers
@ -150,7 +156,7 @@ func storeInfo(c *cli.Context) (string, map[string]interface{}, error) {
"number": len(containers),
}
}
return "store", info, nil
return storeStr, info, nil
}
func readKernelVersion() (string, error) {