Merge branch 'bugfix/fix-build-with-new-docker' into tmp/octopus/w/131.0/bugfix/fix-build-with-new-docker

Author: bert-e

buildchain/buildchain/docker_command.py

@@ -294,6 +294,7 @@ def docker_pull(
         # For some reason, the repository must include the image name…
         f"{repository}/{name}",
         tag=version,
+        platform="linux/amd64",
     )
     if digest and pulled.id != digest:
         raise ValueError(

buildchain/buildchain/versions.py

@@ -199,7 +199,9 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
     Image(
         name="pause",
         version="3.10",
-        digest="sha256:873ed75102791e5b0b8a7fcd41606c92fcec98d56d05ead4ac5131650004c136",
+        # Do not check the digest for this image, since this one is re-published
+        # several times with the same tag
+        digest=None,
     ),
     Image(
         name="prometheus",

buildchain/requirements.in

@@ -1,4 +1,4 @@
 -c platform-requirements.txt
-doit ~= 0.34.0
-docker ~= 4.1.0
-PyYAML ~= 5.3.1
+doit ~= 0.36.0
+docker ~= 7.1.0
+PyYAML ~= 6.0.3

buildchain/requirements.txt

@@ -1,32 +1,33 @@
 #
-# This file is autogenerated by pip-compile
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
 #
-#    tox -e pip-compile
+#    tox -e pip-compile-buildchain
 #
-certifi==2021.10.8
+certifi==2026.1.4
     # via requests
-charset-normalizer==2.0.10
+charset-normalizer==3.4.4
     # via requests
-cloudpickle==2.0.0
+cloudpickle==3.1.2
     # via doit
-docker==4.1.0
-    # via -r requirements.in
-doit==0.34.0
-    # via -r requirements.in
-idna==3.7
+docker==7.1.0
+    # via -r /workspaces/metalk8s/buildchain/requirements.in
+doit==0.36.0
+    # via -r /workspaces/metalk8s/buildchain/requirements.in
+idna==3.11
     # via requests
-pyinotify==0.9.6 ; sys_platform == "linux"
-    # via
-    #   -c platform-requirements.txt
-    #   doit
-pyyaml==5.3.1
-    # via -r requirements.in
-requests==2.27.1
-    # via docker
-six==1.16.0
-    # via docker
-urllib3==1.26.8
-    # via requests
-websocket-client==1.2.3
+importlib-metadata==8.7.1
+    # via doit
+pyyaml==6.0.3
+    # via -r /workspaces/metalk8s/buildchain/requirements.in
+requests==2.32.5
     # via docker
+urllib3==2.6.3
+    # via
+    #   docker
+    #   requests
+zipp==3.23.0
+    # via importlib-metadata
+# Note: these come from 'buildchain/platform-requirements.txt'
+macfsevents==0.8.1; sys_platform=="darwin"  # via doit
+pyinotify==0.9.6; sys_platform=="linux"     # via doit

doit.sh

@@ -3,7 +3,7 @@
 OSTYPE="$(uname -s)"
 # System-wide Python 3 command.
 PYTHON_SYS="${PYTHON_SYS:-python3}"
-MINIMUM_PYTHON_VERSION='(3, 6)'
+MINIMUM_PYTHON_VERSION='(3, 10)'
 # Buildchain location.
 BUILDCHAIN=buildchain
 # Location of the virtual environment for the buildchain.
@@ -26,7 +26,7 @@ EOF
 
 if [ "$?" -eq 1 ];
 then
-    echo "$($PYTHON_SYS -V) too old, 3.6 minimum is required" >&2
+    echo "$($PYTHON_SYS -V) too old, 3.10 minimum is required" >&2
     exit 1
 fi
 

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"'
             )

tox.ini

@@ -12,16 +12,19 @@ skip_install = true
 setenv =
     VIRTUALENV_NO_DOWNLOAD=1
 
-[testenv:pip-compile]
+[testenv:pip-compile-buildchain]
 description =
-    Update the requirements.txt files.
-basepython = python3.6
+    Update the requirements.txt file for the buildchain.
+basepython = python3
+# Ensure it's a Python 3.10+ environment
+commands_pre =
+    python -c "import sys; assert sys.version_info >= (3, 10), f'Python >= 3.10 required, got {sys.version_info}'"
 skip_install = true
 deps =
-    pip==20.3.3
-    pip-tools==5.4.0
+    pip~=26.0.0
+    pip-tools~=7.5.0
 setenv =
-    CUSTOM_COMPILE_COMMAND = tox -e pip-compile
+    CUSTOM_COMPILE_COMMAND = tox -e pip-compile-buildchain
 allowlist_externals =
     gawk
     bash
@@ -37,6 +40,17 @@ commands =
     # Add pyinotify and macfsevents from platform-requirements.txt
     bash -c 'cat "{toxinidir}/buildchain/platform-requirements.txt" >> "{toxinidir}/buildchain/requirements.txt"'
 
+[testenv:pip-compile]
+description =
+    Update the requirements.txt files.
+basepython = python3.6
+skip_install = true
+deps =
+    pip==20.3.3
+    pip-tools==5.4.0
+setenv =
+    CUSTOM_COMPILE_COMMAND = tox -e pip-compile
+commands =
     pip-compile \
         --emit-index-url --emit-trusted-host --annotate \
         --allow-unsafe \