From 2d3009038cd2f9ddf12a60b9b0a5e9e93398b71b Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 6 Dec 2021 11:13:39 +0100 Subject: [PATCH] cri/server: use consistent alias for pkg/ioutil Consistently use cioutil to prevent it being confused for Golang's ioutil. Signed-off-by: Sebastiaan van Stijn --- pkg/cri/server/sandbox_portforward_windows.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/cri/server/sandbox_portforward_windows.go b/pkg/cri/server/sandbox_portforward_windows.go index c0ec854e3..3bcd36ee5 100644 --- a/pkg/cri/server/sandbox_portforward_windows.go +++ b/pkg/cri/server/sandbox_portforward_windows.go @@ -26,13 +26,13 @@ import ( "k8s.io/utils/exec" sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" - "github.com/containerd/containerd/pkg/ioutil" + cioutil "github.com/containerd/containerd/pkg/ioutil" ) func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriter) error { - stdout := ioutil.NewNopWriteCloser(stream) + stdout := cioutil.NewNopWriteCloser(stream) stderrBuffer := new(bytes.Buffer) - stderr := ioutil.NewNopWriteCloser(stderrBuffer) + stderr := cioutil.NewNopWriteCloser(stderrBuffer) // localhost is resolved to 127.0.0.1 in ipv4, and ::1 in ipv6. // Explicitly using ipv4 IP address in here to avoid flakiness. cmd := []string{"wincat.exe", "127.0.0.1", fmt.Sprint(port)}