diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go index 3bc9e5e11..54bb0151f 100644 --- a/oci/spec_opts_linux.go +++ b/oci/spec_opts_linux.go @@ -143,7 +143,7 @@ var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *con return WithCapabilities(caps)(ctx, client, c, s) } -// WithAllKnownCapabilities sets all the the known linux capabilities for the container process +// WithAllKnownCapabilities sets all the known linux capabilities for the container process var WithAllKnownCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error { caps := cap.Known() return WithCapabilities(caps)(ctx, client, c, s) diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go index fe9ed6d5d..2f3ce80a4 100644 --- a/oci/spec_opts_nonlinux.go +++ b/oci/spec_opts_nonlinux.go @@ -33,7 +33,7 @@ var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *con return WithCapabilities(nil)(ctx, client, c, s) } -// WithAllKnownCapabilities sets all the the known linux capabilities for the container process +// WithAllKnownCapabilities sets all the known linux capabilities for the container process // nolint: deadcode, unused var WithAllKnownCapabilities = func(ctx context.Context, client Client, c *containers.Container, s *Spec) error { return WithCapabilities(nil)(ctx, client, c, s) diff --git a/pkg/cri/sbserver/sandbox_portforward_linux.go b/pkg/cri/sbserver/sandbox_portforward_linux.go index e4a02208c..d7cd09c35 100644 --- a/pkg/cri/sbserver/sandbox_portforward_linux.go +++ b/pkg/cri/sbserver/sandbox_portforward_linux.go @@ -30,7 +30,7 @@ import ( ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the -// the namespace to a specific port. It keeps forwarding until it exits or client disconnect. +// namespace to a specific port. It keeps forwarding until it exits or client disconnect. func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriteCloser) error { s, err := c.sandboxStore.Get(id) if err != nil { @@ -83,7 +83,7 @@ func (c *criService) portForward(ctx context.Context, id string, port int32, str defer conn.Close() errCh := make(chan error, 2) - // Copy from the the namespace port connection to the client stream + // Copy from the namespace port connection to the client stream go func() { log.G(ctx).Debugf("PortForward copying data from namespace %q port %d to the client stream", id, port) _, err := io.Copy(stream, conn) diff --git a/pkg/cri/sbserver/sandbox_portforward_other.go b/pkg/cri/sbserver/sandbox_portforward_other.go index 649696107..b79d44cdc 100644 --- a/pkg/cri/sbserver/sandbox_portforward_other.go +++ b/pkg/cri/sbserver/sandbox_portforward_other.go @@ -28,7 +28,7 @@ import ( ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the -// the namespace to a specific port. It keeps forwarding until it exits or client disconnect. +// namespace to a specific port. It keeps forwarding until it exits or client disconnect. func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriteCloser) error { return fmt.Errorf("port forward: %w", errdefs.ErrNotImplemented) } diff --git a/pkg/cri/server/sandbox_portforward_linux.go b/pkg/cri/server/sandbox_portforward_linux.go index 7283b53c0..44d8b9bd5 100644 --- a/pkg/cri/server/sandbox_portforward_linux.go +++ b/pkg/cri/server/sandbox_portforward_linux.go @@ -30,7 +30,7 @@ import ( ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the -// the namespace to a specific port. It keeps forwarding until it exits or client disconnect. +// namespace to a specific port. It keeps forwarding until it exits or client disconnect. func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriteCloser) error { s, err := c.sandboxStore.Get(id) if err != nil { @@ -83,7 +83,7 @@ func (c *criService) portForward(ctx context.Context, id string, port int32, str defer conn.Close() errCh := make(chan error, 2) - // Copy from the the namespace port connection to the client stream + // Copy from the namespace port connection to the client stream go func() { log.G(ctx).Debugf("PortForward copying data from namespace %q port %d to the client stream", id, port) _, err := io.Copy(stream, conn) diff --git a/pkg/cri/server/sandbox_portforward_other.go b/pkg/cri/server/sandbox_portforward_other.go index 15d58a4d0..9ce3e4812 100644 --- a/pkg/cri/server/sandbox_portforward_other.go +++ b/pkg/cri/server/sandbox_portforward_other.go @@ -28,7 +28,7 @@ import ( ) // portForward uses netns to enter the sandbox namespace, and forwards a stream inside the -// the namespace to a specific port. It keeps forwarding until it exits or client disconnect. +// namespace to a specific port. It keeps forwarding until it exits or client disconnect. func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriteCloser) error { return fmt.Errorf("port forward: %w", errdefs.ErrNotImplemented) } diff --git a/script/test/cri-integration.sh b/script/test/cri-integration.sh index 916d8713b..76cd738f0 100755 --- a/script/test/cri-integration.sh +++ b/script/test/cri-integration.sh @@ -28,7 +28,7 @@ cd "${ROOT}" # FOCUS focuses the test to run. FOCUS=${FOCUS:-""} -# REPORT_DIR is the the directory to store test logs. +# REPORT_DIR is the directory to store test logs. if [ $IS_WINDOWS -eq 0 ]; then REPORT_DIR=${REPORT_DIR:-"/tmp/test-integration"} else