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

Follow up changes on secrets patch

Browse source 
Deleted mounts.conf file and moved the secrets mount paths
to a list (default-mounts) in crio.conf

Signed-off-by: umohnani8 <umohnani@redhat.com>
This commit is contained in:
umohnani8 2017-10-12 14:14:42 -04:00
parent 5b41729b6c
commit d1aea31786
8 changed files with 35 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libkpod/config.go
View file

@ -24,10 +24,6 @@ const (
cgroupManager = oci.CgroupfsCgroupsManager
lockPath = "/run/crio.lock"
containerExitsDir = oci.ContainerExitsDir
// DefaultMountsFile holds the default mount paths in the form "host:container"
DefaultMountsFile = "/usr/share/containers/mounts.conf"
// OverrideMountsFile holds the override mount paths in the form "host:container"
OverrideMountsFile = "/etc/containers/mounts.conf"
)
// Config represents the entire set of configuration values that can be set for
@ -149,8 +145,9 @@ type RuntimeConfig struct {
// HooksDirPath location of oci hooks config files
HooksDirPath string `toml:"hooks_dir_path"`
// DefaultMountsPath location of the default mounts file
DefaultMountsPath string `toml:"default_mounts_path"`
// DefaultMounts is the list of mounts to be mounted for each container
// The format of each mount is "host-path:container-path"
DefaultMounts []string `toml:"default_mounts"`
// Hooks List of hooks to run with container
Hooks map[string]HookParams
@ -295,7 +292,6 @@ func DefaultConfig() *Config {
ContainerExitsDir: containerExitsDir,
HooksDirPath: DefaultHooksDirPath,
LogSizeMax: DefaultLogSizeMax,
DefaultMountsPath: DefaultMountsFile,
},
ImageConfig: ImageConfig{
DefaultTransport: defaultTransport,