Skip to content

Commit b82b35a

Browse files
committed
openshift: defaults to 4.15
1 parent aefdc6b commit b82b35a

File tree

11 files changed

+20
-19
lines changed

11 files changed

+20
-19
lines changed

kvirt/cluster/openshift/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def get_installer_version():
272272
return installer_version
273273

274274

275-
def offline_image(version='stable', tag='4.14', pull_secret='openshift_pull.json'):
275+
def offline_image(version='stable', tag='4.15', pull_secret='openshift_pull.json'):
276276
tag = str(tag).split(':')[-1]
277277
for arch in ['x86_64', 'amd64', 'arm64', 'ppc64le', 's390x', 'x86_64']:
278278
tag.replace(f'-{arch}', '')
@@ -305,7 +305,7 @@ def offline_image(version='stable', tag='4.14', pull_secret='openshift_pull.json
305305
return offline
306306

307307

308-
def same_release_images(version='stable', tag='4.14', pull_secret='openshift_pull.json', path='.'):
308+
def same_release_images(version='stable', tag='4.15', pull_secret='openshift_pull.json', path='.'):
309309
if not os.path.exists(f'{path}/openshift-install'):
310310
return False
311311
try:

kvirt/cluster/openshift/kcli_default.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ info: |
1515
bootstrap in place (which removes the need for a bootstrap vm). This approach is suitable for baremetal single node
1616
baremetal_hosts can be specified as an array of bmc urls to deploy baremetal workers (or in the case of SNO described before)
1717
version: stable
18-
tag: '4.14'
18+
tag: '4.15'
1919
pull_secret: openshift_pull.json
2020
image: rhcos414
2121
network: default

kvirt/defaults.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@
7272
'rhcos412': f'{RHCOS}/4.12',
7373
'rhcos413': f'{RHCOS}/4.13',
7474
'rhcos414': f'{RHCOS}/4.14',
75-
'rhcoslatest': f'{RHCOS}/4.14',
75+
'rhcos415': f'{RHCOS}/4.15',
76+
'rhcoslatest': f'{RHCOS}/4.15',
7677
'rhel7': 'https://access.redhat.com/downloads/content/69/ver=/rhel---7',
7778
'rhel8': 'https://access.redhat.com/downloads/content/479/ver=/rhel---8',
7879
'rhel9': 'https://access.redhat.com/downloads/content/479/ver=/rhel---9',

kvirt/examples.py

+8-8
Original file line numberDiff line numberDiff line change
@@ -319,24 +319,24 @@
319319
$ kcli create openshift-iso -P extra_args="super_string_of_args" myopenshift.karmalabs.corp
320320
"""
321321

322-
disconnectedcreate = """# Generate an openshift disconnected vm for 4.13
323-
$ kcli create openshift-registry -P version=stable -P tag='4.13'
322+
disconnectedcreate = """# Generate an openshift disconnected vm for 4.15
323+
$ kcli create openshift-registry -P version=stable -P tag='4.15'
324324
325325
# Do the same over an ipv4 network
326-
$ kcli create openshift-registry -P version=nightly -P tag='4.13' -P disconnected_ipv6_network=false
326+
$ kcli create openshift-registry -P version=nightly -P tag='4.15' -P disconnected_ipv6_network=false
327327
328-
# Use specific version and add extra operators (from 4.14)
329-
$ kcli create openshift-registry -P version=nightly -P tag=4.14 -P disconnected_operators=[sriov-network-operator]
328+
# Use specific version and add extra operators (from 4.15)
329+
$ kcli create openshift-registry -P version=nightly -P tag=4.15 -P disconnected_operators=[sriov-network-operator]
330330
331331
# Deploy registry without content
332332
$ kcli create openshift-registry -P disconnected_sync=false
333333
"""
334334

335-
disconnectedupdate = """# Update openshift disconnected registry for 4.13
336-
$ kcli update openshift-registry -P version=stable -P tag='4.13' -P disconnected_url=192.168.122.200.sslip.io:5000 myreg
335+
disconnectedupdate = """# Update openshift disconnected registry for 4.15
336+
$ kcli update openshift-registry -P version=stable -P tag='4.15' -P disconnected_url=192.168.122.200.sslip.io:5000 myreg
337337
338338
# Update openshift disconnected registry taking parameter from existing cluster install named myopenshift
339-
$ kcli update openshift-registry -P tag='4.13.4' myopenshift
339+
$ kcli update openshift-registry -P tag='4.15.0' myopenshift
340340
"""
341341

342342
appopenshiftcreate = """# Deploy sriov network operator

openshift-ci-paramfiles/hypershift.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cluster: ci-hypershift
22
version: latest
3-
tag: 4.14
3+
tag: 4.15
44
# ingress_ip: 10.19.135.130
55
# ingress_ip: 10.1.98.106
66
# ingress_ip: 10.19.32.61

openshift-ci-paramfiles/kubevirt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ctlplanes: 3
66
workers: 2
77
version: nightly
88
sslip: true
9-
tag: 4.15
9+
tag: 4.16
1010
# api_ip: 10.19.135.111
1111
api_ip: 10.19.32.59
1212
network: br-ex

openshift-ci-paramfiles/libvirt.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ovn_hostrouting: true
55
ctlplanes: 3
66
workers: 0
77
version: stable
8-
tag: "4.14"
8+
tag: "4.15"
99
#api_ip: 10.19.135.112
1010
# api_ip: 10.1.98.87
1111
# api_ip: 10.19.32.58

openshift-ci-paramfiles/okd.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ network_type: OVNKubernetes
55
ctlplanes: 3
66
workers: 0
77
version: stable
8-
tag: "4.14"
8+
tag: "4.15"
99
network: okd-network
1010
sslip: true
1111
numcpus: 32

openshift-ci-paramfiles/sno.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ sno: true
44
sno_wait: true
55
version: stable
66
network_type: OVNKubernetes
7-
tag: "4.14"
7+
tag: "4.15"
88
network: default
99
numcpus: 16
1010
memory: 28672

openshift-ci-paramfiles/snoplus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cluster: snoplus
22
domain: karmalabs.corp
33
version: stable
4-
tag: "4.14"
4+
tag: "4.15"
55
api_ip: 192.168.122.247
66
# sno: true
77
# sno_wait: true

openshift-ci-paramfiles/snoplus_static.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cluster: snoplus
22
domain: karmalabs.corp
33
version: stable
4-
tag: "4.14"
4+
tag: "4.15"
55
api_ip: 192.168.122.247
66
# sno: true
77
# sno_wait: true

0 commit comments

Comments
 (0)