kcli 99.0.202601130934__py3-none-any.whl → 99.0.202601191511__py3-none-any.whl

{kcli-99.0.202601130934.dist-info → kcli-99.0.202601191511.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kcli
-Version: 99.0.202601130934
+Version: 99.0.202601191511
 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.202601130934.dist-info → kcli-99.0.202601191511.dist-info}/RECORD

@@ -1,9 +1,9 @@
-kcli-99.0.202601130934.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+kcli-99.0.202601191511.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=EuroGNpbC4Ze7dOtE-mjjsxZ913pOTsrrbEXIyG9bPw,265630
-kvirt/config.py,sha256=Vw_9kP7IYRk4kiY-95Ku98TWdt6ZVSGNMGFSNspoYhk,184633
+kvirt/config.py,sha256=JGXaAj4YjCl3woml15PLwJ5cNc36SzX-g9_MSbfCB2Q,184556
 kvirt/containerconfig.py,sha256=qbvOWwFlyU2F-4rZn9PLj97wDnSBIwAYA6Xlxr13OOc,2329
 kvirt/defaults.py,sha256=vZFFUI_hegVf2W2Zle0fTcSQNhcStJGWXtrBXTYE22E,12401
 kvirt/ekstoken.py,sha256=MjK_tcLFl2VKxqgTSB4ve_kybZw5dBj2H6BezGGtBpM,1475
@@ -66,27 +66,28 @@ kvirt/cluster/k3s/workers.sh,sha256=ErZ5T8uEV8iV7PczVHY4bHXtFC3fsKVtF3k5tS_0vkc,
 kvirt/cluster/k3s/workers.yml,sha256=HD1MkMcRKwvFndoMJOS8fC1f_O1vfzi27PVwR4GN_7k,709
 kvirt/cluster/kubeadm/10-flannel.link,sha256=A3vdnP3LIhIyF07oG_AOVPnikQ1AvXuE-FIdhmi8Iqk,59
 kvirt/cluster/kubeadm/90-flannel.rules,sha256=FJGctcom8HKGD_VKSJkKFAVv8GznTkY6ORxZNRIFB0Q,302
-kvirt/cluster/kubeadm/__init__.py,sha256=NpZRuddBtSu-lDF_u7r79_4qqv5L3ga9WTfrh-n4URQ,17579
-kvirt/cluster/kubeadm/bootstrap.sh,sha256=qmOj0jVVE4loqShC1z_ASqY9eNr6lmfSYjxi3ZKmPKY,3267
-kvirt/cluster/kubeadm/bootstrap.yml,sha256=MwM1DyrB66RzDFn3VMczSkeJpfI8qrOIdCVctTmmmmA,1708
+kvirt/cluster/kubeadm/__init__.py,sha256=ks_HsnLnoj3YDQ27BK454y1IQ1drfvLSKFS--5hCeeY,17724
+kvirt/cluster/kubeadm/bootstrap.sh,sha256=8qlEPsrg2NuU9Rv7zcXCJfBX6VPUNjCEWLjeAVlTuBU,1067
+kvirt/cluster/kubeadm/bootstrap.yml,sha256=Zr9_SXwk_w0oL2DueuGW8IUXfxY3kIV-ZxfgH600OhM,1718
 kvirt/cluster/kubeadm/cloud_lb_api.yml,sha256=dTH4qdnvhPRk0mhZh1tkX8D9Zsg24nvmC4cxXMRNxJk,338
-kvirt/cluster/kubeadm/config_bootstrap.yaml,sha256=b33L1C-56tts0rwTpflJiVGsZbvcyRUJD9dzg-_uf4g,2130
+kvirt/cluster/kubeadm/config_bootstrap.yaml,sha256=wd14Hz5JcW2cbnICdU-kLs7_pv_7BqeRveiS30UsEbM,2594
 kvirt/cluster/kubeadm/config_join.yaml,sha256=SS3eAzHmcpPFsi9Pl1XZCvxJhBaJFMxXWdp60rN3Cnk,520
