upgraded

README.md

@@ -181,20 +181,34 @@ ansible-playbook -i inv play.yaml -vv
 
 ```bash
 cat <<EOF > ./play.yaml
-- hosts: all
+---
+- name: Converge
+  hosts: all
+  gather_facts: true
   become: true
 
   vars:
+    rke_state: present #absent
     rke_version: 2
-    rke2_k8s_version: 1.26.0
+    rke2_k8s_version: 1.30.4
     rke2_airgapped_installation: true
-    rke2_release_kind: rke2r2 # rke2r1
+    rke2_release_kind: rke2r1 #rke2r2
+    rke2_cni: cilium
     disable_rke2_components:
       - rke2-ingress-nginx
       - rke-snapshot-controller
     cluster_setup: multinode
-    install_containerd: false # bring your own containerd
-    containerdRootPath: /var/lib/containerd/ # directory must not exist
+    rke2_cni: cilium
+    values_cilium: |
+      ---
+      eni:
+        enabled: true
+
+    helmChartConfig:
+      cilium:
+        name: rke2-cilium
+        namespace: kube-system
+        release_values: "{{ values_cilium }}"
 
   roles:
     - role: deploy-configure-rke

Taskfile.yaml

@@ -21,6 +21,7 @@ tasks:
     cmds:
       - pip install -U setuptools pip 'molecule'
       - pip install molecule-docker
+      - pip install netaddr
       - molecule --version
 
   setup-venv:

defaults/main.yaml

@@ -14,7 +14,7 @@ cluster_setup: multinode
 rke_installscript_url: https://get.rke2.io
 update_packages: true
 rke2_os_packages: curl
-rke2_cni: canal
+rke2_cni: cilium
 kubeconfig_mode_644: true
 rke2_type: server
 rke2_imagelist: rke2-images-all.linux-amd64.txt
@@ -244,4 +244,4 @@ helmChartConfig:
 values_cilium: |
   ---
   eni:
-    enabled: true
+    enabled: true

molecule/default/converge.yml

@@ -3,44 +3,29 @@
   hosts: all
   gather_facts: true
   become: true
-  # tasks:
-  #   - name: Replace this task with one that validates your content
-  #     ansible.builtin.shell: |
-  #       sudo apt-get update -y
 
   vars:
-    #rke_state: absent
+    rke_state: present #absent
     rke_version: 2
-    rke2_k8s_version: 1.26.0
+    rke2_k8s_version: 1.30.4
     rke2_airgapped_installation: true
-    rke2_release_kind: rke2r2 # rke2r1
+    rke2_release_kind: rke2r1 # rke2r2
     rke2_cni: cilium
     disable_rke2_components:
       - rke2-ingress-nginx
       - rke-snapshot-controller
     cluster_setup: multinode
+    rke2_cni: cilium
+    values_cilium: |
+      ---
+      eni:
+        enabled: true
 
-
-
-
+    helmChartConfig:
+      cilium:
+        name: rke2-cilium
+        namespace: kube-system
+        release_values: "{{ values_cilium }}"
 
   roles:
     - role: deploy-configure-rke
-
-# - hosts: all
-#   become: true
-
-#   vars:
-#     rke_version: 2
-#     rke2_k8s_version: 1.26.0
-#     rke2_airgapped_installation: true
-#     rke2_release_kind: rke2r2 # rke2r1
-#     disable_rke2_components:
-#       - rke2-ingress-nginx
-#       - rke-snapshot-controller
-#     cluster_setup: multinode
-#     install_containerd: false # bring your own containerd
-#     containerdRootPath: /var/lib/containerd/ # directory must not exist
-
-#   roles:
-#     - role: deploy-configure-rke