Merge pull request #27430 from l0rd/fix-wsl-image-cache-mismatch

Fix cache misses when pulling WSL machine image

pkg/machine/define/image_format.go

@@ -24,9 +24,6 @@ func (imf ImageFormat) Kind() string {
 }
 
 func (imf ImageFormat) KindWithCompression() string {
-	// Tar uses xz; all others use zstd
-	if imf == Tar {
-		return "tar.xz"
-	}
+	// All image formats are compressed with zstd
 	return fmt.Sprintf("%s.zst", imf.Kind())
 }

pkg/machine/define/image_format_test.go

@@ -59,9 +59,9 @@ func TestImageFormat_KindWithCompression(t *testing.T) {
 			imf:  Raw,
 			want: "raw.zst",
 		}, {
-			name: "tar.xz",
+			name: "tar.zst",
 			imf:  Tar,
-			want: "tar.xz",
+			want: "tar.zst",
 		},
 	}
 	for _, tt := range tests {