kcli 99.0.202510240842__py3-none-any.whl → 99.0.202511270652__py3-none-any.whl

{kcli-99.0.202510240842.dist-info → kcli-99.0.202511270652.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202510240842
+Version: 99.0.202511270652
 Summary: Provisioner/Manager for Libvirt/Vsphere/Aws/Gcp/Hcloud/Kubevirt/Ovirt/Openstack/IBM Cloud and containers
 Home-page: http://github.com/karmab/kcli
 Author: Karim Boumedhel

{kcli-99.0.202510240842.dist-info → kcli-99.0.202511270652.dist-info}/RECORD

@@ -1,9 +1,9 @@
-kcli-99.0.202510240842.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+kcli-99.0.202511270652.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
 kvirt/__init__.py,sha256=eoZ6GfifbqhMLNzjlqRDVil-yyBkOmVN9ujSgJWNBlY,15
 kvirt/baseconfig.py,sha256=QG_AHI1_HAgHwIdZSm1BXkpn9pW35kTMUkFOb7UE_wY,83513
 kvirt/bottle.py,sha256=K24aCQYSylDpkxmLYGygSpAJ4MlMqMk85AMpbCWA43c,175729
 kvirt/cli.py,sha256=D1lMERW5zuH6H7vzJHIX2UIdcpv16V2CaV-Ear3UTC8,265483
-kvirt/config.py,sha256=ikO03beELPo1o08-Aa-S1OgxdufvTDXMsaY828R7NgI,184294
+kvirt/config.py,sha256=TSCS6pjt85nKY6TpL7yfPUF64zFbI1_xYAZYtj3Jfc8,184488
 kvirt/containerconfig.py,sha256=qbvOWwFlyU2F-4rZn9PLj97wDnSBIwAYA6Xlxr13OOc,2329
 kvirt/defaults.py,sha256=n55lnshkM6oXJPcolMvCo8Tjz9xdBGO8nGI1ejQJzvc,12212
 kvirt/ekstoken.py,sha256=MjK_tcLFl2VKxqgTSB4ve_kybZw5dBj2H6BezGGtBpM,1475
@@ -11,7 +11,7 @@ kvirt/examples.py,sha256=KTiMRjXHpwoEg5fPgndDADa15LKV79aT6Ty2ihu8wI4,28876
 kvirt/gketoken.py,sha256=up6cyslRTsoOHu9xT8fa0chES6RWExIu0IzXQY0IxQs,934
 kvirt/keywords.yaml,sha256=HVg-130j21WWuDrSvaGI98xLwLDiMwUsU3oAnRUm2Ls,10145
 kvirt/klist.py,sha256=TT6j6_gHUgSIkTsrDnTvNMdgrdpgOUJZbJp9xPyq5ns,3395
-kvirt/kmcp.py,sha256=Wyfx2BmRryphCl29Bs37EL4suVwpoorb5IJunbty3HU,26172
+kvirt/kmcp.py,sha256=1zKdMGkcNjNr8detyKaUmiSyCRxg3kr-bfmrJ6aSaSc,29612
 kvirt/cluster/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kvirt/cluster/sampleprovider.py,sha256=6K-rh95Os9yMOTzGp9afiQeWhDE2Y2KEc0TjnpFY3xs,181
 kvirt/cluster/aks/__init__.py,sha256=I-e-MwzLEaOtuS_xPdY4rIO_Wey2M9o9-VX5ETgxlQM,8967
@@ -81,7 +81,7 @@ kvirt/cluster/kubeadm/disconnected.yml,sha256=ntIU2kPXJfDJiW9b2aip4QdmricDTUxzZ6
 kvirt/cluster/kubeadm/join.sh,sha256=JIkMmRDlCzi-MshamKizHUiJCSzshvESjo9inN47ItA,267
 kvirt/cluster/kubeadm/kcli_default.yml,sha256=4vO3t2kGHkzmoU4hILyBum08Yxh4a8n7aO785B4zflU,2449
 kvirt/cluster/kubeadm/keepalived.conf,sha256=OwQ_PozqBMzAULPjjJ2TbAHK3n9BE5gyCqkqZ0SFmic,588
-kvirt/cluster/kubeadm/keepalived.sh,sha256=QMLjKiVtOa4S4-zBEnXWOoN8a6-FhNxKbSgovw-koOg,424
+kvirt/cluster/kubeadm/keepalived.sh,sha256=D4oRKdrjHPERIFc3N8y75vWoDyLeNj1xk1WCVFEpm8Y,470
 kvirt/cluster/kubeadm/nfs.sh,sha256=g_8yPIpKedLwiXJ9FkMC2R6pCANSMX8SVWk-WDML1vY,1769
 kvirt/cluster/kubeadm/nfs.yml,sha256=js0KtTYqI1dtnc018wBXefyVPsCVn_sSneShMCJWUe4,226
 kvirt/cluster/kubeadm/pre_el.sh,sha256=5x1yZ_05EAJVE2TYLm_4beNX-Cc57QNUFuqpbS6tN78,2008
@@ -146,7 +146,7 @@ kvirt/cluster/kubeadm/disconnected/scripts/05_web.sh,sha256=Rx8HcXlZUS4BAGZaz9Xz
 kvirt/cluster/kubeadm/disconnected/scripts/deploy.sh,sha256=rN9whVEGPzAc-3WwQjLF0tSb976bsXv8ol1lSCD709s,593
 kvirt/cluster/kubernetes/__init__.py,sha256=3-Y_L5eSKmPjorrpjyhyaKT-eyB9KmbF80y2zdONCls,9287
 kvirt/cluster/microshift/__init__.py,sha256=4yzu0ZNyczYomhxy23vWgVJBr88y4OYmkSq915NA_OY,4319
-kvirt/cluster/microshift/kcli_default.yml,sha256=-zFf6SfiXDZihhjaNmuuiFlKfuVKUpadyMhTIwPoIdg,635
+kvirt/cluster/microshift/kcli_default.yml,sha256=lEgp7QcerTmRc0V-rsGBNj0AVAbjadd3atNmBRpZFEE,635
 kvirt/cluster/microshift/kcli_plan.yml,sha256=DKqw0smtF0eBRYegUbXFgEH1RYihRRq-P9-_T3cZsJg,571
 kvirt/cluster/microshift/scripts/00_sslip.sh,sha256=sD2d5PwNGEw5hEr65O8DGJK282cy-TLG_aLWRXLnueE,262
 kvirt/cluster/microshift/scripts/01_clients.sh,sha256=wsgvmssSfGrH4W9RjcInwkUWr7pORN3JXI8avaq1Fj0,1100
@@ -164,7 +164,7 @@ kvirt/cluster/openshift/99-autologin.yaml,sha256=qkOEEfsuH4S-ptZ6sWY-GnaKzBM_EYt
 kvirt/cluster/openshift/99-bootstrap-deletion-2.yaml,sha256=dq-jBNqBfuPH0HCXsql3ZP6gOawapYzWr7_TRqMSRZo,616
 kvirt/cluster/openshift/99-bootstrap-deletion.yaml,sha256=7AdtAtSsrI0OeuNe68eY8QkAEgYJEeClhNxQnl3hVGI,1237
 kvirt/cluster/openshift/99-chrony.yaml,sha256=NxNx35-nrEBdT83Rw0y8Pl-C4prknGtiGbT6EGkchkM,529
-kvirt/cluster/openshift/99-kcli-forcedns,sha256=meMfjHRDP8d0clIkZk6HAMnF615IQZWd3aPps_s4ELc,961
+kvirt/cluster/openshift/99-kcli-forcedns,sha256=WKWiT4De-N9sC5DWSlZ1flWSC9NuNNWHOAJVL5GEHWg,800
 kvirt/cluster/openshift/99-kcli-forcedns-ibm,sha256=F65o8Au2PmfapeXdS-t-CTURkrVmOvlAA-6xdgsd0bc,476
 kvirt/cluster/openshift/99-kubevirt-fix.yaml,sha256=A8hyix2InQAkZeD1UEjWS0jCd_Ih8e_2rDKuUaz3Gug,854
 kvirt/cluster/openshift/99-metal3-fake-machine.yaml,sha256=Bm1h00oD0PACNHk1QQJf-kfHQHD7f4VOkGRCQ9rfSUI,250
@@ -176,7 +176,7 @@ kvirt/cluster/openshift/99-ovn.yaml,sha256=cdEJWIVdFsaYLWtp5_v3TSI0sFTzYZvo2Euaj
 kvirt/cluster/openshift/99-prega-catalog.yaml,sha256=kRRCkq7joALdpeZlOL4zXvtZod6XRnk_mBgE7rTWxLA,313
 kvirt/cluster/openshift/99-sno.yaml,sha256=JFxdhvChu1o29fOzDyfuU-jtcfcLXd7G7YAt8y9HGU8,488
 kvirt/cluster/openshift/Corefile,sha256=lSF1OmirH2vyxO9qNItWzYLp-sLYF4z5liAX6LjTRkw,792
-kvirt/cluster/openshift/__init__.py,sha256=WXSALnDKGC4wiw_7yuGnBPEanatziNXtGsp5m3wkM6s,96502
+kvirt/cluster/openshift/__init__.py,sha256=dYgPCFHleNfRAxohfdptFn_VBFb8uw-CUG25Mu7dF1c,96599
 kvirt/cluster/openshift/autoapprovercron.yml,sha256=vR2IRwjNpu4rQDy3H_EDSt3Is0o7A7CIo_zbqcEv8ww,1324
 kvirt/cluster/openshift/autorules.yml,sha256=j0WEdUDUDbQrnMGEZXFRe3vNz2JQLNaDr_EjaucgAu8,985
 kvirt/cluster/openshift/bgp-vip.sh,sha256=e70UJTxb7H_mWK1Zi7ofHV2ISqWZYfpOG0tArtn8Dvo,459
@@ -285,11 +285,11 @@ kvirt/cluster/openshift/customisation/99-iptables.yaml,sha256=Ky_607MS_UEuTrRW65
 kvirt/cluster/openshift/customisation/99-monitoring.yaml,sha256=baO_U_-tLG2w_QmBsnarLe58m3v3KW2CWoFg0CsdR5Y,184
 kvirt/cluster/openshift/customisation/99-registry.yaml,sha256=dgzvUvHbuboyQDgyjpIpZn3I_rSPZG56YmwnIAJ9wzs,289
 kvirt/cluster/openshift/disconnected/haproxy.cfg,sha256=UJLex4syWzKSmg4KUrskCCO-OV28igksgAv8-EVOWi0,1364
-kvirt/cluster/openshift/disconnected/mirror-config.yaml,sha256=bjcPl3uadIEx7JaWHWkV_Xek3upLxZRI0_G5SGdOg7k,5745
+kvirt/cluster/openshift/disconnected/mirror-config.yaml,sha256=ImEEsA-gnECwXiLFDXhCNrByG_mj_4WRUXHjY4dBqA0,5723
 kvirt/cluster/openshift/disconnected/registry.service,sha256=Mc0KDlmifNt_SbTGVUj3QLtKZs6LPIk-GOtVjZkyQHY,211
 kvirt/cluster/openshift/disconnected/bin/sync_image.sh,sha256=U2Q28q3aO8B4PHN8AzFg_rJZZAnLPWCaZfJX_3yQvLs,328
-kvirt/cluster/openshift/disconnected/scripts/01_packages.sh,sha256=OGx16d343Q_HIkBu0kGjbwMCSnlLwheROAeHgtXuwbE,394
-kvirt/cluster/openshift/disconnected/scripts/02_registry.sh,sha256=tVaue72Tr71jVzTdcgyam0CqhMUQs-rqEuuJLJ6SYAU,2084
+kvirt/cluster/openshift/disconnected/scripts/01_packages.sh,sha256=sjGySdrNZofXseslvvKzTSVRBtaRGQxMKpROIrLJfWI,404
+kvirt/cluster/openshift/disconnected/scripts/02_registry.sh,sha256=EEBfy3NrLuuQ6NCjnWEoBEvIRL0xC-NmTUp-wQJdVmg,2099
 kvirt/cluster/openshift/disconnected/scripts/03_mirror.sh,sha256=F_a_ZWS-ulBO2wQOqSrfcPHFMa_4_GjBwf_bBspfMbo,3472
 kvirt/cluster/openshift/disconnected/scripts/04_web.sh,sha256=CYwycblPOu5f4hdAe83ZTde2ZeWkGb8CnNPR95SKy_U,197
 kvirt/cluster/openshift/disconnected/scripts/deploy.sh,sha256=fTRiycD9xQQAPTExH3kD3jqmwha_rA_nBEdjeRnIXmk,491
@@ -390,10 +390,10 @@ kvirt/providers/fake/__init__.py,sha256=TYJe0iwO0Y7QrksKx4E63-Lxgc6WYNcjAHAq_Lwh
 kvirt/providers/gcp/__init__.py,sha256=_8qln7pO0_3MSmZ1P4X-THlTbbwFuR_a4wVCCeL0WSI,102731
 kvirt/providers/gcp/gcp-hack.service,sha256=gG35O6KTLlGqIMwrSBqb_id-h3SWm_us_yLkLfQelOw,175
 kvirt/providers/gcp/gcp-hack.sh,sha256=kH051zNphRtJe-eVi8CX28_mxP6ID1f3pSTDzvE9XzE,220
-kvirt/providers/hcloud/__init__.py,sha256=CPf6L2pEMIGnAVVdt4fczjj2tlJmSkL0eSLoqC9-biE,22728
+kvirt/providers/hcloud/__init__.py,sha256=EO-yv-DBEjVwqeKt2xIN_As4k6teW0u3j1SoA4jY7UQ,22773
 kvirt/providers/ibm/__init__.py,sha256=OTGDRCwvvOZCTNGD_QXx52-9_tsBzA7Y079RAo9XL9M,66129
 kvirt/providers/kubevirt/__init__.py,sha256=x65aC-YxsjIVNuUxkvBcbvvMJbm8za7XNg2huogel1I,94583
-kvirt/providers/kvm/__init__.py,sha256=p1pTEUXOW1n5Qcj4qfQduGCVXYGd_PyhDuMVPknWMXs,195388
+kvirt/providers/kvm/__init__.py,sha256=cVhFpNF4MINR6jx-zfrAdL5e_sKV-oWuz8Atni2sYqI,195364
 kvirt/providers/kvm/helpers.py,sha256=t2CLczaU-gWPXL6iglK2Mlu-85ErH59nkdSA50v18lM,1965
 kvirt/providers/openstack/__init__.py,sha256=T8gGmgzF0JlzsHUHEKCOUGHW5KWfFPXig6lOvYeGeUU,60117
 kvirt/providers/ovirt/__init__.py,sha256=2qVEM3JsFnNm2gvTLRNdru5GZBwnQ7AzYSXyPdDGlT8,64383
@@ -403,7 +403,7 @@ kvirt/providers/vsphere/helpers.py,sha256=eJnwVGdWArTurH5ckzScvLThNJaMWeakdxBbDT
 kvirt/providers/vsphere/tagging.py,sha256=7RqFIUETSzHAjS0F_8-j145-_8lca7aDUsCxs4DhQVQ,4893
 kvirt/providers/web/__init__.py,sha256=_9fv0_x5VomFrMZqTsMLHkIRkvujmFgTxggtRctvMD0,22053
 kvirt/version/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kvirt/version/git,sha256=eiwQo7hwf22E7nSaVTMBlefFH6OGMFfVG8Gtux5zG1c,19
+kvirt/version/git,sha256=HWQvPCluXhzSJ7vEbM0SSIrhr7m5-o8gKk2xXmSdIUU,19
 kvirt/web/__init__.py,sha256=QW-FVaQGYogXwgV2g4f0J9s0QqUI6qIyX1ruRaiI8Yk,46658
 kvirt/web/main.py,sha256=DIb6tW3ce7wCc83kD9HBCG4ALJuLItp9uaP6tzdsm_Y,261
 kvirt/web/static/css/bootstrap-notify.css,sha256=ibUTW-jDj-F8d1T1KZ4DOujRmVTFfvMKL9y14QgEaPQ,408
@@ -645,8 +645,8 @@ kvirt/web/templates/vmprofiles.html,sha256=T65Cv7povhBtD2dyuWkWJE6byaA9EYtLSk5gt
 kvirt/web/templates/vmprofilestable.html,sha256=-8viNOqSvN_yzimENxq7Q0187zbflOn8p8zpgx0Vyek,1420
 kvirt/web/templates/vms.html,sha256=k2ptKeiLFdpzgfbk6xi__sduu0UALYXXrnrmDEmAfaQ,470
 kvirt/web/templates/vmstable.html,sha256=ikuYkIm_ocvGIBXFyJt1-tBjwQWCyqkgC08leoXgR54,4894
-kcli-99.0.202510240842.dist-info/METADATA,sha256=V92UhClbEsgg5R7C0DVKYi4CvDOoal_xwMVYuuwZpKU,4645
-kcli-99.0.202510240842.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kcli-99.0.202510240842.dist-info/entry_points.txt,sha256=i2SGYxlDWWeD6Nn0QBRT2kZ7uA4pmvVU5CunMeQ3zfA,207
-kcli-99.0.202510240842.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
-kcli-99.0.202510240842.dist-info/RECORD,,
+kcli-99.0.202511270652.dist-info/METADATA,sha256=1zIabsjW3PVuQ_2qEE3GA8Sp3cYZyzYzNEIlX1CGm0Y,4645
+kcli-99.0.202511270652.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kcli-99.0.202511270652.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
+kcli-99.0.202511270652.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
+kcli-99.0.202511270652.dist-info/RECORD,,

{kcli-99.0.202510240842.dist-info → kcli-99.0.202511270652.dist-info}/entry_points.txt

@@ -2,7 +2,8 @@
 ekstoken = kvirt.ekstoken:cli
 gketoken = kvirt.gketoken:cli
 kcli = kvirt.cli:cli
+kcliagent = kvirt.agent.agent:main
+kclimcp = kvirt.kmcp:main
 klist.py = kvirt.klist:main
-kmcp = kvirt.kmcp:main
 ksushy = kvirt.ksushy.main:run
 kweb = kvirt.web.main:run

kvirt/cluster/kubeadm/keepalived.sh

@@ -2,7 +2,7 @@ PKGMGR="{{ 'apt-get' if ubuntu else 'dnf' }}"
 $PKGMGR -y install keepalived
 NETMASK=$(ip -o -f inet addr show | awk '/scope global/ {print $4}' | head -1 | cut -d'/' -f2)
 sed -i "s/NETMASK/$NETMASK/" /root/keepalived.conf
-NIC=$(find /sys/class/net -type l -not -lname '*virtual*' -printf '%f\n' | head -1)
+NIC=$(awk '/default/ {for(i=1;i<=NF;i++) if($i=="dev") {print $(i+1); exit}}' <(ip route show default; ip -6 route show default))
 sed -i "s/NIC/$NIC/" /root/keepalived.conf
 cp /root/keepalived.conf /etc/keepalived
 systemctl enable --now keepalived

kvirt/cluster/microshift/kcli_default.yml

@@ -5,7 +5,7 @@ info: |
 cluster: mymicroshift
 domain: karmalabs.corp
 version: stable
-tag: '4.16'
+tag: '4.20'
 image: rhel9
 network: default
 memory: 4096

kvirt/cluster/openshift/99-kcli-forcedns

@@ -1,21 +1,18 @@
 #!/bin/bash
 
-which crictl >/dev/null 2>&1
+CLUSTER={{ cluster }}
+DOMAIN={{ domain }}
+
+[ "$(hostname -s)" == "{{ cluster }}-bootstrap" ] || which crictl >/dev/null 2>&1
 if [ "$?" != "0" ] ; then
   exit 0
 fi
 
-if [ "$2" = "dhcp4-change" ] || [ "$2" = "dhcp6-change" ] || [ "$2" = "up" ] || [ "$2" = "connectivity-change" ]; then
+if [ "$(grep '# kcli' /etc/resolv.conf)" == "" ] ; then
   sleep 2
   NIC={{ "$(ip -6 r | grep -v lo | head -1 | grep -oP '(?<=dev )[^ ]*')" if ipv6 else "$(ip r | grep default | head -1 | grep -oP '(?<=dev )[^ ]*')" }}
   IP={{ "$(ip -o -f inet6 addr show $NIC | head -1 | grep -oP '(?<=inet6 )[^ ]*' | cut -d '/' -f 1)" if ipv6 else "$(ip -o -f inet addr show $NIC | head -1 | grep -oP '(?<=inet )[^ ]*' | cut -d '/' -f 1)" }}
-  if [ "$IP" != "" ] ; then
-    grep -q $IP /etc/resolv.conf
-    if [ "$?" != "0" ] ; then
-      sed -i 's/{{ cluster }}.{{ domain }}//' /etc/resolv.conf
-      sed -i 's/search /search {{ cluster }}.{{ domain }} /' /etc/resolv.conf
-      sed -i "/nameserver.* #coredns/d" /etc/resolv.conf
-      sed -i "0,/nameserver/s/nameserver/nameserver $IP #coredns\n&/" /etc/resolv.conf
-    fi
-  fi
+  sed -i "s/$CLUSTER.$DOMAIN//" /etc/resolv.conf
+  sed -i "s/search /search $CLUSTER.$DOMAIN /" /etc/resolv.conf
+  sed -i "0,/nameserver/s/nameserver/nameserver $IP # kcli\n&/" /etc/resolv.conf
 fi

kvirt/cluster/openshift/__init__.py

@@ -938,12 +938,18 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
                 tag = f'registry.ci.openshift.org/{basetag}/release:{tag}'
     which_openshift = which('openshift-install')
     openshift_dir = os.path.dirname(which_openshift) if which_openshift is not None else '.'
-    if which_openshift is not None and not has_internet():
-        pprint("Using existing openshift-install found in your PATH")
-        warning("Not checking version")
-    elif okd:
-        run = get_okd_installer(tag, version=version)
-    elif not same_release_images(version=version, tag=tag, pull_secret=pull_secret, path=openshift_dir):
+    if which_openshift is None:
+        download = True
+    elif not has_internet:
+        pprint("Using existing openshift-install found in your PATH and skipping version check")
+        download = False
+    else:
+        download = not same_release_images(version=version, tag=tag, pull_secret=pull_secret, path=openshift_dir)
+        if download:
+            pprint("Redownloading openshift-install as found version doesn't match requirements")
+    if download:
+        if okd:
+            run = get_okd_installer(tag, version=version)
         if version in ['ci', 'nightly'] or '/' in str(tag):
             nightly = version == 'nightly'
             run = get_ci_installer(pull_secret, tag=tag, nightly=nightly)
@@ -954,10 +960,6 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
         if run != 0:
             return {'result': 'failure', 'reason': "Couldn't download openshift-install"}
         pprint("Move downloaded openshift-install somewhere in your PATH if you want to reuse it")
-    elif which_openshift is not None:
-        pprint("Using existing openshift-install found in your PATH")
-    else:
-        pprint("Reusing matching openshift-install")
     os.environ["PATH"] = f'{os.getcwd()}:{os.environ["PATH"]}'
     INSTALLER_VERSION = get_installer_version()
     pprint(f"Using installer version {INSTALLER_VERSION}")
@@ -1173,8 +1175,11 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
             if not f.endswith('.yml') and not f.endswith('.yaml'):
                 warning(f"Skipping manifest {f}")
                 continue
-            if f == '99-openshift-disconnected-catalog.yaml' and disconnected_url is not None:
-                content = content.replace('REGISTRY', disconnected_url).replace('TAG', OPENSHIFT_TAG)
+            if f == '99-openshift-disconnected-catalog.yaml':
+                if disconnected_url is not None:
+                    content = content.replace('REGISTRY', disconnected_url).replace('TAG', OPENSHIFT_TAG)
+                else:
+                    continue
             if f == '98-var-lib-containers-partitioned.yaml':
                 content = content.replace('SNO_DISK', sno_disk or '/dev/sda')
             pprint(f"Injecting manifest {f}")

kvirt/cluster/openshift/disconnected/mirror-config.yaml

@@ -13,18 +13,15 @@ mirror:
   platform:
     graph: false
 {% if version in ['ci', 'nightly'] %}
-{% set release = 'origin/release-scos:scos-%s' % tag if okd else 'registry.ci.openshift.org/ocp/release:%s' % tag %}
+{% set release = 'origin/release-scos:scos-%s' % tag if okd else 'ocp/release:%s' % tag %}
     release: registry.ci.openshift.org/{{ release }}
 {% else %}
     channels:
     - name: {{ disconnected_channel or ('candidate' if 'rc' in tag else 'stable') }}-{{ release }}
-{% if tag|count('.') > 1 %}
-      minVersion: {{ (disconnected_extra_release or tag)|min_ocp_version(tag) }}
-      maxVersion: {{ (disconnected_extra_release or tag)|max_ocp_version(tag) }}
-{% endif %}
+      minVersion: {{ (disconnected_extra_release or openshift_version)|min_ocp_version(openshift_version) }}
+      maxVersion: {{ (disconnected_extra_release or openshift_version)|max_ocp_version(openshift_version) }}
 {% endif %}
     architectures:
-#   - multi
     - amd64
   additionalImages:
 {% for image in kcli_images + extra_images|default([]) %}

kvirt/cluster/openshift/disconnected/scripts/01_packages.sh

@@ -1,9 +1,9 @@
 if [ "$(which dnf)" != "" ] ; then
 echo "fastestmirror=1" >> /etc/dnf/dnf.conf
-dnf -y install podman httpd httpd-tools jq skopeo libseccomp-devel haproxy
+dnf -y install podman httpd httpd-tools jq skopeo libseccomp-devel haproxy runc
 else
 apt-get update
-apt-get -y install podman apache2 apache2-utils jq skopeo haproxy
+apt-get -y install podman apache2 apache2-utils jq skopeo haproxy runc
 fi
 
 curl https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz | tar zxf - oc

kvirt/cluster/openshift/disconnected/scripts/02_registry.sh

@@ -45,6 +45,6 @@ else
  update-ca-certificates
 fi
 htpasswd -bBc /opt/registry/auth/htpasswd $REGISTRY_USER $REGISTRY_PASSWORD
-podman create --name registry --net host --security-opt label=disable -v /opt/registry/data:/var/lib/registry:z -v /opt/registry/auth:/auth:z -v /opt/registry/conf/config.yml:/etc/docker/registry/config.yml -e "REGISTRY_AUTH=htpasswd" -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry" -e "REGISTRY_HTTP_SECRET=ALongRandomSecretForRegistry" -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd -v /opt/registry/certs:/certs:z -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt -e REGISTRY_HTTP_TLS_KEY=/certs/domain.key $REGISTRY_IMAGE
+podman create --name registry --net host --runtime=runc --security-opt label=disable -v /opt/registry/data:/var/lib/registry:z -v /opt/registry/auth:/auth:z -v /opt/registry/conf/config.yml:/etc/docker/registry/config.yml -e "REGISTRY_AUTH=htpasswd" -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry" -e "REGISTRY_HTTP_SECRET=ALongRandomSecretForRegistry" -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd -v /opt/registry/certs:/certs:z -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/domain.crt -e REGISTRY_HTTP_TLS_KEY=/certs/domain.key $REGISTRY_IMAGE
 [ "$?" == "0" ] || !!
 systemctl enable --now registry

kvirt/config.py

@@ -135,7 +135,7 @@ class Kconfig(Kbaseconfig):
                 except Exception as e:
                     exception = e if debug else None
                     dependency_error('hcloud', exception)
-                k = Khcloud(api_key=apikey, location=location)
+                k = Khcloud(api_key=apikey, location=location, debug=debug)
             elif self.type == 'azure':
                 try:
                     from kvirt.providers.azure import Kazure
@@ -1067,8 +1067,11 @@ class Kconfig(Kbaseconfig):
                 if index < len(disks):
                     disk = disks[index]
                     currentdisksize = currentdisk['size']
-                    disksize = disk.get('size', 10) if isinstance(disk, dict) else int(disk)
-                    if disksize > currentdisksize:
+                    disksize = disk.get('size', 10) if isinstance(disk, dict) else int(disk) if disk.isdigit() else None
+                    if disksize is None:
+                        warning(f"Invalid Disk {index} value {disk} in {name}")
+                        break
+                    elif disksize > currentdisksize:
                         if currentvm.get('status') != 'down':
                             warning(f"Cant resize Disk {index} in {name} while VM is up")
                             break

kvirt/kmcp.py

@@ -9,6 +9,10 @@ from typing import Optional, List, Dict, Any
 from urllib.request import urlopen
 
 
+def handle_none(values):
+    return [None if e is not None and isinstance(e, str) and 'none' in e.lower() else e for e in values]
+
+
 def _parse_vms_list(_list, overrides={}):
     if isinstance(_list, str):
         print(_list)
@@ -62,6 +66,7 @@ def create_kube(context: Context,
                 disks: List[Dict] = [], nets: List[Dict] = [], sno_vm: bool = False,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None, overrides: Dict[str, Any] = {}) -> Dict[str, Any]:
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     """Create cluster"""
     if disks:
         overrides['disk_size'] = disks[0]['size'] if isinstance(disks[0], dict) else disks[0]
@@ -109,6 +114,7 @@ def create_network(context: Context,
                    client: str = None, debug: bool = False, region: str = None,
                    zone: str = None, namespace: str = None, overrides: dict = {}) -> dict:
     """Create network"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     nodhcp = not dhcp if dhcp is not None else nodhcp
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
@@ -128,6 +134,7 @@ def create_plan(context: Context,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None, overrides: dict = {}) -> dict:
     """Create plan"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     # if container_mode():
     #    inputfile = f"/workdir/{inputfile}"
     if 'minimum_version' in overrides:
@@ -159,6 +166,7 @@ def create_pool(context: Context,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None) -> dict:
     """Create pool"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     if path is None:
@@ -173,6 +181,7 @@ def create_vm(context: Context,
               client: str = None, debug: bool = False, region: str = None,
               zone: str = None, namespace: str = None, overrides: dict = {}) -> dict:
     """Create vm"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.create_vm(name, profile, overrides=overrides)
 
@@ -183,6 +192,7 @@ def delete_kube(context: Context,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None, overrides: dict = {}):
     """Delete cluster"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     if client is not None:
         overrides['client'] = client
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
@@ -197,6 +207,7 @@ def delete_network(context: Context,
                    client: str = None, debug: bool = False, region: str = None,
                    zone: str = None, namespace: str = None) -> Dict[str, Any]:
     """Delete network"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     for name in names:
@@ -212,6 +223,7 @@ def delete_plan(context: Context,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None) -> Dict[str, Any]:
     """Delete plan"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     plans = [p[0] for p in config.list_plans()] if allplans else plans
     for plan in plans:
@@ -227,6 +239,7 @@ def delete_pool(context: Context,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None) -> dict:
     """Delete pool"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     return k.delete_pool(name=pool, full=full)
@@ -238,6 +251,7 @@ def delete_vm(context: Context,
               client: str = None, debug: bool = False, region: str = None,
               zone: str = None, namespace: str = None) -> dict:
     """Delete vm"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.delete(vm)
 
@@ -248,6 +262,7 @@ def info_vm(context: Context,
             client: str = None, debug: bool = False, region: str = None,
             zone: str = None, namespace: str = None) -> dict:
     """Get info of vm"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.info(name)
 
@@ -256,6 +271,8 @@ def info_vm(context: Context,
 def list_clients(context: Context,
                  client: str = None, debug: bool = False) -> list:
     """List clients"""
+    if client is not None and client.lower() == 'none':
+        client = None
     clientstable = ["Client", "Type", "Enabled", "Current"]
     baseconfig = Kbaseconfig(client=client, debug=debug)
     for client in sorted(baseconfig.clients):
@@ -273,6 +290,7 @@ def list_clusters(context: Context,
                   client: str = None, debug: bool = False, region: str = None,
                   zone: str = None, namespace: str = None) -> list:
     """List clusters"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.list_kubes()
 
@@ -282,6 +300,7 @@ def list_images(context: Context,
                 client: str = None, debug: bool = False, region: str = None,
                 zone: str = None, namespace: str = None) -> list:
     """List images"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     return Kconfig(client=client).k.volumes()
 
 
@@ -290,6 +309,7 @@ def list_networks(context: Context,
                   client: str = None, debug: bool = False, region: str = None,
                   zone: str = None, namespace: str = None) -> dict:
     """List networks"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.list_networks()
 
@@ -299,6 +319,7 @@ def list_pools(context: Context,
                client: str = None, debug: bool = False, region: str = None,
                zone: str = None, namespace: str = None) -> list:
     """List pools"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.list_pools()
 
@@ -308,6 +329,7 @@ def list_vms(context: Context,
              client: str = None, debug: bool = False, region: str = None,
              zone: str = None, namespace: str = None) -> list:
     """List vms"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.list()
 
@@ -318,6 +340,7 @@ def scale_kube(context: Context,
                client: str = None, debug: bool = False, region: str = None,
                zone: str = None, namespace: str = None, overrides: dict = {}) -> dict:
     """Scale cluster"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     if ctlplanes is not None:
         overrides['ctlplanes'] = ctlplanes
@@ -332,6 +355,7 @@ def start_plan(context: Context,
                client: str = None, debug: bool = False, region: str = None,
                zone: str = None, namespace: str = None) -> Dict[str, Any]:
     """Start plan"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     for plan in plans:
         result = config.start_plan(plan)
@@ -346,6 +370,7 @@ def start_vm(context: Context,
              client: str = None, debug: bool = False, region: str = None,
              zone: str = None, namespace: str = None) -> dict:
     """Start vm"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     return Kconfig(client).k.start(name)
 
 
@@ -355,6 +380,7 @@ def stop_plan(context: Context,
               client: str = None, debug: bool = False, region: str = None,
               zone: str = None, namespace: str = None) -> Dict[str, Any]:
     """Stop plan"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     for plan in plans:
         result = config.stop_plan(plan, soft=soft)
@@ -369,6 +395,7 @@ def stop_vm(context: Context,
             client: str = None, debug: bool = False, region: str = None,
             zone: str = None, namespace: str = None) -> dict:
     """Stop vm"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.k.stop(name)
 
@@ -379,6 +406,7 @@ def create_bucket(context: Context,
                   client: str = None, debug: bool = False, region: str = None,
                   zone: str = None, namespace: str = None):
     """Create bucket"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     for bucket in buckets:
@@ -391,6 +419,7 @@ def create_bucketfile(context: Context,
                       client: str = None, debug: bool = False, region: str = None,
                       zone: str = None, namespace: str = None) -> str:
     """Create bucketfile in bucket"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     return k.upload_to_bucket(bucket, path, temp_url=temp, public=public)
@@ -402,6 +431,7 @@ def create_dns(context: Context,
                client: str = None, debug: bool = False, region: str = None,
                zone: str = None, namespace: str = None):
     """Create dns entry"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     if alias is None:
         alias = []
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
@@ -419,6 +449,7 @@ def create_lb(context: Context,
               client: str = None, debug: bool = False, region: str = None,
               zone: str = None, namespace: str = None):
     """Create load balancer"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     if name is None:
         name = get_random_name().replace('_', '-')
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
@@ -432,6 +463,7 @@ def create_securitygroup(context: Context,
                          client: str = None, debug: bool = False, region: str = None,
                          zone: str = None, namespace: str = None, overrides: dict = {}) -> dict:
     """Create security group"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     securitygroup = securitygroup
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
@@ -444,6 +476,7 @@ def delete_bucket(context: Context,
                   client: str = None, debug: bool = False, region: str = None,
                   zone: str = None, namespace: str = None):
     """Delete bucket"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     for bucket in buckets:
@@ -456,6 +489,7 @@ def delete_bucketfile(context: Context,
                       client: str = None, debug: bool = False, region: str = None,
                       zone: str = None, namespace: str = None):
     """Delete bucketfile from bucket"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     k.delete_from_bucket(bucket, path)
@@ -467,6 +501,7 @@ def delete_dns(context: Context,
                client: str = None, debug: bool = False, region: str = None,
                zone: str = None, namespace: str = None):
     """Delete dns entry"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     domain = domain or net
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
@@ -479,6 +514,7 @@ def delete_lb(context: Context,
               names: list = [], client: str = None, debug: bool = False, region: str = None,
               zone: str = None, namespace: str = None):
     """Delete load balancer"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     for name in names:
         config.delete_loadbalancer(name)
@@ -490,6 +526,7 @@ def delete_securitygroup(context: Context,
                          client: str = None, debug: bool = False, region: str = None,
                          zone: str = None, namespace: str = None):
     """Delete security group"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     for securitygroup in securitygroups:
@@ -502,6 +539,7 @@ def download_bucketfile(context: Context,
                         client: str = None, debug: bool = False, region: str = None,
                         zone: str = None, namespace: str = None):
     """Download bucketfile from bucket"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     k.download_from_bucket(bucket, path)
@@ -513,6 +551,7 @@ def list_bucketfiles(context: Context,
                      client: str = None, debug: bool = False, region: str = None,
                      zone: str = None, namespace: str = None) -> list:
     """List bucketfiles of bucket"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     return k.list_bucketfiles(bucket)
@@ -523,6 +562,7 @@ def list_buckets(context: Context,
                  client: str = None, debug: bool = False, region: str = None,
                  zone: str = None, namespace: str = None) -> list:
     """List buckets"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     return k.list_buckets()
@@ -534,6 +574,7 @@ def list_dns_entries(context: Context,
                      client: str = None, debug: bool = False, region: str = None,
                      zone: str = None, namespace: str = None) -> list:
     """List dns entries"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     if domain is None:
         return config.k.list_dns_zones()
@@ -546,6 +587,7 @@ def list_lbs(context: Context,
              client: str = None, debug: bool = False, region: str = None,
              zone: str = None, namespace: str = None) -> list:
     """List load balancers"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     return config.list_loadbalancers()
 
@@ -556,6 +598,7 @@ def list_securitygroups(context: Context,
                         client: str = None, debug: bool = False, region: str = None,
                         zone: str = None, namespace: str = None) -> list:
     """List security groups"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     k = config.k
     return k.list_security_groups(network=network)
@@ -567,6 +610,7 @@ def update_securitygroup(context: Context,
                          client: str = None, debug: bool = False, region: str = None,
                          zone: str = None, namespace: str = None, overrides: dict = {}):
     """Update security group"""
+    client, region, zone, namespace = handle_none([client, region, zone, namespace])
     config = Kconfig(client=client, debug=debug, region=region, zone=zone, namespace=namespace)
     result = config.k.update_security_group(name=securitygroup, overrides=overrides)
     common.handle_response(result, securitygroup, element='SecurityGroup', action='updated')

kvirt/providers/hcloud/__init__.py

@@ -15,10 +15,11 @@ import os
 
 
 class Khcloud():
-    def __init__(self, api_key=None, location=None):
+    def __init__(self, api_key=None, location=None, debug=False):
         self.conn = Client(token=api_key)
         self.location = self.conn.locations.get_by_name(location)
         self.machine_flavor_cache = {}
+        self.debug = debug
         return
 
     def create(self, name, virttype=None, profile='', flavor=None, plan='kvirt', cpumodel='host-model', cpuflags=[],
@@ -533,7 +534,7 @@ class Khcloud():
         for disk in alldisks:
             if self.debug:
                 print(disk)
-            disks[disk.name] = {'pool': "", 'path': self.location}
+            disks[disk.name] = {'pool': "", 'path': disk.location.name}
         return disks
 
     def list_buckets(self):

kvirt/providers/kvm/__init__.py

@@ -1449,7 +1449,8 @@ class Kvirt(object):
         xml = vm.XMLDesc(0)
         root = ET.fromstring(xml)
         for _os in list(root.iter('os')):
-            if list(_os.iter('boot'))[0].get('dev') == 'cdrom':
+            boot = _os.iter('boot')
+            if boot is not None and list(boot)[0].get('dev') == 'cdrom':
                 return {'result': 'success'}
         newxml = ET.tostring(root).decode("utf-8")
         newxml = newxml.replace('dev="cdrom"', 'dev="TEMP"')
@@ -1960,7 +1961,7 @@ class Kvirt(object):
                 if ips and 'ip' not in yamlinfo:
                     ip4s = [i for i in ips if ':' not in i]
                     ip6s = [i for i in ips if i not in ip4s]
-                    yamlinfo['ip'] = ip4s[0] if ip4s else ip6s[0]
+                    yamlinfo['ip'] = ip4s[0] if ip4s else ip6s[-1]
         if len(all_ips) > 1:
             yamlinfo['ips'] = all_ips
         pcidevices = []
@@ -2692,7 +2693,6 @@ class Kvirt(object):
                 else:
                     vm.setVcpus(numcpus)
                     return {'result': 'success'}
-            warning("Note it will only be effective upon next start")
         cpunode.text = str(numcpus)
         newxml = ET.tostring(root).decode("utf-8")
         conn.defineXML(newxml)

kvirt/version/git

@@ -1 +1 @@
-28d0b9f 2025/10/24
+e2cb617 2025/11/27