kcli 99.0.202510231827__tar.gz → 99.0.202601211150__tar.gz

{kcli-99.0.202510231827/kcli.egg-info → kcli-99.0.202601211150}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202510231827
+Version: 99.0.202601211150
 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.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/kcli.egg-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

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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.202601211150/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.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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.202510231827/kvirt/cluster/rke2 → kcli-99.0.202601211150/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

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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.202601211150/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.202510231827 → kcli-99.0.202601211150}/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

kcli-99.0.202601211150/kvirt/cluster/openshift/99-kcli-forcedns

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+CLUSTER={{ cluster }}
+DOMAIN={{ domain }}
+
+[ "$(hostname -s)" == "{{ cluster }}-bootstrap" ] || which crictl >/dev/null 2>&1
+if [ "$?" != "0" ] ; then
+  exit 0
+fi
+
+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)" }}
+  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

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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
@@ -336,16 +337,18 @@ def get_downstream_installer(version='stable', macosx=False, tag=None, debug=Fal
 
 
 def get_okd_installer(tag, version='stable', debug=False):
-    if version == 'stable' and str(tag).count('.') == 1:
-        tag = f'quay.io/okd/scos-release:{tag}.0-okd-scos.1'
-    elif 'quay.io' not in str(tag) and 'registry.ci.openshift.org' not in str(tag):
-        if version == 'candidate':
-            url = "https://amd64.origin.releases.ci.openshift.org/api/v1/releasestream/4-scos-next/latest"
-        elif version in ['ci', 'nightly']:
-            url = f"https://amd64.origin.releases.ci.openshift.org/api/v1/releasestream/{tag}.0-0.okd-scos/latest"
-        else:
-            url = "https://amd64.origin.releases.ci.openshift.org/api/v1/releasestream/4-scos-stable/latest"
+    if version == 'candidate':
+        url = "https://amd64.origin.releases.ci.openshift.org/api/v1/releasestream/4-scos-next/latest"
+        tag = json.loads(urlopen(url).read())['pullSpec']
+    elif version in ['ci', 'nightly']:
+        url = f"https://amd64.origin.releases.ci.openshift.org/api/v1/releasestream/{tag}.0-0.okd-scos/latest"
         tag = json.loads(urlopen(url).read())['pullSpec']
+    else:
+        url = 'https://quay.io/api/v1/repository/okd/scos-release/tag'
+        for t in json.loads(urlopen(url).read())["tags"]:
+            if tag in t["name"] and ".ec." not in t["name"]:
+                tag = f'quay.io/okd/scos-release:{t["name"]}'
+                break
     cmd = f"oc adm release extract --command=openshift-install --to . {tag}"
     cmd += "; chmod 700 openshift-install"
     pprint(f'Downloading openshift-install {tag} in current directory')
@@ -656,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}"}
@@ -710,6 +714,8 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
     data['sno'] = sno
     sno_wait = overrides.get('sno_wait') or baremetal_sno or data['api_ip'] is not None or sno_vm
     sno_disk = data['sno_disk']
+    if sno_disk is not None and not sno_disk.startswith('/dev/'):
+        sno_disk = f'/dev/{sno_disk}'
     sno_ctlplanes = data['sno_ctlplanes'] or baremetal_ctlplane
     sno_workers = data['sno_workers']
     sno_telco = data['sno_telco']
@@ -784,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")
@@ -936,13 +942,19 @@ 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 version in ['ci', 'nightly'] or '/' in str(tag):
+    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)
+        elif version in ['ci', 'nightly'] or '/' in str(tag):
             nightly = version == 'nightly'
             run = get_ci_installer(pull_secret, tag=tag, nightly=nightly)
         elif version in ['candidate', 'stable', 'latest']:
@@ -952,10 +964,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}")
@@ -978,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:
@@ -1018,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 = []
@@ -1102,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')
@@ -1171,6 +1188,13 @@ 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':
+                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}")
             with open(f'{clusterdir}/openshift/{f}', 'w') as f:
                 f.write(content)
@@ -1214,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",
@@ -1256,11 +1280,12 @@ def create(config, plandir, cluster, overrides, dnsconfig=None):
             with open(f"{clusterdir}/openshift/99-autoapprovercron-cronjob.yaml", 'w') as _f:
                 _f.write(crondata)
             continue
-        if not sno_telco and '99-monitoring.yaml' in f:
-            monitoring_retention = data['monitoring_retention']
-            monitoringfile = config.process_inputfile(cluster, f, overrides={'retention': monitoring_retention})
-            with open(f"{clusterdir}/openshift/99-monitoring.yaml", 'w') as _f:
-                _f.write(monitoringfile)
+        if '99-monitoring.yaml' in f:
+            if not sno_telco:
+                monitoring_retention = data['monitoring_retention']
+                monitoringfile = config.process_inputfile(cluster, f, overrides={'retention': monitoring_retention})
+                with open(f"{clusterdir}/openshift/99-monitoring.yaml", 'w') as _f:
+                    _f.write(monitoringfile)
             continue
         copy2(f, f"{clusterdir}/openshift")
     if virtualization_nightly:

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/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([]) %}

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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

{kcli-99.0.202510231827 → kcli-99.0.202601211150}/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.202510231827 → kcli-99.0.202601211150}/kvirt/cluster/openshift/telco_manifests.yml

@@ -11,7 +11,7 @@
           version: 3.2.0
         storage:
           disks:
-            - device: /dev/sda
+            - device: SNO_DISK
               partitions:
                 - label: var-lib-containers
                   startMiB: 60000 # Leave room for rootfs
@@ -79,7 +79,7 @@
       name: redhat-operator-index
       namespace: openshift-marketplace
     spec:
-      image: registry.karmalabs.corp:5000/redhat/redhat-operator-index:v4.20
+      image: REGISTRY/redhat/redhat-operator-index:vTAG
       sourceType: grpc
 - 01-container-mount-ns-and-kubelet-conf-master.yaml: |
     # Automatically generated by extra-manifests-builder