From 070304f05405920d8bf56551d93a5ad66b5ed52f Mon Sep 17 00:00:00 2001 From: Javier Evans Date: Tue, 14 Nov 2023 12:53:45 -0800 Subject: [PATCH] remove old hack --- .../ingress_controller_image_base_provider.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pulumi/python/utility/kic-image-build/ingress_controller_image_base_provider.py b/pulumi/python/utility/kic-image-build/ingress_controller_image_base_provider.py index 4eb75b3..d1ef51f 100644 --- a/pulumi/python/utility/kic-image-build/ingress_controller_image_base_provider.py +++ b/pulumi/python/utility/kic-image-build/ingress_controller_image_base_provider.py @@ -48,15 +48,6 @@ def _docker_pull(self, image_name: str) -> str: :return full image name with server name (e.g. docker.io/library/debian:buster-slim) """ - # The below is a hack for arm systems in which ECR wants - # all architectures in the manifest to exist locally on push - # only the linux/amd64 image will actually be used. I'm aware this is very wasteful but the workaround eludes me at the moment - # manifest_architectures = ["linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x"] - # (this is still not working but a workaround is disabling containerd) - # for arch in manifest_architectures: - # cmd = f'docker pull --platform "{arch}" --quiet "{image_name}"' - # res, _ = self._run_docker(cmd=cmd) - cmd = f'docker pull --platform linux/amd64 --quiet "{image_name}"' res, _ = self._run_docker(cmd=cmd) image_name = res.strip()