config: fix TOML tag for TolerateMissingHugePagesCgroupController

AkihiroSuda · AkihiroSuda · commit b69d7bdc5fa9 · 2020-07-02T13:38:19.000+09:00
Signed-off-by: Akihiro Suda &lt;akihiro.suda.cz@hco.ntt.co.jp&gt;
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -235,7 +235,7 @@ type PluginConfig struct {
 	// 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.
 	// 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
 	// isolation, security and early detection of issues in the mount configuration when using
 	// ReadOnlyRootFilesystem since containers won't silently mount a temporary volume.
diff --git a/pkg/containerd/opts/spec_unix.go b/pkg/containerd/opts/spec_unix.go
@@ -461,7 +461,7 @@ func WithResources(resources *runtime.LinuxContainerResources, tolerateMissingHu
 		} else {
 			if !tolerateMissingHugePagesCgroupController {
 				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")
 		}

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