openshift: default to 4.20

Author: karmab

kvirt/cluster/openshift/apps/advanced-cluster-management/assisted-service.sh

@@ -11,7 +11,7 @@ until oc get crd/clusterimagesets.hive.openshift.io >/dev/null 2>&1 ; do sleep 1
 
 if [ "$(which openshift-install)" == "" ] ; then 
   VERSION={{ version|default('stable') }}
-  TAG={{ tag|default('4.19') }}
+  TAG={{ tag|default('4.20') }}
   kcli download openshift-install -P version=$VERSION -P tag=$TAG
   export PATH=.:$PATH
 fi

kvirt/cluster/openshift/apps/multicluster-engine/assisted-service.sh

@@ -11,7 +11,7 @@ until oc get crd/clusterimagesets.hive.openshift.io >/dev/null 2>&1 ; do sleep 1
 
 if [ "$(which openshift-install)" == "" ] ; then 
   VERSION={{ version|default('stable') }}
-  TAG={{ tag|default('4.19') }}
+  TAG={{ tag|default('4.20') }}
   kcli download openshift-install -P version=$VERSION -P tag=$TAG
   export PATH=.:$PATH
 fi

kvirt/cluster/openshift/disconnected/scripts/03_mirror.sh

@@ -61,7 +61,7 @@ podman login -u "$RHN_USER" -p "$RHN_PASSWORD" registry.redhat.io
 
 which oc-mirror >/dev/null 2>&1
 if [ "$?" != "0" ] ; then
-  OPENSHIFT_TAG=4.19
+  OPENSHIFT_TAG=4.20
   curl -Ls https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable-$OPENSHIFT_TAG/oc-mirror.tar.gz | tar xvz -C /usr/bin
   chmod +x /usr/bin/oc-mirror
 fi

kvirt/cluster/openshift/kcli_default.yml

@@ -17,7 +17,7 @@ info: |
     bootstrap in place (which removes the need for a bootstrap vm). This approach is suitable for baremetal single node
     baremetal_hosts can be specified as an array of bmc urls to deploy baremetal workers (or in the case of SNO described before)
 version: stable
-tag: '4.19'
+tag: '4.20'
 pull_secret: openshift_pull.json
 image:
 network: default

kvirt/defaults.py

@@ -32,7 +32,7 @@
 TUNNELPORT = 22
 VMUSER = None
 VMPORT = None
-OPENSHIFT_TAG = '4.19'
+OPENSHIFT_TAG = '4.20'
 ALMA = 'https://repo.ifca.es/almalinux'
 BSD = 'https://object-storage.public.mtl1.vexxhost.net/swift/v1/1dbafeefbd4f4c80864414a441e72dd2'
 BSD += '/bsd-cloud-image.org/images/dragonflybsd'
@@ -85,6 +85,7 @@
           'rhcos417': f'{RHCOS}/4.17',
           'rhcos418': f'{RHCOS}/4.18',
           'rhcos419': f'{RHCOS}/4.19',
+          'rhcos420': f'{RHCOS}/4.20',
           'rhcoslatest': f'{RHCOS}/{OPENSHIFT_TAG}',
           'rhel7': 'https://access.redhat.com/downloads/content/69/ver=/rhel---7',
           'rhel8': 'https://access.redhat.com/downloads/content/479/ver=/rhel---8',

kvirt/examples.py

@@ -19,7 +19,7 @@
 $ kcli create dns -n network2 -d karmalabs.corp -i 192.168.122.253 api.jhendrix
 
 # Do the same with an extra wildcard alias
-$ kcli create dns -d karmalabs.corp -i 104.197.157.226 -a '*' api.jhendrix
+$ kcli create dns -d karmalabs.corp -i 104n.197.157.226 -a '*' api.jhendrix
 """
 
 hostcreate = """# Add a KVM host
@@ -358,24 +358,24 @@
 $ kcli create registry kubeadm
 """
 
-openshiftregistrycreate = """# Generate an openshift registry vm for 4.19
-$ kcli create registry openshift -P version=stable -P tag='4.19'
+openshiftregistrycreate = """# Generate an openshift registry vm for 4.20
+$ kcli create registry openshift -P version=stable -P tag='4.20'
 
 # Do the same over an ipv4 network
-$ kcli create registry openshift -P version=nightly -P tag='4.19' -P disconnected_ipv6_network=false
+$ kcli create registry openshift -P version=nightly -P tag='4.20' -P disconnected_ipv6_network=false
 
-# Use specific version and add extra operators (from 4.18)
-$ kcli create registry openshift -P version=nightly -P tag='4.19' -P disconnected_operators=[sriov-network-operator]
+# Use specific version and add extra operators (from 4.20)
+$ kcli create registry openshift -P version=nightly -P tag='4.21' -P disconnected_operators=[sriov-network-operator]
 
 # Deploy registry without content
 $ kcli create registry openshift -P disconnected_sync=false
 """
 
-openshiftregistryupdate = """# Update openshift registry for 4.19
-$ kcli update openshift-registry -P version=stable -P tag='4.19' -P disconnected_url=192.168.122.200.sslip.io:5000 myreg
+openshiftregistryupdate = """# Update openshift registry for 4.20
+$ kcli update openshift-registry -P version=stable -P tag='4.20' -P disconnected_url=192.168.122.200.sslip.io:5000 myreg
 
 # Update openshift registry taking parameter from existing cluster install named myopenshift
-$ kcli update openshift-registry -P tag='4.19.0' myopenshift
+$ kcli update openshift-registry -P tag='4.20.0' myopenshift
 """
 
 
@@ -621,27 +621,27 @@
 $ kcli update baremetal-host -u admin -p admin 10.10.10.10 -P secureboot=true
 """
 
-ocdownload = """# Download 4.19 stable
-$ kcli download oc -P version=stable -P tag=4.19
+ocdownload = """# Download latest stable
+$ kcli download oc -P version=stable
 
 # Download specific tag
 $ kcli download oc -P version=tag -P tag=4.16.4
 
 # Download nightly
-$ kcli download oc -P version=nightly -P tag=4.19
+$ kcli download oc -P version=nightly
 
 # Download older version from CI
 $ kcli download oc -P version=ci -P tag=4.14
 """
 
-ocmirrordownload = """# Download 4.19 stable
-$ kcli download oc-mirror -P version=stable -P tag=4.19
+ocmirrordownload = """# Download latest stable
+$ kcli download oc-mirror -P version=stable
 
 # Download specific tag
 $ kcli download oc-mirror -P version=tag -P tag=4.16.4
 
 # Download nightly
-$ kcli download oc-mirror -P version=nightly -P tag=4.20
+$ kcli download oc-mirror -P version=nightly
 
 """
 

openshift-ci-paramfiles/kubevirt.yml

@@ -5,7 +5,7 @@ sslip: true
 ctlplanes: 3
 workers: 2
 version: nightly
-tag: '4.20'
+tag: '4.21'
 sslip: true
 api_ip: 10.6.118.222
 network: br-ex

openshift-ci-paramfiles/okd.yml

@@ -6,7 +6,6 @@ network_type: OVNKubernetes
 ctlplanes: 3
 workers: 0
 version: ci
-tag: "4.19"
 network: okd-network
 sslip: true
 numcpus: 32