Unverified Commit d218068f authored by Derek Nola's avatar Derek Nola Committed by GitHub

Adds a warning about editing to the containerd config.toml file (#7057)

* Add a warning to the config.toml file Signed-off-by: 's avatarDerek Nola <derek.nola@suse.com> Co-authored-by: 's avatarBrad Davidson <brad@oatmail.org>
parent c259403a
...@@ -69,6 +69,7 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error { ...@@ -69,6 +69,7 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error {
EnableUnprivileged: kernel.CheckKernelVersion(4, 11, 0), EnableUnprivileged: kernel.CheckKernelVersion(4, 11, 0),
PrivateRegistryConfig: privRegistries.Registry, PrivateRegistryConfig: privRegistries.Registry,
ExtraRuntimes: findNvidiaContainerRuntimes(os.DirFS(string(os.PathSeparator))), ExtraRuntimes: findNvidiaContainerRuntimes(os.DirFS(string(os.PathSeparator))),
Program: version.Program,
} }
selEnabled, selConfigured, err := selinuxStatus() selEnabled, selConfigured, err := selinuxStatus()
......
...@@ -19,4 +19,5 @@ type ContainerdConfig struct { ...@@ -19,4 +19,5 @@ type ContainerdConfig struct {
EnableUnprivileged bool EnableUnprivileged bool
PrivateRegistryConfig *registries.Registry PrivateRegistryConfig *registries.Registry
ExtraRuntimes map[string]ContainerdRuntimeConfig ExtraRuntimes map[string]ContainerdRuntimeConfig
Program string
} }
...@@ -8,6 +8,7 @@ import ( ...@@ -8,6 +8,7 @@ import (
) )
const ContainerdConfigTemplate = ` const ContainerdConfigTemplate = `
# File generated by {{ .Program }}. DO NOT EDIT. Use config.toml.tmpl instead.
version = 2 version = 2
[plugins."io.containerd.internal.v1.opt"] [plugins."io.containerd.internal.v1.opt"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment