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

Merge pull request #5362 from luthermonson/fix-containerd-npipe-122 

[1.22] Wrap containerd.New
pull/5399/head v1.22.8+k3s1
Luther Monson 2022-03-30 07:36:08 -07:00 committed by GitHub
parent d499e79e5c 4a97a7c8da
commit 21fed356e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/agent/containerd/config_linux.go
View File

@ -9,6 +9,7 @@ import (
"os"
"time"
"github.com/containerd/containerd"
"github.com/opencontainers/runc/libcontainer/userns"
"github.com/pkg/errors"
"github.com/rancher/k3s/pkg/agent/templates"
@ -112,3 +113,12 @@ func CriConnection(ctx context.Context, address string) (*grpc.ClientConn, error
return conn, nil
}
func Client(address string) (*containerd.Client, error) {
addr, _, err := util.GetAddressAndDialer("unix://" + address)
if err != nil {
return nil, err
}
return containerd.New(addr)
}

11
pkg/agent/containerd/config_windows.go
View File

@ -1,3 +1,4 @@
//go:build windows
// +build windows
package containerd
@ -8,6 +9,7 @@ import (
"os"
"time"
"github.com/containerd/containerd"
"github.com/rancher/k3s/pkg/agent/templates"
util2 "github.com/rancher/k3s/pkg/agent/util"
"github.com/rancher/k3s/pkg/daemons/config"
@ -87,3 +89,12 @@ func CriConnection(ctx context.Context, address string) (*grpc.ClientConn, error
return conn, nil
}
func Client(address string) (*containerd.Client, error) {
addr, _, err := util.GetAddressAndDialer(address)
if err != nil {
return nil, err
}
return containerd.New(addr)
}

2
pkg/agent/containerd/containerd.go
View File

@ -150,7 +150,7 @@ func preloadImages(ctx context.Context, cfg *config.Node) error {
return nil
}
client, err := containerd.New(cfg.Containerd.Address)
client, err := Client(cfg.Containerd.Address)
if err != nil {
return err
}