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
aa5098f2
Commit
aa5098f2
authored
Aug 21, 2018
by
Akihiro Suda
Committed by
Darren Shepherd
Aug 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubelet/cm: ignore sysctl error when running in userns
Signed-off-by:
Akihiro Suda
<
akihiro.suda.cz@hco.ntt.co.jp
>
parent
d91c36e2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
BUILD
pkg/kubelet/cm/BUILD
+2
-0
container_manager_linux.go
pkg/kubelet/cm/container_manager_linux.go
+6
-1
No files found.
pkg/kubelet/cm/BUILD
View file @
aa5098f2
...
@@ -88,6 +88,8 @@ go_library(
...
@@ -88,6 +88,8 @@ go_library(
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups/fs:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/cgroups/systemd:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/configs:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/configs:go_default_library",
"//vendor/github.com/opencontainers/runc/libcontainer/system:go_default_library",
"//vendor/k8s.io/utils/io:go_default_library",
"//vendor/k8s.io/utils/path:go_default_library",
"//vendor/k8s.io/utils/path:go_default_library",
],
],
"@io_bazel_rules_go//go/platform:nacl": [
"@io_bazel_rules_go//go/platform:nacl": [
...
...
pkg/kubelet/cm/container_manager_linux.go
View file @
aa5098f2
...
@@ -32,6 +32,7 @@ import (
...
@@ -32,6 +32,7 @@ import (
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/cgroups/fs"
"github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/configs"
libcontainersystem
"github.com/opencontainers/runc/libcontainer/system"
"k8s.io/klog"
"k8s.io/klog"
v1
"k8s.io/api/core/v1"
v1
"k8s.io/api/core/v1"
...
@@ -399,7 +400,11 @@ func setupKernelTunables(option KernelTunableBehavior) error {
...
@@ -399,7 +400,11 @@ func setupKernelTunables(option KernelTunableBehavior) error {
klog
.
V
(
2
)
.
Infof
(
"Updating kernel flag: %v, expected value: %v, actual value: %v"
,
flag
,
expectedValue
,
val
)
klog
.
V
(
2
)
.
Infof
(
"Updating kernel flag: %v, expected value: %v, actual value: %v"
,
flag
,
expectedValue
,
val
)
err
=
sysctl
.
SetSysctl
(
flag
,
expectedValue
)
err
=
sysctl
.
SetSysctl
(
flag
,
expectedValue
)
if
err
!=
nil
{
if
err
!=
nil
{
errList
=
append
(
errList
,
err
)
if
libcontainersystem
.
RunningInUserNS
()
{
klog
.
Warningf
(
"Updating kernel flag failed: %v: %v (running in UserNS)"
,
flag
,
err
)
}
else
{
errList
=
append
(
errList
,
err
)
}
}
}
}
}
}
}
...
...
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