chore: remove duplicate word in comments

Abirdcfly · thaJeztah · commit 627f563e6d61 · 2023-03-08T00:11:34.000+01:00
Signed-off-by: Abirdcfly Fu <fp544037857@gmail.com> (cherry picked from commit dcfaa30) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/oci/spec_opts_linux.go b/oci/spec_opts_linux.go
@@ -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)
diff --git a/oci/spec_opts_nonlinux.go b/oci/spec_opts_nonlinux.go
@@ -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 {
diff --git 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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *con`
`131`	`131`	`return WithCapabilities(caps)(ctx, client, c, s)`
`132`	`132`	`}`
`133`	`133`
`134`		`-// WithAllKnownCapabilities sets all the the known linux capabilities for the container process`
	`134`	`+// WithAllKnownCapabilities sets all the known linux capabilities for the container process`
`135`	`135`	`var WithAllKnownCapabilities = func(ctx context.Context, client Client, c containers.Container, s Spec) error {`
`136`	`136`	`caps := cap.Known()`
`137`	`137`	`return WithCapabilities(caps)(ctx, client, c, s)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ var WithAllCurrentCapabilities = func(ctx context.Context, client Client, c *con`
`34`	`34`	`return WithCapabilities(nil)(ctx, client, c, s)`
`35`	`35`	`}`
`36`	`36`
`37`		`-// WithAllKnownCapabilities sets all the the known linux capabilities for the container process`
	`37`	`+// WithAllKnownCapabilities sets all the known linux capabilities for the container process`
`38`	`38`	`//`
`39`	`39`	`//nolint:deadcode,unused`
`40`	`40`	`var WithAllKnownCapabilities = func(ctx context.Context, client Client, c containers.Container, s Spec) error {`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// portForward uses netns to enter the sandbox namespace, and forwards a stream inside the`
`31`		`-// the namespace to a specific port. It keeps forwarding until it exits or client disconnect.`
	`31`	`+// namespace to a specific port. It keeps forwarding until it exits or client disconnect.`
`32`	`32`	`func (c *criService) portForward(ctx context.Context, id string, port int32, stream io.ReadWriteCloser) error {`
`33`	`33`	`return fmt.Errorf("port forward: %w", errdefs.ErrNotImplemented)`
`34`	`34`	`}`