Merge pull request #349 from lablabs/feat/enhancements

- Option to schedule etcd backup
- Download the rke2.yaml file after the first server is ready, not at the end of the playbook

Author: MonolithProjects

defaults/main.yml

@@ -207,6 +207,10 @@ rke2_etcd_snapshot_file: ""
 # Etcd snapshot location
 rke2_etcd_snapshot_destination_dir: "{{ rke2_data_path }}/server/db/snapshots"
 
+# (Optional) Etcd snapshot schedule
+# The schedule is in cron format, e.g. "0 */12 * * *"
+# rke2_etcd_snapshot_schedule: "0 */12 * * *"
+
 # Etcd snapshot s3 options
 # Set either all these values or `rke2_etcd_snapshot_file` and `rke2_etcd_snapshot_source_dir`
 

meta/argument_specs.yml

@@ -315,6 +315,11 @@ argument_specs:
         default: "{{ rke2_data_path }}/server/db/snapshots"
         description: "Etcd snapshot location"
 
+      rke2_etcd_snapshot_schedule:
+        type: str
+        default: "0 */6 * * *"
+        description: "Etcd snapshot schedule in cron format"
+
       rke2_etcd_snapshot_s3_options:
         type: dict
         required: false

tasks/download_kubeconfig.yaml

@@ -0,0 +1,22 @@
+---
+- name: Download RKE2 kubeconfig to localhost
+  ansible.builtin.fetch:
+    src: /etc/rancher/rke2/rke2.yaml
+    dest: "{{ rke2_download_kubeconf_path }}/{{ rke2_download_kubeconf_file_name }}"
+    flat: yes
+  when:
+  - rke2_download_kubeconf | bool
+  - inventory_hostname == groups[rke2_servers_group_name].0
+
+- name: Replace loopback IP by master server IP
+  ansible.builtin.replace:
+    path: "{{ rke2_download_kubeconf_path }}/{{ rke2_download_kubeconf_file_name }}"
+    mode: '0600'
+    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:
+  - not ansible_check_mode
+  - rke2_download_kubeconf | bool
+  - inventory_hostname == groups[rke2_servers_group_name].0

tasks/main.yml

@@ -58,6 +58,12 @@
     - inventory_hostname == active_server or inventory_hostname == groups[rke2_servers_group_name].0
     - do_etcd_restore is defined or do_etcd_restore_from_s3 is defined
 
+- name: Download kubeconfig to ansible localhost
+  ansible.builtin.include_tasks: download_kubeconfig.yaml
+  when:
+    - rke2_download_kubeconf | bool
+    - inventory_hostname == groups[rke2_servers_group_name].0
+
 - name: Prepare and join remaining nodes of the cluster
   ansible.builtin.include_tasks: remaining_nodes.yml
   when:

tasks/summary.yml

@@ -1,27 +1,4 @@
 ---
-
-- name: Download RKE2 kubeconfig to localhost
-  ansible.builtin.fetch:
-    src: /etc/rancher/rke2/rke2.yaml
-    dest: "{{ rke2_download_kubeconf_path }}/{{ rke2_download_kubeconf_file_name }}"
-    flat: yes
-  when:
-  - rke2_download_kubeconf | bool
-  - inventory_hostname == groups[rke2_servers_group_name].0
-
-- name: Replace loopback IP by master server IP
-  ansible.builtin.replace:
-    path: "{{ rke2_download_kubeconf_path }}/{{ rke2_download_kubeconf_file_name }}"
-    mode: '0600'
-    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:
-  - not ansible_check_mode
-  - rke2_download_kubeconf | bool
-  - inventory_hostname == groups[rke2_servers_group_name].0
-
 - name: Summary
   when: inventory_hostname == groups[rke2_servers_group_name].0
   block:

templates/config.yaml.j2

@@ -44,6 +44,9 @@ node-label:
 {% endfor %}
 {% endif %}
 snapshotter: {{ rke2_snapshotter }}
+{% if rke2_etcd_snapshot_schedule is defined %}
+etcd-snapshot-schedule-cron: "{{ rke2_etcd_snapshot_schedule }}"
+{% endif %}
 node-name: {{ rke2_node_name }}
 {% if ( disable_kube_proxy | bool ) %}
 disable-kube-proxy: true