-kvirt/cluster/kubeadm/containerd.sh,sha256=SjeR5lzTSBwuejirgnx0WStgOOmZrmEkTwrHhKF6138,3074
+kvirt/cluster/kubeadm/containerd.sh,sha256=woxFoVahQMLshoJ2i8lqk2X3KLscrfUYiJyolK1gfMw,3059
 kvirt/cluster/kubeadm/crictl.yaml,sha256=rVJjlcyk2x4-oWbdq7uiNweCmxBCFdEi8F-OWCzvkFA,124
 kvirt/cluster/kubeadm/crio-d.sh,sha256=Al81MmBGUO4SRX07xOQmRtLDX0yBoPQTBdXLAV4OYr4,3240
 kvirt/cluster/kubeadm/ctlplanes.yml,sha256=ur38ztsAbvIEl2Jv4sLvYU9wCrx2_fJJ9aiHBJv-Qnk,1428
 kvirt/cluster/kubeadm/deploy.sh,sha256=aUxbHM5sPvzTivEwCHLqiZud5nAxPqqwyjw453e23N8,362
 kvirt/cluster/kubeadm/disconnected.yml,sha256=ntIU2kPXJfDJiW9b2aip4QdmricDTUxzZ6ZrwUeH6kc,754
 kvirt/cluster/kubeadm/join.sh,sha256=JIkMmRDlCzi-MshamKizHUiJCSzshvESjo9inN47ItA,267
-kvirt/cluster/kubeadm/kcli_default.yml,sha256=xynok8RbDiavCQNm4zEuZVrOnY_i8-DOj3r9N08s4m8,2477
+kvirt/cluster/kubeadm/kcli_default.yml,sha256=HReKXsi5VhbnoUNymulSYnojHwobElhAq-BjIR3DY4I,2605
 kvirt/cluster/kubeadm/keepalived.conf,sha256=OwQ_PozqBMzAULPjjJ2TbAHK3n9BE5gyCqkqZ0SFmic,588
 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
+kvirt/cluster/kubeadm/pre_el.sh,sha256=xIS2U9X_rRbzgDNsCNKTpVUpGkplvmxUyhkLYXYtGMI,2429
 kvirt/cluster/kubeadm/pre_ubuntu.sh,sha256=kyM6ZxYZiyRYozcB3RmjpC8lHirI9wSxxwgCR7cgt7g,1768
 kvirt/cluster/kubeadm/registry.yml,sha256=8cy6U99X9br5DqawzpMhbl7yOJz3c48E7YIdwThI960,1511
+kvirt/cluster/kubeadm/sdn.sh,sha256=KKwNT_cdGtGNDPhZIa8MWXUf6si1nO_hXdU5-HPIj6s,2069
 kvirt/cluster/kubeadm/workers.yml,sha256=G9AolFsAxPC6AUm5LHi-OWNiL25C4e6a9BhU-et1w4A,1098
 kvirt/cluster/kubeadm/apps/argocd/ingress.yml,sha256=t6U1QnaTq4_yxjQMsMQaMiddx2ROg2vr9kCZeta4v5Y,487
 kvirt/cluster/kubeadm/apps/argocd/install.sh,sha256=e9OM3g4QaWX4yDI3DEjyx_sb09yR95mgl3tdwZET4c4,2134
@@ -141,7 +142,7 @@ kvirt/cluster/kubeadm/disconnected/bin/sync_image.sh,sha256=P3ymlLNpUA4q9kvyJwmb
 kvirt/cluster/kubeadm/disconnected/scripts/01_creds.sh,sha256=M_rjk6c_eSqwSlvbZw3hz5xoP8HLZUV5CuepUpd6MG0,970
 kvirt/cluster/kubeadm/disconnected/scripts/02_packages.sh,sha256=Y2IK84Yq9A_emDDx17kwkTzlU2u5W778ea50UneGNMc,227
 kvirt/cluster/kubeadm/disconnected/scripts/03_registry.sh,sha256=T6VYi9pYsKfFX59M6N9jrs5oCP4S8lmQ4QRiqMVvLUE,2088
