Merge pull request #1457 from saschagrunert/pull-timeout-fix

k8s-ci-robot · web-flow · commit 532c0eff1667 · 2024-06-13T10:57:23.000-07:00
Fix `pull-timeout` flag for `crictl pull`
diff --git a/cmd/crictl/image.go b/cmd/crictl/image.go
@@ -126,7 +126,7 @@ var pullImageCommand = &cli.Command{
 				return err
 			}
 		}
-		timeout := c.Duration("timeout")
+		timeout := c.Duration("pull-timeout")
 		r, err := PullImageWithSandbox(imageClient, imageName, auth, sandbox, ann, timeout)
 		if err != nil {
 			return fmt.Errorf("pulling image: %w", err)
@@ -664,7 +664,7 @@ func PullImageWithSandbox(client internalapi.ImageManagerService, image string,
 	defer cancel()
 
 	if timeout > 0 {
-		logrus.Debugf("Using context with timeout of %s", timeout)
+		logrus.Debugf("Using pull context with timeout of %s", timeout)
 		ctx, cancel = context.WithTimeout(ctx, timeout)
 		defer cancel()
 	}

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ var pullImageCommand = &cli.Command{`
`126`	`126`	`return err`
`127`	`127`	`}`
`128`	`128`	`}`
`129`		`- timeout := c.Duration("timeout")`
	`129`	`+ timeout := c.Duration("pull-timeout")`
`130`	`130`	`r, err := PullImageWithSandbox(imageClient, imageName, auth, sandbox, ann, timeout)`
`131`	`131`	`if err != nil {`
`132`	`132`	`return fmt.Errorf("pulling image: %w", err)`
`@@ -664,7 +664,7 @@ func PullImageWithSandbox(client internalapi.ImageManagerService, image string,`
`664`	`664`	`defer cancel()`
`665`	`665`
`666`	`666`	`if timeout > 0 {`
`667`		`- logrus.Debugf("Using context with timeout of %s", timeout)`
	`667`	`+ logrus.Debugf("Using pull context with timeout of %s", timeout)`
`668`	`668`	`ctx, cancel = context.WithTimeout(ctx, timeout)`
`669`	`669`	`defer cancel()`
`670`	`670`	`}`