kcli 99.0.202511280701__tar.gz → 99.0.202601211329__tar.gz

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202511280701
+Version: 99.0.202601211329
 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.202511280701 → kcli-99.0.202601211329}/kcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202511280701
+Version: 99.0.202601211329
 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.202511280701 → kcli-99.0.202601211329}/kcli.egg-info/SOURCES.txt

@@ -135,6 +135,7 @@ kvirt/cluster/kubeadm/nfs.yml
 kvirt/cluster/kubeadm/pre_el.sh
 kvirt/cluster/kubeadm/pre_ubuntu.sh
 kvirt/cluster/kubeadm/registry.yml
+kvirt/cluster/kubeadm/sdn.sh
 kvirt/cluster/kubeadm/workers.yml
 kvirt/cluster/kubeadm/apps/argocd/ingress.yml
 kvirt/cluster/kubeadm/apps/argocd/install.sh

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cli.py

@@ -1764,7 +1764,11 @@ def create_kube(args):
         overrides = interactive_kube(args.type)
     disks = overrides.get('disks', [])
     if disks:
-        overrides['disk_size'] = disks[0]['size'] if isinstance(disks[0], dict) else disks[0]
+        disk_size = disks[0]['size'] if isinstance(disks[0], dict) else disks[0]
+        if not isinstance(disk_size, int):
+            error(f"Wrong disk size {disk_size}")
+            sys.exit(1)
+        overrides['disk_size'] = disk_size
         if len(disks) > 1:
             overrides['extra_disks'] = disks[1:]
     nets = overrides.get('nets', [])

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/__init__.py

@@ -220,6 +220,7 @@ def create(config, plandir, cluster, overrides):
         return {'result': 'failure', 'reason': msg}
     if which('kubectl') is None:
         get_kubectl()
+        pprint("Move downloaded kubectl somewhere in your PATH if you want to reuse it")
     if not os.path.exists(clusterdir):
         os.makedirs(clusterdir)
         os.mkdir(f"{clusterdir}/auth")
@@ -227,6 +228,7 @@ def create(config, plandir, cluster, overrides):
     disconnected_url = data['disconnected_url']
     disconnected_reuse = data['disconnected_reuse']
     disconnected_vm = data['disconnected_vm'] or (disconnected_url is None and disconnected)
+    data['ipv6'] = api_ip is not None and ':' in api_ip
     if provider not in cloud_providers and disconnected_vm:
         disconnected_vm = f"{data['disconnected_reuse_name'] or cluster}-registry"
         pprint(f"Deploying disconnected vm {disconnected_vm}")

kcli-99.0.202601211329/kvirt/cluster/kubeadm/bootstrap.sh

@@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+
+CLUSTER={{ cluster }}
+DOMAIN={{ domain }}
+
+echo $(hostname -I) api.$CLUSTER.$DOMAIN >> /etc/hosts
+
+kubeadm init --config=/root/config.yaml --upload-certs
+
+# config cluster credentials
+cp /etc/kubernetes/admin.conf /root/kubeconfig
+chown root:root /root/kubeconfig
+export KUBECONFIG=/root/kubeconfig
+echo "export KUBECONFIG=/root/kubeconfig" >> /root/.bashrc
+
+{% if ctlplane_schedulable or workers == 0 %}
+# untaint ctlplane nodes when there are no workers
+kubectl taint nodes --all node-role.kubernetes.io/master-
+kubectl taint nodes --all node-role.kubernetes.io/control-plane-
+{% endif %}
+
+{% if sdn != None %}
+bash /root/sdn.sh
+{% endif %}
+
+# config cluster credentials
+mkdir -p /root/.kube
+cp -i /etc/kubernetes/admin.conf /root/.kube/config
+chown root:root /root/.kube/config
+
+{% if multus %}
+kubectl apply -f https://raw.githubusercontent.com/k8snetworkplumbingwg/multus-cni/master/deployments/multus-daemonset-thick.yml
+{% endif %}
+
+{% if nfs %}
+/root/nfs.sh
+{% endif %}
+
+{% if registry %}
+kubectl create -f /root/registry.yml
+{% endif %}

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/bootstrap.yml

@@ -57,5 +57,6 @@
    origin: 90-flannel.rules
 {% endif %}
  - registry.yml
