kubernetes/defaults/main.yml

@@ -8,8 +8,7 @@ kubernetes:
     ipv6:
       cluster_cidr: fd42::/56
       service_cidr: fd43::/112
-
-    nodeIp_interface: <interface to grab nodeIp from>
+      nodeip_cidr: fd41::/64
 
   control_plane:
     dns_name: <control-plane dns-reachable-name>

kubernetes/docs/architecture.puml

@@ -1,30 +0,0 @@
-@startuml
-
-component netmaker as nm1
-component netmaker as nm2
-component ... as nm3
-
-interface interface as if1
-interface interface as if2
-interface ... as if3
-
-component kubernetes as kn1
-component kubernetes as kn2
-component ... as kn3
-
-nm1 -up- if1
-kn1 -down-( if1
-
-nm2 -up- if2
-kn2 -down-( if2
-
-nm3 -up- if3
-kn3 -down-( if3
-
-nm1 -right- nm2
-nm2 -right- nm3
-
-kn1 .right. kn2
-kn2 .right. kn3
-
-@enduml

kubernetes/tasks/prerequisites.yml

@@ -49,21 +49,41 @@
     mode: u=rw,g=r,o=r
   notify: restart_containerd
 
-# todo: Move to netmaker-role as handler?
-- name: Gather facts to get changes
-  ansible.builtin.gather_facts:
-
-- name: Getting nodeIp-data from interface
-  set_fact:
-    nodeip_ipv4: "{{ ansible_facts[ kubernetes.ipPool.nodeIp_interface ].ipv4.address }}"
-    nodeip_ipv6: "{{ ansible_facts[ kubernetes.ipPool.nodeIp_interface ].ipv6[0].address }}"
-
 - name: Set control-plane-dns-endpoint towards local-ip
-  blockinfile:
-      path: /etc/hosts
-      marker: "# {mark} ANSIBLE MANAGED BLOCK | k8s"
-      block: |
-        {{ nodeip_ipv4 }} {{ kubernetes.control_plane.dns_name }}
+  lineinfile:
+    dest: /etc/hosts
+    line: "{{ ansible_facts.default_ipv6.address }} k8s-control-plane.system.ruekov.eu" 
+
+- name: Setting network facts..
+  set_fact:
+    inventory_group_index: "{{ groups['kubernetes'].index(inventory_hostname) }}"
+    ipPool_ipv6_nodeip_cidr_only_prefix:  '{{ kubernetes.ipPool.ipv6.nodeip_cidr | regex_replace ("(?<=:)[0-9a-f]{0,4}(\/[0-9]+)?$","") }}'
+    ipPool_ipv6_nodeip_cidr_cidr:         '{{ kubernetes.ipPool.ipv6.nodeip_cidr | regex_replace ("^.*?\/","") }}'
+    ipPool_ipv4_nodeip_cidr_only_prefix:  '{{ kubernetes.ipPool.ipv4.nodeip_cidr | regex_replace ("(?<=.)[0-9]{0,3}(\/[0-9]+)?$","") }}'
+    ipPool_ipv4_nodeip_cidr_cidr:         '{{ kubernetes.ipPool.ipv4.nodeip_cidr | regex_replace ("^.*?\/","") }}'
+  
+- name: Setting more network_facts..
+  set_fact:
+    ipPool_ipv6_nodeip: "{{ ipPool_ipv6_nodeip_cidr_only_prefix }}{{ inventory_group_index|int +1 }}"
+    ipPool_ipv4_nodeip: "{{ ipPool_ipv4_nodeip_cidr_only_prefix }}{{ inventory_group_index|int +1 }}"
+
+- name: Setup IPv4-Network
+  lineinfile:
+    insertafter: "iface {{ ansible_facts.default_ipv4.interface }} inet .+"
+    dest: "/etc/network/interfaces"
+    line: "    up /usr/sbin/ip addr add {{ ipPool_ipv4_nodeip }} dev {{ ansible_facts.default_ipv4.interface }}"
+  register: setup_network_ipv4
+
+- name: Setup IPv6-Network
+  lineinfile:
+    insertafter: "iface {{ ansible_facts.default_ipv4.interface }} inet6 .+"
+    dest: "/etc/network/interfaces"
+    line: "    up /usr/sbin/ip -6 addr add {{ ipPool_ipv6_nodeip }} dev {{ ansible_facts.default_ipv4.interface }}"
+  register: setup_network_ipv6
+
+- name: Force-Reload network-interface
+  command: "ifup --force {{ ansible_facts.default_ipv4.interface }}"
+  when: setup_network_ipv4.changed or setup_network_ipv6.changed
 
 - name: Run handlers to reload configurations
   meta: flush_handlers

kubernetes/templates/rke2/config.yaml.template

@@ -13,4 +13,4 @@ tls-san:
 
 cluster-cidr: {{ kubernetes.ipPool.ipv4.cluster_cidr }},{{ kubernetes.ipPool.ipv6.cluster_cidr }}
 service-cidr: {{ kubernetes.ipPool.ipv4.service_cidr }},{{ kubernetes.ipPool.ipv6.service_cidr }}
-node-ip:      {{ nodeip_ipv4 }},{{ nodeip_ipv6 }}
+node-ip:      {{ ipPool_ipv4_nodeip }},{{ ipPool_ipv6_nodeip }}