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
eb72d509
Commit
eb72d509
authored
Nov 25, 2020
by
Akihiro Suda
Committed by
Brad Davidson
Dec 01, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pkg/agent/config: validate containerd snapshotter value
Signed-off-by:
Akihiro Suda
<
akihiro.suda.cz@hco.ntt.co.jp
>
parent
05f62554
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
0 deletions
+14
-0
config.go
pkg/agent/config/config.go
+14
-0
No files found.
pkg/agent/config/config.go
View file @
eb72d509
...
@@ -19,6 +19,8 @@ import (
...
@@ -19,6 +19,8 @@ import (
"strings"
"strings"
"time"
"time"
fuseoverlayfs
"github.com/AkihiroSuda/containerd-fuse-overlayfs"
"github.com/containerd/containerd/snapshots/overlay"
"github.com/pkg/errors"
"github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/proxy"
"github.com/rancher/k3s/pkg/agent/proxy"
"github.com/rancher/k3s/pkg/cli/cmds"
"github.com/rancher/k3s/pkg/cli/cmds"
...
@@ -429,6 +431,18 @@ func get(envInfo *cmds.Agent, proxy proxy.Proxy) (*config.Node, error) {
...
@@ -429,6 +431,18 @@ func get(envInfo *cmds.Agent, proxy proxy.Proxy) (*config.Node, error) {
nodeConfig
.
CACerts
=
info
.
CACerts
nodeConfig
.
CACerts
=
info
.
CACerts
nodeConfig
.
Containerd
.
Config
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"etc"
,
"containerd"
,
"config.toml"
)
nodeConfig
.
Containerd
.
Config
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"etc"
,
"containerd"
,
"config.toml"
)
nodeConfig
.
Containerd
.
Root
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"containerd"
)
nodeConfig
.
Containerd
.
Root
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"containerd"
)
switch
nodeConfig
.
AgentConfig
.
Snapshotter
{
case
"overlayfs"
:
if
err
:=
overlay
.
Supported
(
nodeConfig
.
Containerd
.
Root
);
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"
\"
overlayfs
\"
snapshotter cannot be enabled for %q, try using
\"
fuse-overlayfs
\"
or
\"
native
\"
"
,
nodeConfig
.
Containerd
.
Root
)
}
case
"fuse-overlayfs"
:
if
err
:=
fuseoverlayfs
.
Supported
(
nodeConfig
.
Containerd
.
Root
);
err
!=
nil
{
return
nil
,
errors
.
Wrapf
(
err
,
"
\"
fuse-overlayfs
\"
snapshotter cannot be enabled for %q, try using
\"
native
\"
"
,
nodeConfig
.
Containerd
.
Root
)
}
}
nodeConfig
.
Containerd
.
Opt
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"containerd"
)
nodeConfig
.
Containerd
.
Opt
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"containerd"
)
if
!
envInfo
.
Debug
{
if
!
envInfo
.
Debug
{
nodeConfig
.
Containerd
.
Log
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"containerd"
,
"containerd.log"
)
nodeConfig
.
Containerd
.
Log
=
filepath
.
Join
(
envInfo
.
DataDir
,
"agent"
,
"containerd"
,
"containerd.log"
)
...
...
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