Skip to content

Commit

Permalink
chore: remove duplicate word in comments
Browse files Browse the repository at this point in the history
Signed-off-by: Abirdcfly Fu <fp544037857@gmail.com>
(cherry picked from commit dcfaa30)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
Abirdcfly authored and thaJeztah committed Mar 7, 2023
1 parent efb88a8 commit 627f563
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion oci/spec_opts_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,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)
Expand Down
2 changes: 1 addition & 1 deletion oci/spec_opts_nonlinux.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,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 {
Expand Down
4 changes: 2 additions & 2 deletions pkg/cri/server/sandbox_portforward_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pkg/cri/server/sandbox_portforward_other.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
2 changes: 1 addition & 1 deletion script/test/cri-integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 627f563

Please sign in to comment.