Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
db2ba7b6
Commit
db2ba7b6
authored
Jul 28, 2022
by
Brad Davidson
Committed by
Brad Davidson
Jul 28, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't enable unprivileged ports and icmp on old kernels
Signed-off-by:
Brad Davidson
<
brad.davidson@rancher.com
>
parent
90016c20
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
2 deletions
+5
-2
config_linux.go
pkg/agent/containerd/config_linux.go
+2
-0
templates.go
pkg/agent/templates/templates.go
+1
-0
templates_linux.go
pkg/agent/templates/templates_linux.go
+2
-2
No files found.
pkg/agent/containerd/config_linux.go
View file @
db2ba7b6
...
@@ -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
))),
}
}
...
...
pkg/agent/templates/templates.go
View file @
db2ba7b6
...
@@ -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
}
}
pkg/agent/templates/templates_linux.go
View file @
db2ba7b6
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment