Merge pull request #343 from lablabs/feat/ingress-controller

Feat: ingress controller

Author: MonolithProjects

README.md

@@ -22,9 +22,10 @@ The Role can install the RKE2 in 3 modes:
 
 > It is possible to upgrade RKE2 by changing `rke2_version` variable and re-running the playbook with this role. During the upgrade process the RKE2 service on the nodes will be restarted one by one. The Ansible Role will check if the node on which the service was restarted is in Ready state and only then proceed with restarting service on another Kubernetes node.
 
-## Requirements
+## Requirements for Anisble Controller
 
 * Ansible 2.10+
+* `netaddr` Python package
 
 ## Tested on
 
@@ -322,6 +323,9 @@ rke2_agents_group_name: workers
 # rke2_kube_scheduler_arg:
 #   - "bind-address=0.0.0.0"
 
+# Configure Ingress Controller (allowed values: nginx-ingress, traefik, none)
+rke2_ingress_controller: nginx-ingress
+
 # (Optional) Configure nginx via HelmChartConfig: https://docs.rke2.io/networking/networking_services#nginx-ingress-controller
 # rke2_ingress_nginx_values:
 #   controller:

defaults/main.yml

@@ -284,6 +284,9 @@ rke2_agents_group_name: workers
 # rke2_kube_scheduler_arg:
 #   - "bind-address=0.0.0.0"
 
+# Configure Ingress Controller (allowed values: nginx-ingress, traefik, none)
+rke2_ingress_controller: nginx-ingress
+
 # (Optional) Configure nginx via HelmChartConfig: https://docs.rke2.io/networking/networking_services#nginx-ingress-controller
 # rke2_ingress_nginx_values:
 #   controller:

meta/argument_specs.yml

@@ -420,6 +420,11 @@ argument_specs:
         required: false
         description: "Customize default kube-scheduler arguments."
 
+      rke2_ingress_controller:
+        type: str
+        default: "nginx-ingress"
+        description: "Ingress controller to use (nginx-ingress, traefik, or none)"
+
       rke2_ingress_nginx_values:
         type: dict
         default: {}

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:

templates/config.yaml.j2

@@ -99,3 +99,6 @@ service-cidr: "{% for network in rke2_service_cidr %}{{ network }}{% if not loop
 {% if (rke2_selinux | bool ) %}
 selinux: true
 {% endif %}
+{% if rke2_type == 'server' %}
+ingress-controller: {{ rke2_ingress_controller }}
+{% endif %}