Merge pull request #32037 from nickgerace/master-amd64

Rely on Windows manifests instead of manual tags

pkg/image/export/main.go

@@ -788,15 +788,19 @@ function usage {
 
 $fullname_images = @()
 Get-Content -Force -Path $image_list | ForEach-Object {
-    if ($_) {
-        $fullname_image = ('{0}-windows-{1}' -f $_, $os_release_id)
-		echo "Pulling $fullname_image"
-		
+	if ($_) {
+		$fullname_image = $_
+		echo "Pulling: $fullname_image"
 		docker pull $fullname_image
+		if (!$?) {
+			$fullname_image = ('{0}-windows-{1}' -f $fullname_image, $os_release_id)
+			echo "Pulling with windows-VERSION suffix: $fullname_image"
+			docker pull $fullname_image
+		}
 		if ($?) {
 			$fullname_images += @($fullname_image)
 		}
-    }
+	}
 }
 
 if (-not $fullname_images)