+ - sdn.sh
  cmds:
  - bash /root/deploy.sh

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/config_bootstrap.yaml

@@ -20,13 +20,21 @@
 {{ runtime_config_string.append(entry) or "" }}
 {% endfor %}
 {% endif %}
+
+{% if not cluster_networks %}
+{% set cluster_networks = [cluster_network_ipv4] + [cluster_network_ipv6] if dualstack|default(False) else [cluster_network_ipv6] if ipv6 else [cluster_network_ipv4] %}
+{% endif %}
+{% if not service_networks %}
+{% set service_networks = [service_network_ipv4] + [service_network_ipv6] if dualstack|default(False) else [service_network_ipv6] if ipv6 else [service_network_ipv4] %}
+{% endif %}
+
 apiVersion: kubeadm.k8s.io/v1beta3
 kind: InitConfiguration
 bootstrapTokens:
 - token: "{{ token }}"
   ttl: "0"
 localAPIEndpoint:
-  advertiseAddress: 0.0.0.0
+  advertiseAddress: "{{ '::' if ipv6 else '0.0.0.0' }}"
   bindPort: 6443
 certificateKey: "{{ cert_key }}"
 ---
@@ -38,8 +46,8 @@ kubernetesVersion: {{ minor_version }}
 {% endif %}
 controlPlaneEndpoint: {{ api_fqdn }}:6443
 networking:
-  podSubnet: {{ cluster_network_ipv4 }}
-  serviceSubnet: {{ service_network_ipv4 }}
+  podSubnet: {{ ','.join(cluster_networks) }}
+  serviceSubnet: {{ ','.join(service_networks) }}
 {% if domain != None %}
   dnsDomain: "{{ cluster }}.{{ domain }}"
 {% endif %}

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/containerd.sh

@@ -5,9 +5,8 @@ apt-get update
 apt-get install -y containerd || apt-get install -y containerd.io
 {% else %}
 TARGET={{ 'fedora' if 'fedora' in image|lower else 'centos' }}
-dnf install -y yum-utils device-mapper-persistent-data lvm2
 yum-config-manager --add-repo https://download.docker.com/linux/$TARGET/docker-ce.repo
-dnf install -y containerd.io
+dnf install -y yum-utils device-mapper-persistent-data lvm2 containerd.io
 {% endif %}
 
 mkdir -p /etc/containerd

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/disconnected/scripts/04_mirror.sh

@@ -12,9 +12,33 @@ gpgkey=https://pkgs.k8s.io/core:/stable:/$VERSION/rpm/repodata/repomd.xml.key"""
 
 export PATH=/root/bin:$PATH
 
