Skip to content

Commit de70888

Browse files
committed
openshift: define openshift_version for registry syncing
1 parent 185cc2b commit de70888

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

kvirt/cluster/openshift/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,6 +1118,7 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
11181118
if disconnected_url is not None:
11191119
if disconnected_update and disconnected_url != 'quay.io':
11201120
data['release_tag'] = f'v4.{get_installer_minor(INSTALLER_VERSION)}'
1121+
data['openshift_version'] = INSTALLER_VERSION
11211122
update_registry(config, plandir, cluster, data)
11221123
key = f"{disconnected_user}:{disconnected_password}"
11231124
key = str(b64encode(key.encode('utf-8')), 'utf-8')

kvirt/jinjafilters/jinjafilters.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,12 @@ def read_file(path):
219219
return f.read()
220220

221221

222-
def min_ocp_version(version1, version2):
223-
return version1 if version1 < version2 else version2
222+
def max_ocp_version(version1, version2):
223+
return max(version1, version2, key=lambda v: tuple(map(int, v.split("."))))
224224

225225

226-
def max_ocp_version(version1, version2):
227-
return version1 if version1 > version2 else version2
226+
def min_ocp_version(version1, version2):
227+
return max(version1, version2, key=lambda v: tuple(map(int, v.split("."))))
228228

229229

230230
def filter_bgp_peers(peers, num):

0 commit comments

Comments
 (0)