chore: some changes

configs/hosts

@@ -0,0 +1,2 @@
+2001:db8:ca2:2::10 control-plane
+2001:db8:ca2:2::20 worker-1

kubespray/group_vars/all/all.yaml

@@ -0,0 +1,3 @@
+---
+
+unsafe_show_logs: true

kubespray/group_vars/all/net.yaml

@@ -1,13 +0,0 @@
----
-ipv6_stack: true
-
-kube_pods_subnet_ipv6: fd85:ee78:d8a6:8607::1:0000/112
-kube_service_addresses_ipv6: fd85:ee78:d8a6:8607::1000/116
-calico_ipv6pool_cidr: "{{ kube_pods_subnet_ipv6 }}"
-calico_pool_blocksize_ipv6: 116
-
-enable_dns_autoscaler: false
-enable_nodelocaldns: false
-
-helm_enabled: true
-local_path_provisioner_enabled: true

kubespray/group_vars/k8s_cluster/addons.yaml

@@ -0,0 +1,6 @@
+---
+
+enable_dns_autoscaler: false
+enable_nodelocaldns: false
+helm_enabled: true
+local_path_provisioner_enabled: true

kubespray/group_vars/k8s_cluster/net.yaml

@@ -0,0 +1,34 @@
+---
+
+# Old settings
+# ipv4_stack: false
+# ipv6_stack: true
+
+# kube_network_plugin: calico
+
+# kube_pods_subnet_ipv6: fd85:ee78:d8a6:8607::1:0000/112
+# kube_service_addresses_ipv6: fd85:ee78:d8a6:8607::1000/116
+# kube_network_node_prefix_ipv6: 119
+# calico_ipv6pool_cidr: "{{ kube_pods_subnet_ipv6 }}"
+# calico_pool_blocksize_ipv6: 116
+# nat_outgoing_ipv6: true
+
+
+# Settings for ipv6 only from Kubespray github tests
+
+cloud_image: ubuntu-2404
+
+ipv4_stack: false
+ipv6_stack: true
+kube_network_plugin: calico
+etcd_deployment_type: kubeadm
+kube_proxy_mode: iptables
+enable_nodelocaldns: false
+
+
+# Settings for dualstack from Kubespray github tests
+
+# cloud_image: ubuntu-2404
+
+# ipv4_stack: true
+# ipv6_stack: true

kubespray/inventory.ini

@@ -1,5 +1,5 @@
-control-plane ansible_host=10.6.6.10 ip=10.6.6.10 ipv6=2001:db8:ca2:2::10
-worker-1 ansible_host=10.6.6.20 ip=10.6.6.20 ipv6=2001:db8:ca2:2::20
+control-plane ansible_host=control-plane ipv6=2001:db8:ca2:2::10
+worker-1 ansible_host=worker-1 ipv6=2001:db8:ca2:2::20
 
 [kube_control_plane]
 control-plane
@@ -9,5 +9,3 @@ control-plane
 
 [kube_node]
 worker-1
-
-[calico_rr]

scripts/provision

@@ -6,21 +6,19 @@ 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 \
   --detach \
   quay.io/kubespray/kubespray:v2.27.1 \
   sleep infinity`
 
-docker exec -i $CONTAINER_ID \
-  sed -i '/no_log: "{{ not (unsafe_show_logs | bool) }}"/s@^@#@' \
-  roles/download/tasks/download_file.yml
-
 docker exec -i $CONTAINER_ID \
   ls -l
 
 docker exec -i $CONTAINER_ID \
   bash -c " \
-  ANSIBLE_LOAD_CALLBACK_PLUGINS=False \
+  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"
 
 docker rm --force $CONTAINER_ID

terraform/main.tf

@@ -62,8 +62,6 @@ module "nodes" {
 
   name           = each.key
   network_id     = libvirt_network.default.id
-  ipv4           = each.value.ipv4
-  ipv6           = each.value.ipv6
   volume_base_id = each.value.image
   user_data      = each.value.user_data
   network_config = each.value.network_config

terraform/modules/instance/variables.tf

@@ -1,7 +1,5 @@
 variable "name" {}
 variable "network_id" {}
-variable "ipv4" {}
-variable "ipv6" {}
 variable "volume_base_id" {}
 variable "user_data" {}
 variable "network_config" {}