From a789b9bf1f1574c9b95156b8551319ef581ea3e1 Mon Sep 17 00:00:00 2001 From: bacterik Date: Mon, 10 Mar 2025 14:37:29 +0100 Subject: [PATCH 1/3] feat: add Cilium task to main.yml --- tasks/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tasks/main.yml b/tasks/main.yml index 5c42807f..d881e3b8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -45,6 +45,13 @@ - rke2_ingress_nginx_values is defined - rke2_ingress_nginx_values | length > 0 +- name: Copy cilium-config manifests to the masternode + ansible.builtin.include_tasks: cilium.yml + when: + - inventory_hostname == groups[rke2_servers_group_name].0 + - rke2_cilium_values is defined + - rke2_cilium_values | length > 0 + - name: Prepare very first server node in the cluster ansible.builtin.include_tasks: first_server.yml when: From 6f8ed84e687ee9db65bf9c5215b49e742cd1b312 Mon Sep 17 00:00:00 2001 From: bacterik Date: Mon, 10 Mar 2025 14:38:16 +0100 Subject: [PATCH 2/3] feat: add Cilium tasks file --- tasks/cilium.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 tasks/cilium.yml diff --git a/tasks/cilium.yml b/tasks/cilium.yml new file mode 100644 index 00000000..7b1e6802 --- /dev/null +++ b/tasks/cilium.yml @@ -0,0 +1,16 @@ +--- +- name: Create the RKE2 manifests directory + ansible.builtin.file: + state: directory + path: "{{ rke2_data_path }}/server/manifests" + owner: root + group: root + mode: 0700 + +- name: Copy cilium-config files to first server + ansible.builtin.template: + src: "templates/cilium-config.yml.j2" + dest: "{{ rke2_data_path }}/server/manifests/rke2-cilium-config.yaml" + owner: root + group: root + mode: 0664 From d4044f19e7bb2728c22e3f337d146d73f0551f94 Mon Sep 17 00:00:00 2001 From: bacterik Date: Mon, 10 Mar 2025 14:38:57 +0100 Subject: [PATCH 3/3] feat: add Cilium config file template --- templates/cilium-config.yml.j2 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 templates/cilium-config.yml.j2 diff --git a/templates/cilium-config.yml.j2 b/templates/cilium-config.yml.j2 new file mode 100644 index 00000000..0189cb25 --- /dev/null +++ b/templates/cilium-config.yml.j2 @@ -0,0 +1,10 @@ +apiVersion: helm.cattle.io/v1 +kind: HelmChartConfig +metadata: + name: rke2-cilium + namespace: kube-system +spec: + valuesContent: |- +{% if rke2_cilium_values | length > 0 %} + {{ rke2_cilium_values | to_nice_yaml(indent=2) | indent(4) }} +{% endif %}