Merge pull request #332 from jplitza/ipv6-improvements

Ipv6 improvements

Author: MonolithProjects

.github/workflows/ci.yml

@@ -42,7 +42,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip3 install ansible docker molecule molecule-plugins[docker] "requests<2.29.2"
+        run: pip3 install ansible docker molecule molecule-plugins[docker] netaddr "requests<2.29.2"
 
       - name: Run Molecule tests
         run: molecule test
@@ -77,7 +77,7 @@ jobs:
           python-version: '3.x'
 
       - name: Install test dependencies
-        run: pip3 install ansible docker molecule molecule-plugins[docker] "requests<2.29.2"
+        run: pip3 install ansible docker molecule molecule-plugins[docker] netaddr "requests<2.29.2"
 
       - name: Run Molecule tests
         run: molecule test --scenario-name cluster

README.md

@@ -60,7 +60,7 @@ rke2_ha_mode_kubevip: false
 # Kubernetes API and RKE2 registration IP address. The default Address is the IPv4 of the Server/Master node.
 # In HA mode choose a static IP which will be set as VIP in keepalived.
 # Or if the keepalived is disabled, use IP address of your LB.
-rke2_api_ip: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] }}"
+rke2_api_ip: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] | default(hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv6']['address'] ) }}"
 
 # optional option for RKE2 Server to listen on a private IP address & port
 # rke2_api_private_ip:
@@ -86,10 +86,10 @@ rke2_kubevip_cloud_provider_enable: true
 rke2_kubevip_svc_enable: true
 
 # Specify which image is used for kube-vip container
-rke2_kubevip_image: ghcr.io/kube-vip/kube-vip:v0.6.4
+rke2_kubevip_image: ghcr.io/kube-vip/kube-vip:v0.9.2
 
 # Specify which image is used for kube-vip cloud provider container
-rke2_kubevip_cloud_provider_image: ghcr.io/kube-vip/kube-vip-cloud-provider:v0.0.4
+rke2_kubevip_cloud_provider_image: ghcr.io/kube-vip/kube-vip-cloud-provider:v0.0.12
 
 # Enable kube-vip IPVS load balancer for control plane
 rke2_kubevip_ipvs_lb_enable: false

defaults/main.yml

@@ -22,7 +22,7 @@ rke2_ha_mode_kubevip: false
 # Kubernetes API and RKE2 registration IP address. The default Address is the IPv4 of the Server/Master node.
 # In HA mode choose a static IP which will be set as VIP in keepalived.
 # Or if the keepalived is disabled, use IP address of your LB.
-rke2_api_ip: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] }}"
+rke2_api_ip: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] | default(hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv6']['address'] ) }}"
 
 # optional option for RKE2 Server to listen on a private IP address & port
 # rke2_api_private_ip:
@@ -48,10 +48,10 @@ rke2_kubevip_cloud_provider_enable: true
 rke2_kubevip_svc_enable: true
 
 # Specify which image is used for kube-vip container
-rke2_kubevip_image: ghcr.io/kube-vip/kube-vip:v0.6.4
+rke2_kubevip_image: ghcr.io/kube-vip/kube-vip:v0.9.2
 
 # Specify which image is used for kube-vip cloud provider container
-rke2_kubevip_cloud_provider_image: ghcr.io/kube-vip/kube-vip-cloud-provider:v0.0.4
+rke2_kubevip_cloud_provider_image: ghcr.io/kube-vip/kube-vip-cloud-provider:v0.0.12
 
 # Enable kube-vip IPVS load balancer for control plane
 rke2_kubevip_ipvs_lb_enable: false

meta/argument_specs.yml

@@ -39,7 +39,7 @@ argument_specs:
 
       rke2_api_ip:
         type: str
-        default: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] }}"
+        default: "{{ hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv4']['address'] | default(hostvars[groups[rke2_servers_group_name].0]['ansible_default_ipv6']['address'] ) }}"
         description: "Kubernetes API and RKE2 registration IP address. The default Address is the IPv4 of the Server/Master node. In HA mode choose a static IP which will be set as VIP in keepalived. Or if the keepalived is disabled, use IP address of your LB."
 
       rke2_api_private_ip:
@@ -84,12 +84,12 @@ argument_specs:
 
       rke2_kubevip_image:
         type: str
-        default: "ghcr.io/kube-vip/kube-vip:v0.6.4"
+        default: "ghcr.io/kube-vip/kube-vip:v0.9.2"
         description: "Specify which image is used for kube-vip container"
 
       rke2_kubevip_cloud_provider_image:
         type: str
-        default: "ghcr.io/kube-vip/kube-vip-cloud-provider:v0.0.4"
+        default: "ghcr.io/kube-vip/kube-vip-cloud-provider:v0.0.12"
         description: "Specify which image is used for kube-vip cloud provider container"
 
       rke2_kubevip_ipvs_lb_enable:

