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

config: fix TOML tag for TolerateMissingHugePagesCgroupController

Browse Source 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-07-01 18:59:24 +09:00
parent 8e0b789c9a
commit b69d7bdc5f
No known key found for this signature in database
GPG Key ID: 49524C6F9F638F1A
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/config/config.go
View File

@ -235,7 +235,7 @@ type PluginConfig struct {
// TolerateMissingHugePagesCgroupController if set to false will error out on create/update // TolerateMissingHugePagesCgroupController if set to false will error out on create/update
// container requests with huge page limits if the cgroup controller for hugepages is not present. // container requests with huge page limits if the cgroup controller for hugepages is not present.
// This helps with supporting Kubernetes <=1.18 out of the box. (default is `true`) // This helps with supporting Kubernetes <=1.18 out of the box. (default is `true`)
TolerateMissingHugePagesCgroupController bool `toml:"tolerate_missing_hugepages_controller" json:"tolerateMissingHugePagesCgroupController"` TolerateMissingHugePagesCgroupController bool `toml:"tolerate_missing_hugepages_cgroup_controller" json:"tolerateMissingHugePagesCgroupController"`
// IgnoreImageDefinedVolumes ignores volumes defined by the image. Useful for better resource // IgnoreImageDefinedVolumes ignores volumes defined by the image. Useful for better resource
// isolation, security and early detection of issues in the mount configuration when using // isolation, security and early detection of issues in the mount configuration when using
// ReadOnlyRootFilesystem since containers won't silently mount a temporary volume. // ReadOnlyRootFilesystem since containers won't silently mount a temporary volume.

2
pkg/containerd/opts/spec_unix.go
View File

@ -461,7 +461,7 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
} else { } else {
if !tolerateMissingHugePagesCgroupController { if !tolerateMissingHugePagesCgroupController {
return errors.Errorf("huge pages limits are specified but hugetlb cgroup controller is missing. " + return errors.Errorf("huge pages limits are specified but hugetlb cgroup controller is missing. " +
"Please set tolerate_missing_hugepages_controller to `true` to ignore this error") "Please set tolerate_missing_hugepages_cgroup_controller to `true` to ignore this error")
} }
logrus.Warn("hugetlb cgroup controller is absent. skipping huge pages limits") logrus.Warn("hugetlb cgroup controller is absent. skipping huge pages limits")
} }