salt: Always import images with platform "linux/amd64"

Author: TeddyAndrieux

salt/_modules/containerd.py

@@ -26,7 +26,7 @@ def load_cri_image(path, fullname=None):
         Path of the Docker image archive to load
     """
     log.info('Importing image from "%s" into CRI cache', path)
-    cmd = f'ctr --debug -n k8s.io image import "{path}"'
+    cmd = f'ctr --debug -n k8s.io image import --platform "linux/amd64" "{path}"'
     if fullname:
         cmd += f' --index-name "{fullname}"'
     return __salt__["cmd.run_all"](cmd)

salt/tests/unit/modules/test_containerd.py

@@ -37,7 +37,9 @@ def test_load_cri_image(self, path):
         with patch.dict(containerd.__salt__, {"cmd.run_all": mock_cmd}):
             self.assertEqual(containerd.load_cri_image(path), cmd)
             mock_cmd.assert_called_once_with(
-                'ctr --debug -n k8s.io image import "{}"'.format(path)
+                'ctr --debug -n k8s.io image import --platform "linux/amd64" "{}"'.format(
+                    path
+                )
             )
 
     def test_load_cri_image_with_fullname(self):
@@ -61,5 +63,5 @@ def test_load_cri_image_with_fullname(self):
                 cmd,
             )
             mock_cmd.assert_called_once_with(
-                'ctr --debug -n k8s.io image import "/tmp/toto.tar" --index-name "abc.def/my-image:3.5"'
+                'ctr --debug -n k8s.io image import --platform "linux/amd64" "/tmp/toto.tar" --index-name "abc.def/my-image:3.5"'
             )