From 4febd4f75a62cb7871fb92dd45e15983a1cc4f0e Mon Sep 17 00:00:00 2001
From: ITQ <itq.dev@ya.ru>
Date: Wed, 20 Aug 2025 13:22:27 +0300
Subject: [PATCH] fix: fixed kubespray version and network provisioning

---
 .../group_vars/k8s_cluster/{net.yaml => network.yaml}      | 6 +-----
 scripts/provision                                          | 7 ++++---
 terraform/configs/cloud-init/network.yaml.tpl              | 1 +
 3 files changed, 6 insertions(+), 8 deletions(-)
 rename kubespray/group_vars/k8s_cluster/{net.yaml => network.yaml} (89%)

diff --git a/kubespray/group_vars/k8s_cluster/net.yaml b/kubespray/group_vars/k8s_cluster/network.yaml
similarity index 89%
rename from kubespray/group_vars/k8s_cluster/net.yaml
rename to kubespray/group_vars/k8s_cluster/network.yaml
index 6dc39a2..db4a48d 100644
--- a/kubespray/group_vars/k8s_cluster/net.yaml
+++ b/kubespray/group_vars/k8s_cluster/network.yaml
@@ -16,9 +16,7 @@
 
 # Settings for ipv6 only from Kubespray github tests
 
-cloud_image: ubuntu-2404
-
-ipv4_stack: false
+ipv4_stack: true
 ipv6_stack: true
 kube_network_plugin: calico
 etcd_deployment_type: kubeadm
@@ -28,7 +26,5 @@ enable_nodelocaldns: false
 
 # Settings for dualstack from Kubespray github tests
 
-# cloud_image: ubuntu-2404
-
 # ipv4_stack: true
 # ipv6_stack: true
diff --git a/scripts/provision b/scripts/provision
index 6b89448..024d1fd 100755
--- a/scripts/provision
+++ b/scripts/provision
@@ -1,15 +1,16 @@
 #!/bin/bash
 
 echo "Pulling kubespray image..."
-docker pull quay.io/kubespray/kubespray:v2.27.1  -q
+docker pull quay.io/kubespray/kubespray:v2.28.0  -q
 echo "Pulled"
 
 CONTAINER_ID=`docker run --rm --mount type=bind,source="$(pwd)"/kubespray,dst=/inventory \
   --mount type=bind,source="$(pwd)"/.ssh/id_rsa,dst=/root/.ssh/id_rsa \
   --mount type=bind,source=/etc/hosts,dst=/etc/hosts \
   --network host \
+  --name kubespray \
   --detach \
-  quay.io/kubespray/kubespray:v2.27.1 \
+  quay.io/kubespray/kubespray:v2.28.0 \
   sleep infinity`
 
 docker exec -i $CONTAINER_ID \
@@ -19,6 +20,6 @@ docker exec -i $CONTAINER_ID \
   bash -c " \
   ANSIBLE_STDOUT_CALLBACK=default \
   ANSIBLE_CALLBACK_WHITELIST= \
-  ansible-playbook -i /inventory/inventory.ini --private-key /root/.ssh/id_rsa cluster.yml -u ubuntu -b -v"
+  ansible-playbook -i /inventory/inventory.ini --private-key /root/.ssh/id_rsa cluster.yml -u ubuntu -b -vvv"
 
 docker rm --force $CONTAINER_ID
diff --git a/terraform/configs/cloud-init/network.yaml.tpl b/terraform/configs/cloud-init/network.yaml.tpl
index 4f28fb2..c60b20c 100644
--- a/terraform/configs/cloud-init/network.yaml.tpl
+++ b/terraform/configs/cloud-init/network.yaml.tpl
@@ -3,6 +3,7 @@ network:
   version: 2
   ethernets:
     enp1s0:
+      accept-ra: false
       dhcp4: false
       dhcp6: false
       addresses: