From 014f3054593f94af908f7172fbf1b43114aef2b6 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Thu, 7 Nov 2019 21:22:35 -0500 Subject: [PATCH] Enable multi-arch support in downloads In order for console-operator deployment to succeed, cli-artifacts needs to be available on all arches for downloads-openshift-console. However, in that case, /usr/bin/oc (inherited from cli) is a native binary, and we want to provide all primary Linux architectures to match those on mirror.openshift.com, regardless of cluster architecture. This depends on https://github.com/openshift/oc/pull/153 to provide the new binaries in cli-artifacts. (cherry picked from commit 95d5e4b14b958e512b486e815b61049b87813687) --- manifests/07-downloads-deployment.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/manifests/07-downloads-deployment.yaml b/manifests/07-downloads-deployment.yaml index 53979a20b..f0d5875d9 100644 --- a/manifests/07-downloads-deployment.yaml +++ b/manifests/07-downloads-deployment.yaml @@ -87,11 +87,18 @@ spec: os.mkdir(arch) for operating_system in ['linux', 'mac', 'windows']: os.mkdir(os.path.join(arch, operating_system)) + for arch in ['arm64', 'ppc64le', 's390x']: + os.mkdir(arch) + for operating_system in ['linux']: + os.mkdir(os.path.join(arch, operating_system)) for arch, operating_system, path in [ - ('amd64', 'linux', '/usr/bin/oc'), + ('amd64', 'linux', '/usr/share/openshift/linux_amd64/oc'), ('amd64', 'mac', '/usr/share/openshift/mac/oc'), ('amd64', 'windows', '/usr/share/openshift/windows/oc.exe'), + ('arm64', 'linux', '/usr/share/openshift/linux_arm64/oc'), + ('ppc64le', 'linux', '/usr/share/openshift/linux_ppc64le/oc'), + ('s390x', 'linux', '/usr/share/openshift/linux_s390x/oc'), ]: basename = os.path.basename(path) target_path = os.path.join(arch, operating_system, basename)