kubeadm: postscripts

kvirt/cluster/kubeadm/__init__.py

@@ -3,7 +3,7 @@
 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, create_app_generic, get_ssh_pub_key, _ssh_credentials, ssh, deploy_cloud_storage
-from kvirt.common import get_new_vip, wait_for_nodes
+from kvirt.common import get_new_vip, wait_for_nodes, process_postscripts
 from kvirt.defaults import UBUNTUS
 import os
 from random import choice
@@ -348,4 +348,5 @@ def create(config, plandir, cluster, overrides):
         if provider == 'aws':
             pprint("Deploying cloud storage class")
             deploy_cloud_storage(config, cluster)
+    process_postscripts(clusterdir, data['postscripts'])
     return {'result': 'success'}

kvirt/cluster/kubeadm/kcli_default.yml

@@ -92,3 +92,4 @@ coredns: true
 kube_proxy: true
 ignore_hosts: false
 runtime_config: []
+postscripts: []

kvirt/cluster/openshift/__init__.py

@@ -8,7 +8,7 @@
 from kvirt.common import get_latest_fcos, generate_rhcos_iso, olm_app
 from kvirt.common import get_installer_rhcos, wait_cloud_dns, delete_lastvm, detect_openshift_version
 from kvirt.common import ssh, scp, _ssh_credentials, get_ssh_pub_key
-from kvirt.common import start_baremetal_hosts_with_iso, update_baremetal_hosts, get_new_vip
+from kvirt.common import start_baremetal_hosts_with_iso, update_baremetal_hosts, get_new_vip, process_postscripts
 from kvirt.defaults import LOCAL_OPENSHIFT_APPS, OPENSHIFT_TAG
 import os
 import re
@@ -423,17 +423,6 @@ def process_apps(config, clusterdir, apps, overrides):
             error(f"Issue adding app {name}")
 
 
-def process_postscripts(clusterdir, postscripts):
-    if not postscripts:
-        return
-    os.environ['KUBECONFIG'] = f"{clusterdir}/auth/kubeconfig"
-    currentdir = pwd_path(".")
-    for script in postscripts:
-        script_path = os.path.expanduser(script) if script.startswith('/') else f'{currentdir}/{script}'
-        pprint(f"Running script {os.path.basename(script)}")
-        call(script_path, shell=True)
-
-
 def wait_for_ignition(cluster, domain, role='worker'):
     clusterdir = os.path.expanduser(f"~/.kcli/clusters/{cluster}")
     ignitionfile = f"{clusterdir}/ctlplane.ign" if role == 'master' else f"{clusterdir}/worker.ign"

kvirt/common/__init__.py

@@ -2614,3 +2614,14 @@ def patch_ingress_controller_wildcard():
     cmd += "'[{ \"op\": \"add\", \"path\": \"/spec/routeAdmission\", "
     cmd += "\"value\": {wildcardPolicy: \"WildcardsAllowed\"}}]'"
     call(cmd, shell=True)
+
+
+def process_postscripts(clusterdir, postscripts):
+    if not postscripts:
+        return
+    os.environ['KUBECONFIG'] = f"{clusterdir}/auth/kubeconfig"
+    currentdir = pwd_path(".")
+    for script in postscripts:
+        script_path = os.path.expanduser(script) if script.startswith('/') else f'{currentdir}/{script}'
+        pprint(f"Running script {os.path.basename(script)}")
+        call(script_path, shell=True)