+{% if ipv6 %}
+dnf -y install httpd createrepo
+{% if engine == 'crio' %}
+PROJECT_PATH={{ engine_version or 'stable:/$VERSION' }}
+echo """[cri-o]
+name=CRI-O
+baseurl=https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH/rpm
+enabled=1
+gpgcheck=1
+gpgkey=https://download.opensuse.org/repositories/isv:/cri-o:/$PROJECT_PATH/rpm/repodata/repomd.xml.key""" >/etc/yum.repos.d/cri-o.repo
+PACKAGES="cri-o conntrack"
+{% else %}
+yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+PACKAGES="device-mapper-persistent-data lvm2 containerd.io"
+{% endif %}
+# SYNC PACKAGES
+dnf -y install --setopt=keepcache=1 kubeadm $PACKAGES git kubectl kubelet iptables keepalived
+dnf download --destdir /var/www/html container-selinux selinux-policy selinux-policy-any iptables iptables-libs libnftnl
+mv /var/cache/dnf/*/packages/*.rpm /var/www/html
+createrepo /var/www/html
+restorecon -Frvv /var/www/html
+sed -i "s/Listen 80/Listen 8080/" /etc/httpd/conf/httpd.conf
+systemctl enable --now httpd
+{% endif %}
+
 # KUBEADM
 IMAGES_VERSION=$(echo $VERSION| sed 's/^v/stable-/')
-yum -y install kubeadm
 for image in $(kubeadm config images list --kubernetes-version $IMAGES_VERSION) ; do sync_image.sh $image ; done
 
 cd /root
@@ -23,15 +47,9 @@ cd /root
 {% if sdn == 'flannel' %}
 FLANNEL_VERSION={{ 'flannel-io/flannel'|github_version(flannel_version) }}
 curl -Ls https://raw.githubusercontent.com/flannel-io/flannel/$FLANNEL_VERSION/Documentation/kube-flannel.yml > sdn.yml
-{% elif sdn == 'weavenet' %}
-curl -Ls -f "https://cloud.weave.works/k8s/net?k8s-version=`kubectl version | base64 | tr -d '\n'`" > sdn.yml
 {% elif sdn == 'calico' %}
 CALICO_VERSION={{ 'projectcalico/calico'|github_version(calico_version) }}
 curl -Ls https://raw.githubusercontent.com/projectcalico/calico/$CALICO_VERSION/manifests/tigera-operator.yaml > sdn.yml
-{% elif sdn == 'canal' %}
-curl -Ls https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/canal/canal.yaml > sdn.yml
-{% elif sdn == 'romana' %}
-curl -Ls https://raw.githubusercontent.com/romana/romana/master/containerize/specs/romana-kubeadm.yml > sdn.yml
 {% elif sdn == 'cilium' %}
 curl -LO https://github.com/cilium/cilium-cli/releases/latest/download/cilium-linux-amd64.tar.gz
 tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
@@ -42,11 +60,12 @@ for image in $CILIUM_IMAGES ; do echo image: $image:$CILIUM_VERSION >> sdn.yml ;
 echo image: quay.io/cilium/cilium-envoy:latest >> sdn.yml
 {% endif %}
 
+[ -d /var/www/html ] && [ -f sdn.yml ] && cp sdn.yml /var/www/html/sdn.yml && restorecon -Frvv /var/www/html
 sdn_images=$(grep image: sdn.yml | sed 's/image: //' | sed 's/@.*//' | sort -u)
 for image in $sdn_images ; do sync_image.sh $image ; done
 {% endif %}
 
-#NGINX
+# NGINX
 curl -Lk https://raw.githubusercontent.com/kubernetes/ingress-nginx/master/deploy/static/provider/{{ 'cloud' if metallb|default(False) else 'baremetal' }}/deploy.yaml > ingress.yml
 nginx_images=$(grep image: ingress.yml | sed 's/.* image: //' | sed 's/@.*//' | sort -u)
 for image in $nginx_images ; do sync_image.sh $image ; done

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/kcli_default.yml

@@ -3,7 +3,7 @@ info: |
     when using more than one ctlplane, a vip is used with keepalived.
     default image is centos9stream, but there's also support for ubuntu based ones and fedora.
     version can be let blank to get latest, or specified as x.yy or x.yy.z .
-    sdn can be choosen between flannel, weavenet, calico, canal, romana or cilium.
+    sdn can be choosen between flannel, calico or cilium.
     nfs can be set to deploy an initial set of pvcs on the first ctlplane node.
     You can deploy extra apps with the apps array and for each of the supported apps, indicate with the variable
     ${app}_version which version to target.
@@ -20,6 +20,7 @@ version:
 pool: 
 cluster: mykube
 domain: karmalabs.corp
+ctlplane_schedulable: false
 engine: containerd
 engine_version:
 numcpus: 4
@@ -93,3 +94,8 @@ kube_proxy: true
 ignore_hosts: false
 runtime_config: []
 postscripts: []
+cluster_network_ipv6: "fd01::/48"
+service_network_ipv6: "fd02::/112"
+dualstack: false
+cluster_networks: []
+service_networks: []

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/pre_el.sh

@@ -2,12 +2,23 @@ VERSION={{ version or "$(curl -L -s https://dl.k8s.io/release/stable.txt)" }}
 # Ensure the version is in the format v<major>.<minor> regardless of the source
 VERSION=$(echo "v${VERSION#v}" | cut -d. -f1,2)
 