requirements.yml

@@ -0,0 +1,3 @@
+collections:
+  - community.general
+  - ansible.utils

tasks/first_server_restore.yml

@@ -13,5 +13,5 @@
     delete node {{ item }} 2>&1 || true
   args:
     executable: /bin/bash
-  with_items: "{{ node_names.stdout_lines | difference(groups[rke2_cluster_group_name]) }}"
+  with_items: "{{ node_names.stdout_lines | difference(groups[rke2_cluster_group_name] ) }}"
   changed_when: false

tasks/main.yml

@@ -78,7 +78,7 @@
 
 - name: Rolling cordon and drain restart when version changes - agents
   ansible.builtin.include_tasks: rolling_restart.yml
-  with_items: "{{ groups[rke2_agents_group_name] | default([]) }}"
+  with_items: "{{ groups[rke2_agents_group_name] | default([] ) }}"
   loop_control:
     loop_var: _host_item
   when:

tasks/summary.yml

@@ -13,8 +13,8 @@
   ansible.builtin.replace:
     path: "{{ rke2_download_kubeconf_path }}/{{ rke2_download_kubeconf_file_name }}"
     mode: '0600'
-    regexp: '127.0.0.1'
-    replace: "{{ rke2_api_ip | default(hostvars[groups[rke2_servers_group_name].0].ansible_host) }}"
+    regexp: '127\.0\.0\.1|\[::1\]'
+    replace: "{{ rke2_api_ip | default(hostvars[groups[rke2_servers_group_name].0].ansible_host) | ansible.utils.ipwrap }}"
   delegate_to: localhost
   become: false
   when:

templates/check_apiserver.sh.j2

@@ -3,7 +3,10 @@ errorExit() {
     echo "*** $*" 1>&2
     exit 1
 }
-curl --silent --max-time 2 --insecure https://localhost:{{rke2_apiserver_dest_port}}/healthz --cert {{rke2_data_path}}/server/tls/client-ca.crt --key {{rke2_data_path}}/server/tls/client-ca.key -o /dev/null || errorExit "Error GET https://localhost:{{rke2_apiserver_dest_port}}/healthz"
-if ip addr | grep -wq {{rke2_api_ip}}; then
-    curl --silent --max-time 2 --insecure https://{{rke2_api_ip}}:{{rke2_apiserver_dest_port}}/healthz --cert {{rke2_data_path}}/server/tls/client-ca.crt --key {{rke2_data_path}}/server/tls/client-ca.key -o /dev/null || errorExit "Error GET https://{{rke2_api_ip}}:{{rke2_apiserver_dest_port}}/healthz"
+testUrl() {
+    curl --silent --max-time 2 --insecure "$1" --cert '{{rke2_data_path}}/server/tls/client-ca.crt' --key '{{rke2_data_path}}/server/tls/client-ca.key' -o /dev/null || errorExit "Error GET $1"
+}
+testUrl 'https://localhost:{{rke2_apiserver_dest_port}}/healthz'
+if ip addr | grep -wq '{{rke2_api_ip}}'; then
+    testUrl 'https://{{rke2_api_ip | ansible.utils.ipwrap}}:{{rke2_apiserver_dest_port}}/healthz'
 fi

templates/check_rke2server.sh.j2

@@ -3,13 +3,16 @@ errorExit() {
     echo "*** $*" 1>&2
     exit 1
 }
-curl --silent --max-time 2 --insecure https://localhost:9345/ -o /dev/null || errorExit "Error GET https://localhost:9345/"
+testUrl() {
+    curl --silent --max-time 2 --insecure "$1" -o /dev/null || errorExit "Error GET $1"
+}
+testUrl https://localhost:9345/
 {% if rke2_api_private_ip is defined %}
-if ip addr | grep -wq {{rke2_api_private_ip}}; then
-    curl --silent --max-time 2 --insecure https://{{rke2_api_private_ip}}:{{ rke2_api_private_port }}/ -o /dev/null || errorExit "Error GET https://{{rke2_api_private_ip}}:{{ rke2_api_private_port }}/"
+if ip addr | grep -wq '{{rke2_api_private_ip}}'; then
+    testUrl 'https://{{rke2_api_private_ip | ansible.utils.ipwrap}}:{{ rke2_api_private_port }}/'
 fi
 {% else %}
-if ip addr | grep -wq {{rke2_api_ip}}; then
-    curl --silent --max-time 2 --insecure https://{{rke2_api_ip}}:9345/ -o /dev/null || errorExit "Error GET https://{{rke2_api_ip}}:9345/"
+if ip addr | grep -wq '{{rke2_api_ip}}'; then
+    testUrl 'https://{{rke2_api_ip | ansible.utils.ipwrap}}:9345/'
 fi
 {% endif %}