-kvirt/cluster/kubeadm/disconnected/scripts/04_mirror.sh,sha256=L391sdMJwaf-AiWFvWWuTP6W5hPZa-EwQLHOBjBGlq8,2962
+kvirt/cluster/kubeadm/disconnected/scripts/04_mirror.sh,sha256=-_akPeAnh2EOtfnQkDkTB_7SE9g4duE5cJK3WslhWvg,3654
 kvirt/cluster/kubeadm/disconnected/scripts/05_web.sh,sha256=Rx8HcXlZUS4BAGZaz9XzJXCzP6etM7tritC0tXtIJBc,90
 kvirt/cluster/kubeadm/disconnected/scripts/deploy.sh,sha256=rN9whVEGPzAc-3WwQjLF0tSb976bsXv8ol1lSCD709s,593
 kvirt/cluster/kubernetes/__init__.py,sha256=3-Y_L5eSKmPjorrpjyhyaKT-eyB9KmbF80y2zdONCls,9287
@@ -403,7 +404,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=bJIvDcJKVQONMNXQ0_XLi1pne8nOAem30Ertp_K2MXU,19
+kvirt/version/git,sha256=Yc8HZKbeyYA5tZ0_ROVNUZQIiQ0hoZLNHv508PX5kSU,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 +646,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.202601130934.dist-info/METADATA,sha256=vHYI5vgL-256Hpo7rCHlYf27ldksJU1aAkXEIVSfPms,4645
-kcli-99.0.202601130934.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-kcli-99.0.202601130934.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
-kcli-99.0.202601130934.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
-kcli-99.0.202601130934.dist-info/RECORD,,
+kcli-99.0.202601191511.dist-info/METADATA,sha256=FWyZL27dtmSuAEdkWr1tc4NJN0VuN-Ksg4oiYsJ1j34,4645
+kcli-99.0.202601191511.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+kcli-99.0.202601191511.dist-info/entry_points.txt,sha256=e5EB5e2acrwl3_sYA0GrjE42UMcMfiijMJqXb6TZRmQ,245
+kcli-99.0.202601191511.dist-info/top_level.txt,sha256=FwVTxtMIWdr8QBk5mTfd0f_GheFlRR_vn4zl6p5N57s,6
+kcli-99.0.202601191511.dist-info/RECORD,,

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}")

kvirt/cluster/kubeadm/bootstrap.sh

@@ -2,7 +2,6 @@
 
 CLUSTER={{ cluster }}
 DOMAIN={{ domain }}
-POD_CIDR={{ cluster_network_ipv4 }}
 
 echo $(hostname -I) api.$CLUSTER.$DOMAIN >> /etc/hosts
 
@@ -21,33 +20,7 @@ kubectl taint nodes --all node-role.kubernetes.io/control-plane-
 {% endif %}
 
 {% if sdn != None %}
-# install Container Network Interface (CNI)
-{% 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 | sed "s@10.244.0.0/16@$POD_CIDR@" | kubectl apply -f -
-{% elif sdn == 'weavenet' %}
-kubectl apply -f "https://cloud.weave.works/k8s/net?k8s-version=`kubectl version | base64 | tr -d '\n'`"
-{% 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 == 'canal' %}
-kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/canal/rbac.yaml
-kubectl apply -f https://docs.projectcalico.org/v3.1/getting-started/kubernetes/installation/hosted/canal/canal.yaml
-{% elif sdn == 'romana' %}
-kubectl apply -f https://raw.githubusercontent.com/romana/romana/master/containerize/specs/romana-kubeadm.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
-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 --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 install $CILIUM_VERSION $CILIUM_REGISTRY
-{% endif %}
+bash /root/sdn.sh
 {% endif %}
 
 # config cluster credentials

kvirt/cluster/kubeadm/bootstrap.yml

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

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 %}

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

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

kvirt/cluster/kubeadm/kcli_default.yml

@@ -94,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: []

kvirt/cluster/kubeadm/pre_el.sh

@@ -2,12 +2,27 @@ 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
+cat <<EOF | tee /etc/sysctl.d/99-kubernetes-ipv6.conf
+net.ipv6.conf.all.forwarding = 1
+net.ipv6.conf.default.forwarding = 1
+EOF
+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

kvirt/cluster/kubeadm/sdn.sh

@@ -0,0 +1,29 @@
+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
+kubectl apply -f /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 | sed "s@10.244.0.0/16@$POD_CIDR@" | kubectl apply -f -
+{% endif %}
+{% 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 --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 install $CILIUM_VERSION $CILIUM_REGISTRY
+{% endif %}

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'])

kvirt/version/git

@@ -1 +1 @@
-30a0985 2026/01/13
+329d66b 2026/01/19