Commit db2ba7b6 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson

Don't enable unprivileged ports and icmp on old kernels

parent 90016c20
...@@ -10,6 +10,7 @@ import ( ...@@ -10,6 +10,7 @@ import (
"time" "time"
"github.com/containerd/containerd" "github.com/containerd/containerd"
"github.com/docker/docker/pkg/parsers/kernel"
"github.com/k3s-io/k3s/pkg/agent/templates" "github.com/k3s-io/k3s/pkg/agent/templates"
util2 "github.com/k3s-io/k3s/pkg/agent/util" util2 "github.com/k3s-io/k3s/pkg/agent/util"
"github.com/k3s-io/k3s/pkg/cgroups" "github.com/k3s-io/k3s/pkg/cgroups"
...@@ -64,6 +65,7 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error { ...@@ -64,6 +65,7 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error {
DisableCgroup: disableCgroup, DisableCgroup: disableCgroup,
SystemdCgroup: cfg.AgentConfig.Systemd, SystemdCgroup: cfg.AgentConfig.Systemd,
IsRunningInUserNS: isRunningInUserNS, IsRunningInUserNS: isRunningInUserNS,
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))),
} }
......
...@@ -16,6 +16,7 @@ type ContainerdConfig struct { ...@@ -16,6 +16,7 @@ type ContainerdConfig struct {
DisableCgroup bool DisableCgroup bool
SystemdCgroup bool SystemdCgroup bool
IsRunningInUserNS bool IsRunningInUserNS bool
EnableUnprivileged bool
PrivateRegistryConfig *registries.Registry PrivateRegistryConfig *registries.Registry
ExtraRuntimes map[string]ContainerdRuntimeConfig ExtraRuntimes map[string]ContainerdRuntimeConfig
} }
...@@ -15,8 +15,8 @@ const ContainerdConfigTemplate = ` ...@@ -15,8 +15,8 @@ const ContainerdConfigTemplate = `
stream_server_address = "127.0.0.1" stream_server_address = "127.0.0.1"
stream_server_port = "10010" stream_server_port = "10010"
enable_selinux = {{ .NodeConfig.SELinux }} enable_selinux = {{ .NodeConfig.SELinux }}
enable_unprivileged_ports = true enable_unprivileged_ports = {{ .EnableUnprivileged }}
enable_unprivileged_icmp = true enable_unprivileged_icmp = {{ .EnableUnprivileged }}
{{- if .DisableCgroup}} {{- if .DisableCgroup}}
disable_cgroup = true disable_cgroup = true
......
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