github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Do not deprecate no_pivot yet.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-08-05 15:12:50 -07:00
parent b213648c5b
commit 871a8b89c8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cri.go
View File

@ -148,6 +148,13 @@ func validateConfig(ctx context.Context, c *criconfig.Config) error {
} }
log.G(ctx).Warning("`systemd_cgroup` is deprecated, please use runtime `options` instead") log.G(ctx).Warning("`systemd_cgroup` is deprecated, please use runtime `options` instead")
} }
if c.NoPivot {
if c.ContainerdConfig.Runtimes[c.ContainerdConfig.DefaultRuntimeName].Type != plugin.RuntimeLinuxV1 {
return errors.Errorf("`no_pivot` only works for runtime %s", plugin.RuntimeLinuxV1)
}
// NoPivot can't be deprecated yet, because there is no alternative config option
// for `io.containerd.runtime.v1.linux`.
}
for _, r := range c.ContainerdConfig.Runtimes { for _, r := range c.ContainerdConfig.Runtimes {
if r.Engine != "" { if r.Engine != "" {
if r.Type != plugin.RuntimeLinuxV1 { if r.Type != plugin.RuntimeLinuxV1 {

2
docs/config.md
View File

@ -85,8 +85,6 @@ version = 2
# no_pivot disables pivot-root (linux only), required when running a container in a RamDisk with runc. # no_pivot disables pivot-root (linux only), required when running a container in a RamDisk with runc.
# This only works for runtime type "io.containerd.runtime.v1.linux". # This only works for runtime type "io.containerd.runtime.v1.linux".
# DEPRECATED: use Runtime.Options for runtime specific config for shim v2 runtimes.
# For runtime "io.containerd.runc.v1", use the option `NoPivotRoot`.
no_pivot = false no_pivot = false
# default_runtime_name is the default runtime name to use. # default_runtime_name is the default runtime name to use.

1
pkg/config/config.go
View File

@ -61,7 +61,6 @@ type ContainerdConfig struct {
Runtimes map[string]Runtime `toml:"runtimes" json:"runtimes"` Runtimes map[string]Runtime `toml:"runtimes" json:"runtimes"`
// NoPivot disables pivot-root (linux only), required when running a container in a RamDisk with runc // NoPivot disables pivot-root (linux only), required when running a container in a RamDisk with runc
// This only works for runtime type "io.containerd.runtime.v1.linux". // This only works for runtime type "io.containerd.runtime.v1.linux".
// DEPRECATED: use Runtime.Options instead. Remove when shim v1 is deprecated.
NoPivot bool `toml:"no_pivot" json:"noPivot"` NoPivot bool `toml:"no_pivot" json:"noPivot"`
} }