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

create symlink from docker sock to where crictl in k3s is looking for the sock to use 

Signed-off-by: Brian Downs <brian.downs@gmail.com>
pull/1947/head
Brian Downs 2020-06-23 18:30:24 -07:00
parent 233e85ec05
commit 63dbf806df
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/agent/run.go
View File

@ -42,6 +42,12 @@ var (
func run(ctx context.Context, cfg cmds.Agent, proxy proxy.Proxy) error { func run(ctx context.Context, cfg cmds.Agent, proxy proxy.Proxy) error {
nodeConfig := config.Get(ctx, cfg, proxy) nodeConfig := config.Get(ctx, cfg, proxy)
if cfg.Docker {
if err := os.Symlink("/var/run/dockershim.sock", "/run/k3s/containerd/containerd.sock"); err != nil {
return err
}
}
if !nodeConfig.NoFlannel { if !nodeConfig.NoFlannel {
if err := flannel.Prepare(ctx, nodeConfig); err != nil { if err := flannel.Prepare(ctx, nodeConfig); err != nil {
return err return err