github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6332 from thaJeztah/consistent_import_alias

Browse Source 
cri/server: use consistent alias for pkg/ioutil
This commit is contained in:
Derek McGowan 2021-12-10 15:22:56 -08:00 committed by GitHub
commit 4236f6b225
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cri/server/sandbox_portforward_windows.go
View File

@ -26,13 +26,13 @@ import (
"k8s.io/utils/exec" "k8s.io/utils/exec"
sandboxstore "github.com/containerd/containerd/pkg/cri/store/sandbox" 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 { 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) 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. // localhost is resolved to 127.0.0.1 in ipv4, and ::1 in ipv6.
// Explicitly using ipv4 IP address in here to avoid flakiness. // Explicitly using ipv4 IP address in here to avoid flakiness.
cmd := []string{"wincat.exe", "127.0.0.1", fmt.Sprint(port)} cmd := []string{"wincat.exe", "127.0.0.1", fmt.Sprint(port)}