+{% if ipv6 %}
+rm -rf /etc/yum.repos.d/*.repo
+BASEURL=http://{{ disconnected_url.split(':')[0] }}:8080
+GPGCHECK=0
+sed -i "/cri-o.repo/a\echo rm -f /etc/yum.repos.d/cri-o.repo" /root/crio-d.sh
+sed -i "/add-repo/d" /root/containerd.sh
+{% else %}
+BASEURL=https://pkgs.k8s.io/core:/stable:/$VERSION/rpm/
+GPGCHECK=1
+{% endif %}
+
 echo """[kubernetes]
 name=Kubernetes
-baseurl=https://pkgs.k8s.io/core:/stable:/$VERSION/rpm/
+baseurl=$BASEURL
 enabled=1
-gpgcheck=1
-gpgkey=https://pkgs.k8s.io/core:/stable:/$VERSION/rpm/repodata/repomd.xml.key""" >/etc/yum.repos.d/kubernetes.repo
+gpgcheck=$GPGCHECK
+gpgkey=https://pkgs.k8s.io/core:/stable:/$VERSION/rpm/repodata/repomd.xml.key""" > /etc/yum.repos.d/kubernetes.repo
 echo net.bridge.bridge-nf-call-iptables=1 >> /etc/sysctl.d/99-sysctl.conf
 sysctl -p
 setenforce 0
@@ -27,6 +38,8 @@ cat <<EOF | tee /etc/sysctl.d/99-kubernetes-cri.conf
 net.bridge.bridge-nf-call-iptables  = 1
 net.ipv4.ip_forward                 = 1
 net.bridge.bridge-nf-call-ip6tables = 1
+net.ipv6.conf.all.forwarding        = 1
+net.ipv6.conf.default.forwarding    = 1
 EOF
 sysctl --system
 

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/kubeadm/pre_ubuntu.sh

@@ -21,6 +21,8 @@ cat <<EOF | tee /etc/sysctl.d/99-kubernetes-cri.conf
 net.bridge.bridge-nf-call-iptables  = 1
 net.ipv4.ip_forward                 = 1
 net.bridge.bridge-nf-call-ip6tables = 1
+net.ipv6.conf.all.forwarding        = 1
+net.ipv6.conf.default.forwarding    = 1
 EOF
 sysctl --system
 

kcli-99.0.202601211329/kvirt/cluster/kubeadm/sdn.sh

@@ -0,0 +1,34 @@
+POD_CIDR={{ cluster_network_ipv6 if ipv6 else cluster_network_ipv4 }}
+# install Container Network Interface (CNI)
+{% if sdn == 'flannel' %}
+{% if ipv6 %}
+curl -Ls http://{{ disconnected_url.split(':')[0] }}:8080/sdn.yml > /root/sdn.yml
+sed -i "s@10.244.0.0/16@$POD_CIDR@" /root/sdn.yml
+sed -i 's/"Network":/"IPV6Network":/' /root/sdn.yml
+sed -i '/"IPV6Network":/a\      "EnableIPV4": false,\n      "EnableIPV6": true,' /root/sdn.yml
+{% else %}
+FLANNEL_VERSION={{ 'flannel-io/flannel'|github_version(flannel_version) }}
+curl -Ls https://raw.githubusercontent.com/flannel-io/flannel/$FLANNEL_VERSION/Documentation/kube-flannel.yml > /root/sdn.yml
+sed -i "s@10.244.0.0/16@$POD_CIDR@" /root/sdn.yml
+{% if dualstack %}
+sed -i '/"Network":/a\      "IPV6Network": "{{ cluster_network_ipv6 }}",\n      "EnableIPV4": true,\n      "EnableIPV6": true,' /root/sdn.yml
+{% endif %}
+{% endif %}
+kubectl apply -f /root/sdn.yml
+{% elif sdn == 'calico' %}
+CALICO_VERSION={{ 'projectcalico/calico'|github_version(calico_version) }}
+curl -L https://raw.githubusercontent.com/projectcalico/calico/$CALICO_VERSION/manifests/tigera-operator.yaml > /root/tigera-operator.yaml
+curl -L https://raw.githubusercontent.com/projectcalico/calico/$CALICO_VERSION/manifests/custom-resources.yaml > /root/tigera-custom-resources.yaml
+sed -i "s@192.168.0.0/16@$POD_CIDR@" /root/tigera-custom-resources.yaml
+kubectl create -f /root/tigera-operator.yaml
+sleep 10
+kubectl create -f /root/tigera-custom-resources.yaml
+{% elif sdn == 'cilium' %}
+curl -LO https://github.com/cilium/cilium-cli/releases/latest/download/cilium-linux-amd64.tar.gz
+tar xzvfC cilium-linux-amd64.tar.gz /usr/local/bin
+rm -f cilium-linux-amd64.tar.gz
+CILIUM_VERSION={{ "--version %s" % sdn_version if sdn_version != None else "" }}
+CILIUM_REGISTRY={{ "--helm-set=image.repository=%s/cilium/cilium --helm-set image.useDigest=false --helm-set=envoy.image.repository=%s/cilium/cilium-envoy --helm-set=envoy.image.tag=latest --helm-set=envoy.image.useDigest=false --helm-set=operator.image.repository=%s/cilium/operator --helm-set=operator.image.useDigest=false" % (disconnected_url, disconnected_url, disconnected_url) if disconnected_url is defined else "" }}
+CILIUM_IPV6={{ "--helm-set=ipv6.enabled=true" if ipv6 or dualstack else "" }}
+cilium install $CILIUM_VERSION $CILIUM_REGISTRY $CILIUM_IPV6
+{% endif %}

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/openshift/__init__.py

@@ -11,6 +11,7 @@ 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, process_postscripts
 from kvirt.defaults import LOCAL_OPENSHIFT_APPS, OPENSHIFT_TAG
 import os
+import platform
 import re
 from random import choice
 from shutil import copy2, move, rmtree, which
@@ -658,6 +659,7 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
     ctlplanes = data['ctlplanes']
     if ctlplanes <= 0:
         return {'result': 'failure', 'reason': f"Invalid number of ctlplanes {ctlplanes}"}
+    ctlplane_schedulable = data['ctlplane_schedulable']
     workers = data['workers']
     if workers < 0:
         return {'result': 'failure', 'reason': f"Invalid number of workers {workers}"}
@@ -788,7 +790,7 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
     if os.path.exists('coreos-installer'):
         pprint("Removing old coreos-installer")
         os.remove('coreos-installer')
-    if version not in ['ci', 'candidate', 'nightly', 'stable']:
+    if version not in ['ci', 'candidate', 'latest', 'nightly', 'stable']:
         return {'result': 'failure', 'reason': f"Incorrect version {version}"}
     else:
         pprint(f"Using {version} version")
@@ -984,6 +986,10 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
             cacmd = f"openssl s_client -showcerts -connect {disconnected_url} </dev/null 2>/dev/null|"
             cacmd += "openssl x509 -outform PEM"
             data['ca'] = os.popen(cacmd).read()
+        kcli_images = ["curl:multi", "origin-coredns:multi", "haproxy:multi", "origin-keepalived-ipfailover:multi",
+                       "mdns-publisher:multi", "kubectl:multi"]
+        kcli_images = '\n'.join([f'quay.io/karmab/{image}' for image in kcli_images])
+        warning(f"Make sure to push the following images in your registry: {kcli_images}")
     if sno:
         pass
     elif image is None:
@@ -1024,6 +1030,10 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
         if not images:
             msg = f"Missing {image}. Indicate correct image in your parameters file..."
             return {'result': 'failure', 'reason': msg}
+    if provider in virt_providers and platform.machine() != arch:
+        pprint(f"Forcing release image to {arch}")
+        base_url = 'quay.io/okd/scos-release' if okd else 'quay.io/openshift-release-dev'
+        os.environ['OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE'] = f'{base_url}:{INSTALLER_VERSION}-{arch}'
     overrides['image'] = image
     static_networking_ctlplane, static_networking_worker = False, False
     macentries = []
@@ -1108,6 +1118,7 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
     if disconnected_url is not None:
         if disconnected_update and disconnected_url != 'quay.io':
             data['release_tag'] = f'v4.{get_installer_minor(INSTALLER_VERSION)}'
+            data['openshift_version'] = INSTALLER_VERSION
             update_registry(config, plandir, cluster, data)
         key = f"{disconnected_user}:{disconnected_password}"
         key = str(b64encode(key.encode('utf-8')), 'utf-8')
@@ -1227,7 +1238,7 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
                                                        'mtu': mtu, 'mode': ipsec_mode})
         with open(f"{clusterdir}/openshift/99-ovn.yaml", 'w') as f:
             f.write(ovn_data)
-    if workers == 0 or not mdns or kubevirt_api_service:
+    if ctlplane_schedulable or workers == 0 or not mdns or kubevirt_api_service:
         copy2(f'{plandir}/cluster-scheduler-02-config.yml', f"{clusterdir}/manifests")
     if 'sslip' in domain:
         ingress_sslip_data = config.process_inputfile(cluster, f"{plandir}/cluster-ingress-02-config.yml",

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/openshift/apps/odf-operator/pre.sh

@@ -1,3 +1,4 @@
+{{ "storagecluster" | wait_crd }}
 {% if odf_nodes %}
 {% set nodes = odf_nodes %}
 {% elif localstorage_nodes is defined %}

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/cluster/openshift/kcli_default.yml

@@ -26,6 +26,7 @@ api_ip:
 ingress_ip:
 ctlplanes: 3
 workers: 0
+ctlplane_schedulable: false
 fips: false
 cluster: myopenshift
 domain: karmalabs.corp

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/common/__init__.py

@@ -30,6 +30,8 @@ from tempfile import TemporaryDirectory
 from time import sleep
 import yaml
 
+_original_construct_mapping = yaml.SafeLoader.construct_mapping
+
 
 class NoAliasDumper(yaml.SafeDumper):
     def ignore_aliases(self, data):
@@ -943,16 +945,7 @@ def ssh(name, ip='', user=None, local=None, remote=None, tunnel=False, tunnelhos
             sshcommand = f'{sshcommand} "{cmd}"'
         if tunnelhost is not None and tunnelhost not in ['localhost', '127.0.0.1'] and tunnel and\
                 tunneluser is not None:
-            if insecure:
-                tunnelcommand = "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=ERROR "
-            else:
-                tunnelcommand = ""
-            tunnelcommand += f"-qp {tunnelport} -W %h:%p {tunneluser}@{tunnelhost}"
-            if identityfile is not None:
-                tunnelcommand = f"-i {identityfile} {tunnelcommand}"
-            sshcommand = f"-o ProxyCommand='ssh {tunnelcommand}' {sshcommand}"
-            if ':' in ip:
-                sshcommand = sshcommand.replace(ip, f'[{ip}]')
+            sshcommand = f"-J {tunneluser}@{tunnelhost}:{tunnelport} {sshcommand}"
         if local is not None:
             sshcommand = f"-L {local} {sshcommand}"
         if remote is not None:
@@ -979,8 +972,7 @@ def scp(name, ip='', user=None, source=None, destination=None, recursive=None, t
         arguments = ''
         if tunnelhost is not None and tunnelhost not in ['localhost', '127.0.0.1'] and\
                 tunnel and tunneluser is not None:
-            h = "[%h]" if ':' in ip else "%h"
-            arguments += f"-o ProxyCommand='ssh -qp {tunnelport} -W {h}:%p {tunneluser}@{tunnelhost}'"
+            arguments += f"-J {tunneluser}@{tunnelhost}:{tunnelport}"
         if insecure:
             arguments += " -o LogLevel=quiet -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
         scpcommand = 'scp -q'
@@ -1582,7 +1574,7 @@ def is_debian9(image):
 
 
 def is_debian_new(image):
-    return 'debian10' in image.lower() or 'debian12' in image.lower()
+    return 'debian' in image.lower() and image.lower() != 'debian9' and image.lower() != 'debian8'
 
 
 def is_ubuntu(image):
@@ -2522,7 +2514,11 @@ def plan_constructor(loader, node, deep=False):
     for key_node, value_node in node.value:
         key = loader.construct_object(key_node, deep=deep)
         value = loader.construct_object(value_node, deep=deep)
-        if isinstance(value, dict):
+        if key == "vmrules":
+            value = [_original_construct_mapping(loader, item_node, deep=deep) for item_node in value_node.value]
+            mapping[key] = value
+            continue
+        elif isinstance(value, dict):
             _type = value.get('type', 'vm')
             if key == 'parameters':
                 mapping[key] = value

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/config.py

@@ -320,7 +320,6 @@ class Kconfig(Kbaseconfig):
                         isofolder = isofolder[1:]
                     isofolder = f'[{isopool}]/{isofolder}'
                 filtervms = options.get('filtervms', VSPHERE['filtervms'])
-                filtervms = options.get('filteruser', VSPHERE['filteruser'])
                 filteruser = options.get('filteruser', VSPHERE['filteruser'])
                 filtertag = options.get('filtertag')
                 category = options.get('category', VSPHERE['category'])
@@ -2556,6 +2555,8 @@ class Kconfig(Kbaseconfig):
     def create_kube(self, cluster, kubetype, overrides={}):
         cwd = os.getcwd()
         cluster = overrides.get('cluster') or cluster or f"my{kubetype}"
+        if 'domain' in overrides and overrides['domain'] == 'local':
+            return {'result': 'failure', 'reason': 'Invalid domain .local'}
         if self.type == 'web' and self.k.localkube:
             return self.k.create_kube(cluster, kubetype, overrides)
         ippool = overrides.get('ippool') or overrides.get('confpool')

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/defaults.py

@@ -56,11 +56,13 @@ IMAGES = {'almalinux8': f'{ALMA}/8/cloud/x86_64/images/AlmaLinux-8-GenericCloud-
           'debian10': f'{DEBIAN}/openstack/current-10/debian-10-openstack-amd64.qcow2',
           'debian11': f'{DEBIAN}/cloud/bullseye/latest/debian-11-generic-amd64.qcow2',
           'debian12': f'{DEBIAN}/cloud/bookworm/latest/debian-12-generic-amd64.qcow2',
+          'debian13': f'{DEBIAN}/cloud/trixie/latest/debian-13-generic-amd64.qcow2',
           'fcos': 'https://builds.coreos.fedoraproject.org/streams/stable.json',
           'fedora39': f'{FEDORA}/39/Cloud/x86_64/images/Fedora-Cloud-Base-39-1.5.x86_64.qcow2',
           'fedora40': f'{FEDORA}/40/Cloud/x86_64/images/Fedora-Cloud-Base-Generic.x86_64-40-1.14.qcow2',
           'fedora41': f'{FEDORA}/41/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-41-1.4.x86_64.qcow2',
           'fedora42': f'{FEDORA}/42/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-42-1.1.x86_64.qcow2',
+          'fedora43': f'{FEDORA}/43/Cloud/x86_64/images/Fedora-Cloud-Base-Generic-43-1.6.x86_64.qcow2',
           'fedoralatest': 'https://alt.fedoraproject.org/cloud',
           'freebsd122': f'{BSD}/freebsd/12.2/freebsd-12.2.qcow2',
           'freebsd130': f'{BSD}/freebsd/13.0/freebsd-13.0-zfs.qcow2',

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/extra_keywords/kvm.yaml

@@ -2,6 +2,7 @@ arch: Architecture
 emulator: Custom emulator
 extra_iso: Extra Iso to plug to the node
 floppy: Floppy to plug to the node
+fwzone: firewall zone where to put a given network
 hugepages: hugepages flag
 hugepages_1gb: 1gb hugepages flag
 hugepages_2mb: 2mb hugepages flag

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/providers/hcloud/__init__.py

@@ -38,22 +38,6 @@ class Khcloud():
         if len(disks) > 0:
             disks = disks[1:]
 
-        volumeresponses = []
-        for index, disk in enumerate(disks):
-            if isinstance(disk, int):
-                disksize = disk
-            elif isinstance(disk, str) and disk.isdigit():
-                disksize = int(disk)
-            elif isinstance(disk, dict):
-                disksize = disk.get('size', '10')
-
-            diskname = f"{name}-disk{index}"
-            volumeresponse = self.conn.volumes.get_by_name(diskname)
-            if volumeresponse is None:
-                volumeresponse = self.conn.volumes.create(disksize, diskname, location=self.location,
-                                                          labels={"kcli-managed": "volume"})
-            volumeresponses.append(volumeresponse)
-
         if not keys:
             publickeyfile = get_ssh_pub_key()
             if publickeyfile is not None:
@@ -114,40 +98,67 @@ class Khcloud():
 
                 placement_group = response.placement_group
 
+        # If "location_options" is specified use it, otherwise "location", otherwise use self.location
+        location_options = overrides.get("location_options", [overrides.get("location", self.location.name)])
         flavor_options = overrides.get("flavor_options", [flavor] if flavor is not None else [])
 
-        for idx, flavor_option in enumerate(flavor_options):
-            servertype = self.conn.server_types.get_by_name(flavor_option)
-            if "snapshot_id" in overrides:
-                hetzner_image = self.conn.images.get_by_id(overrides.get("snapshot_id"))
-            else:
-                hetzner_image = self.conn.images.get_by_name_and_architecture(image, servertype.architecture)
-
-            try:
-                created_vm = self.conn.servers.create(
-                    name=name,
-                    server_type=servertype,
-                    image=hetzner_image,
-                    start_after_create=False,
-                    user_data=userdata,
-                    volumes=[],
-                    ssh_keys=hetzner_ssh_keys,
-                    location=self.location,
-                    public_net=ServerCreatePublicNetwork(enable_ipv4=False, enable_ipv6=False),
-                    labels=labels,
-                    placement_group=placement_group
-                )
-
-                created_vm.action.wait_until_finished(300)
-                break
-            except APIException as e:
-                if e.code == "resource_unavailable":
-                    msg = f"Could not get server of type '{flavor_option}' in location '{self.location.name}'"
-                    if len(flavor_options) > (idx + 1):
-                        warning(f"{msg}' trying the next configured flavor option.")
+        volumeresponses = []
+        for location_option in location_options:
+            location = self.conn.locations.get_by_name(location_option)
+            created_vm = None
+            for idx, flavor_option in enumerate(flavor_options):
+                if self.debug:
+                    pprint(f"Trying to create VM {name} in location {location.name} with flavor {flavor_option}")
+                servertype = self.conn.server_types.get_by_name(flavor_option)
+                if "snapshot_id" in overrides:
+                    hetzner_image = self.conn.images.get_by_id(overrides.get("snapshot_id"))
+                else:
+                    hetzner_image = self.conn.images.get_by_name_and_architecture(image, servertype.architecture)
+
+                try:
+                    created_vm = self.conn.servers.create(
+                        name=name,
+                        server_type=servertype,
+                        image=hetzner_image,
+                        start_after_create=False,
+                        user_data=userdata,
+                        volumes=[],
+                        ssh_keys=hetzner_ssh_keys,
+                        location=location,
+                        public_net=ServerCreatePublicNetwork(enable_ipv4=False, enable_ipv6=False),
+                        labels=labels,
+                        placement_group=placement_group
+                    )
+
+                    for index, disk in enumerate(disks):
+                        if isinstance(disk, int):
+                            disksize = disk
+                        elif isinstance(disk, str) and disk.isdigit():
+                            disksize = int(disk)
+                        elif isinstance(disk, dict):
+                            disksize = disk.get('size', '10')
+
+                        diskname = f"{name}-disk{index}"
+                        volumeresponse = self.conn.volumes.get_by_name(diskname)
+                        if volumeresponse is None:
+                            volumeresponse = self.conn.volumes.create(disksize, diskname, location=location,
+                                                                      labels={"kcli-managed": "volume"})
+                        volumeresponses.append(volumeresponse)
+
+                    created_vm.action.wait_until_finished(300)
+                    break
+                except APIException as e:
+                    if e.code == "resource_unavailable":
+                        msg = f"Could not get server of type '{flavor_option}' in location '{location.name}'"
+                        if len(flavor_options) > (idx + 1):
+                            warning(f"{msg}, trying the next configured flavor option.")
+                        else:
+                            warning(msg)
+                            error("No more flavors available to try. Define more flavors in 'flavor_options'.")
                     else:
-                        warning(msg)
-                        error("No more flavors available to try. Define more flavors in 'flavor_options'.")
+                        return {'result': 'failure', 'reason': json.dumps(e)}
+            if created_vm is not None:
+                break
 
         created_vm = created_vm.server
 

{kcli-99.0.202511280701 → kcli-99.0.202601211329}/kvirt/providers/kubevirt/__init__.py

@@ -751,6 +751,7 @@ class Kubevirt():
             from websocket import create_connection
         except:
             error("You need to install websocket-client package")
+            return
         kubectl = self.kubectl
         namespace = self.namespace
         vm = _get_resource(kubectl, 'vm', name, namespace, debug=self.debug)