Merge pull request #5365 from luthermonson/fix-npipe-engine-121

pkg/agent/containerd/config_linux.go

@@ -8,6 +8,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"
@@ -110,3 +111,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)
+}

pkg/agent/containerd/config_windows.go

+//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)
+}

pkg/agent/containerd/containerd.go

@@ -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
 	}