diff --git a/kvirt/baseconfig.py b/kvirt/baseconfig.py index 2639c262e..8e3629284 100644 --- a/kvirt/baseconfig.py +++ b/kvirt/baseconfig.py @@ -1137,16 +1137,16 @@ def info_app_generic(self, app): def create_app_openshift(self, app, overrides={}, outputdir=None): appdir = f"{os.path.dirname(openshift.create.__code__.co_filename)}/apps" if app in kdefaults.LOCAL_OPENSHIFT_APPS: - common.kube_create_app(self, app, appdir, overrides=overrides, outputdir=outputdir) + common.create_app_kube(self, app, appdir, overrides=overrides, outputdir=outputdir) else: - common.openshift_create_app(self, app, appdir, overrides=overrides, outputdir=outputdir) + common.create_app_openshift(self, app, appdir, overrides=overrides, outputdir=outputdir) def delete_app_openshift(self, app, overrides={}): appdir = f"{os.path.dirname(openshift.create.__code__.co_filename)}/apps" if app in kdefaults.LOCAL_OPENSHIFT_APPS: - common.kube_delete_app(self, app, appdir, overrides=overrides) + common.delete_app_kube(self, app, appdir, overrides=overrides) else: - common.openshift_delete_app(self, app, appdir, overrides=overrides) + common.delete_app_openshift(self, app, appdir, overrides=overrides) def info_app_openshift(self, app): plandir = os.path.dirname(openshift.create.__code__.co_filename) diff --git a/kvirt/cluster/k3s/__init__.py b/kvirt/cluster/k3s/__init__.py index 3b9a0baa5..3a8b20212 100644 --- a/kvirt/cluster/k3s/__init__.py +++ b/kvirt/cluster/k3s/__init__.py @@ -1,5 +1,5 @@ from ipaddress import ip_network -from kvirt.common import error, success, pprint, warning, get_kubectl, info2, container_mode, kube_create_app +from kvirt.common import error, success, pprint, warning, get_kubectl, info2, container_mode, create_app_kube from kvirt.common import deploy_cloud_storage, wait_cloud_dns, update_etc_hosts, fix_typos, get_cluster_api_vips from kvirt.common import wait_for_nodes import os @@ -277,7 +277,7 @@ def create(config, plandir, cluster, overrides): pprint(f"Adding app {app}") if f'{app}_version' not in overrides: app_data[f'{app}_version'] = 'latest' - kube_create_app(config, app, appdir, overrides=app_data) + create_app_kube(config, app, appdir, overrides=app_data) if ctlplanes + workers > 1: ready = wait_for_nodes(ctlplanes + workers) if not ready: diff --git a/kvirt/cluster/kubeadm/__init__.py b/kvirt/cluster/kubeadm/__init__.py index bd53356b2..badd3b31b 100644 --- a/kvirt/cluster/kubeadm/__init__.py +++ b/kvirt/cluster/kubeadm/__init__.py @@ -2,7 +2,7 @@ from ipaddress import ip_network import json from kvirt.common import success, pprint, warning, info2, container_mode, wait_cloud_dns, update_etc_hosts, fix_typos -from kvirt.common import get_kubectl, kube_create_app, get_ssh_pub_key, _ssh_credentials, ssh, deploy_cloud_storage +from kvirt.common import get_kubectl, create_app_kube, get_ssh_pub_key, _ssh_credentials, ssh, deploy_cloud_storage from kvirt.common import get_cluster_api_vips, wait_for_nodes from kvirt.defaults import UBUNTUS import os @@ -309,7 +309,7 @@ def create(config, plandir, cluster, overrides): pprint(f"Adding app {app}") if f'{app}_version' not in overrides: app_data[f'{app}_version'] = 'latest' - kube_create_app(config, app, appdir, overrides=app_data) + create_app_kube(config, app, appdir, overrides=app_data) if ctlplanes + workers > 1: ready = wait_for_nodes(ctlplanes + workers) if not ready: diff --git a/kvirt/common/__init__.py b/kvirt/common/__init__.py index c6e29c552..053e0a1e1 100644 --- a/kvirt/common/__init__.py +++ b/kvirt/common/__init__.py @@ -1772,7 +1772,7 @@ def get_helm(version='latest', debug=False): call(helmcmd, shell=True) -def kube_create_app(config, appname, appdir, overrides={}, outputdir=None): +def create_app_kube(config, appname, appdir, overrides={}, outputdir=None): appdata = {'name': appname, 'cluster': 'mykube', 'domain': 'karmalabs.corp', 'ctlplanes': 1, 'workers': 0} cwd = os.getcwd() os.environ["PATH"] += f":{cwd}" @@ -1804,7 +1804,7 @@ def kube_create_app(config, appname, appdir, overrides={}, outputdir=None): return result -def kube_delete_app(config, appname, appdir, overrides={}): +def delete_app_kube(config, appname, appdir, overrides={}): appdata = {'name': appname, 'cluster': 'mykube', 'domain': 'karmalabs.corp', 'ctlplanes': 1, 'workers': 0} found = False cwd = os.getcwd() @@ -1838,7 +1838,7 @@ def kube_delete_app(config, appname, appdir, overrides={}): return result -def openshift_create_app(config, appname, appdir, overrides={}, outputdir=None): +def create_app_openshift(config, appname, appdir, overrides={}, outputdir=None): appdata = {'name': appname, 'cluster': 'myopenshift', 'domain': 'karmalabs.corp', 'ctlplanes': 1, 'workers': 0} install_cr = overrides.get('install_cr', True) cwd = os.getcwd() @@ -1891,7 +1891,7 @@ def openshift_create_app(config, appname, appdir, overrides={}, outputdir=None): return result -def openshift_delete_app(config, appname, appdir, overrides={}): +def delete_app_openshift(config, appname, appdir, overrides={}): appdata = {'name': appname, 'cluster': 'myopenshift', 'domain': 'karmalabs.corp', 'ctlplanes': 1, 'workers': 0} cwd = os.getcwd() os.environ["PATH"] += f":{cwd}" diff --git a/kvirt/examples.py b/kvirt/examples.py index e22c5d8e5..0f8900cbb 100644 --- a/kvirt/examples.py +++ b/kvirt/examples.py @@ -660,27 +660,27 @@ $ kcli update baremetal-host -u admin -p admin 10.10.10.10 -P secureboot=true """ -ocdownload = """# Download 4.13 stable -$ kcli download oc -P version=stable -P tag=4.13 +ocdownload = """# Download 4.16 stable +$ kcli download oc -P version=stable -P tag=4.16 # Download specific tag -$ kcli download oc -P version=tag -P tag=4.11.16 +$ kcli download oc -P version=tag -P tag=4.16.4 # Download nightly -$ kcli download oc -P version=nightly -P tag=4.14 +$ kcli download oc -P version=nightly -P tag=4.16 # Download older version from CI -$ kcli download oc -P version=ci -P tag=4.10 +$ kcli download oc -P version=ci -P tag=4.14 """ -ocmirrordownload = """# Download 4.13 stable -$ kcli download oc-mirror -P version=stable -P tag=4.13 +ocmirrordownload = """# Download 4.16 stable +$ kcli download oc-mirror -P version=stable -P tag=4.16 # Download specific tag -$ kcli download oc-mirror -P version=tag -P tag=4.11.16 +$ kcli download oc-mirror -P version=tag -P tag=4.16.4 # Download nightly -$ kcli download oc-mirror -P version=nightly -P tag=4.14 +$ kcli download oc-mirror -P version=nightly -P tag=4.16 """ @@ -688,19 +688,19 @@ $ kcli download openshift-install # Download older stable version -$ kcli download openshift-install -P version=tag -P tag=4.15 +$ kcli download openshift-install -P version=tag -P tag=4.14 # Download specific tag -$ kcli download openshift-install -P version=tag -P tag=4.11.16 +$ kcli download openshift-install -P version=tag -P tag=4.16.4 # Download nightly -$ kcli download openshift-install -P version=nightly -P tag=4.14 +$ kcli download openshift-install -P version=nightly -P tag=4.16 # Download dev-preview version $ kcli download openshift-install -P version=dev-preview -P tag=4.17 # Download older version from CI -$ kcli download openshift-install -P version=ci -P tag=4.10 +$ kcli download openshift-install -P version=ci -P tag=4.14 """ securitygroupcreate = """# Create a security group named mygroup and opening tcp ports 22 and 25 diff --git a/openshift-ci-paramfiles/hypershift_assisted.yml b/openshift-ci-paramfiles/hypershift_assisted.yml index f49313b4b..0a387d010 100644 --- a/openshift-ci-paramfiles/hypershift_assisted.yml +++ b/openshift-ci-paramfiles/hypershift_assisted.yml @@ -1,6 +1,6 @@ platform: assisted version: latest -tag: 4.13 +tag: "4.16" ingress_ip: 192.168.254.252 uefi: true workers: 2