From f10061879015a376477812cccb901aa43d2bd57b Mon Sep 17 00:00:00 2001 From: karmab Date: Mon, 20 Jan 2025 16:37:17 +0100 Subject: [PATCH] openshift disconnected: properly set OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE with existing registry --- kvirt/cluster/openshift/__init__.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kvirt/cluster/openshift/__init__.py b/kvirt/cluster/openshift/__init__.py index 99857ace5..cef5dbbd1 100644 --- a/kvirt/cluster/openshift/__init__.py +++ b/kvirt/cluster/openshift/__init__.py @@ -962,8 +962,7 @@ def create(config, plandir, cluster, overrides, dnsconfig=None): update_pull_secret(pull_secret, disconnected_url, disconnected_user, disconnected_password) data['ori_tag'] = tag if '/' not in str(tag): - minor = get_installer_minor(INSTALLER_VERSION) - tag = f'{disconnected_url}/openshift-release-dev/ocp-release:4.{minor}-{arch}' + tag = f'{disconnected_url}/openshift-release-dev/ocp-release:{INSTALLER_VERSION}-{arch}' os.environ['OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE'] = tag if 'ca' not in data and 'quay.io' not in disconnected_url: pprint(f"Trying to gather registry ca cert from {disconnected_url}") @@ -1096,7 +1095,6 @@ def create(config, plandir, cluster, overrides, dnsconfig=None): os.system(scpcmd) patch_oc_mirror(clusterdir) os.environ['OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE'] = disconnected_version - pprint(f"Setting OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE to {disconnected_version}") data['pull_secret_path'] = pull_secret data['pull_secret'] = re.sub(r"\s", "", open(pull_secret).read()) if disconnected_url is not None: