github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* Add a warning to the config.toml file

Signed-off-by: Derek Nola <derek.nola@suse.com>
Co-authored-by: Brad Davidson <brad@oatmail.org>
pull/7105/head
Derek Nola 2023-03-14 09:33:21 -07:00 committed by GitHub
parent 41c24b6a88
commit 7fee87d976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/agent/containerd/config_linux.go
View File

@ -66,6 +66,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()

1
pkg/agent/templates/templates.go
View File

@ -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
} }

1
pkg/agent/templates/templates_linux.go
View File

@ -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"]