From 1fb1d93212af763bd481b476293040b1566ae00b Mon Sep 17 00:00:00 2001 From: Li Yuxuan Date: Sun, 5 Jan 2020 10:37:04 +0800 Subject: [PATCH] v2: Fix missing ns when openShimLog on windows Related to https://github.com/containerd/containerd/pull/3921#discussion_r363046745 Signed-off-by: Li Yuxuan --- runtime/v2/binary.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/runtime/v2/binary.go b/runtime/v2/binary.go index 6c7281eba..30c72827d 100644 --- a/runtime/v2/binary.go +++ b/runtime/v2/binary.go @@ -26,6 +26,7 @@ import ( "github.com/containerd/containerd/events/exchange" "github.com/containerd/containerd/log" + "github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/runtime" client "github.com/containerd/containerd/runtime/v2/shim" "github.com/containerd/containerd/runtime/v2/task" @@ -74,7 +75,9 @@ func (b *binary) Start(ctx context.Context, opts *types.Any, onClose func()) (_ if err != nil { return nil, err } - f, err := openShimLog(context.Background(), b.bundle, client.AnonDialer) + // Windows needs a namespace when openShimLog + ns, _ := namespaces.Namespace(ctx) + f, err := openShimLog(namespaces.WithNamespace(context.Background(), ns), b.bundle, client.AnonDialer) if err != nil { return nil, errors.Wrap(err, "open shim log pipe") }