Update the ctr pull defaults when using the transfer service

dmcgowan · k8s-infra-cherrypick-robot · commit d154e234b29c · 2025-11-19T00:13:56.000Z
Match the defaults set by the transfer service which will configure
linux by default on darwin hosts.

Signed-off-by: Derek McGowan &lt;derek@mcg.dev&gt;
diff --git a/cmd/ctr/commands/images/pull.go b/cmd/ctr/commands/images/pull.go
@@ -129,7 +129,12 @@ command. As part of this process, we do the following:
 				return errors.New("cannot specify both --platform and --all-platforms")
 			}
 			if len(p) == 0 && !allPlatforms {
-				p = append(p, platforms.DefaultSpec())
+				spec := platforms.DefaultSpec()
+				// Use linux by default for unpacking images on darwin as configured by transfer service
+				if spec.OS == "darwin" {
+					spec.OS = "linux"
+				}
+				p = append(p, spec)
 			}
 			// we use an empty `Platform` slice to indicate that we want to pull all platforms
 			sopts = append(sopts, image.WithPlatforms(p...))

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,12 @@ command. As part of this process, we do the following:`
`129`	`129`	`return errors.New("cannot specify both --platform and --all-platforms")`
`130`	`130`	`}`
`131`	`131`	`if len(p) == 0 && !allPlatforms {`
`132`		`- p = append(p, platforms.DefaultSpec())`
	`132`	`+ spec := platforms.DefaultSpec()`
	`133`	`+ // Use linux by default for unpacking images on darwin as configured by transfer service`
	`134`	`+ if spec.OS == "darwin" {`
	`135`	`+ spec.OS = "linux"`
	`136`	`+ }`
	`137`	`+ p = append(p, spec)`
`133`	`138`	`}`
`134`	`139`	// we use an empty `Platform` slice to indicate that we want to pull all platforms
`135`	`140`	`sopts = append(sopts, image.WithPlatforms(p...))`