From 005eb666ce3cc53a49318b721379d0fcc2085593 Mon Sep 17 00:00:00 2001 From: Rafael Fonseca Date: Wed, 29 Nov 2023 17:55:27 +0100 Subject: [PATCH] no-jira: extract openshift-install from installer-artifacts We are decoupling installer-artifacts from installer, so they can be built in parallel both in CI and during release build. As a consequence, the openshift-install binary should be extracted from the installer-artifacts image exclusively. --- pkg/cli/admin/release/extract_tools.go | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/pkg/cli/admin/release/extract_tools.go b/pkg/cli/admin/release/extract_tools.go index 68a0dba061..2040e9ffe1 100644 --- a/pkg/cli/admin/release/extract_tools.go +++ b/pkg/cli/admin/release/extract_tools.go @@ -313,17 +313,6 @@ func (o *ExtractOptions) extractCommand(command string) error { SignMachOBinary: true, ArchiveFormat: "openshift-install-mac-arm64-%s.tar.gz", }, - { - OS: "linux", - Arch: targetReleaseArch, - Command: "openshift-install", - Mapping: extract.Mapping{Image: "installer", From: "usr/bin/openshift-install"}, - - Readme: readmeInstallUnix, - InjectReleaseImage: true, - InjectReleaseVersion: true, - ArchiveFormat: "openshift-install-linux-%s.tar.gz", - }, { OS: "linux", Arch: "amd64", @@ -513,10 +502,6 @@ func (o *ExtractOptions) extractCommand(command string) error { continue } } - if target.OS == "linux" && target.Arch == releaseArch { - klog.V(2).Infof("Skipping duplicate %s", target.ArchiveFormat) - continue - } spec, err := findImageSpec(release.References, target.Mapping.Image, o.From) if err != nil && !target.NewArch { missing.Insert(target.Mapping.Image)