From 24d5e871628512d3e81ccc0e376e504ba34fae5b Mon Sep 17 00:00:00 2001
From: Simon Ungar Felding <sife@adm.ku.dk>
Date: Fri, 11 Oct 2024 19:42:18 +0200
Subject: [PATCH] make rke2_kubelet_arg set root-dir by default, as it is
 somewhat unintuitive that it does not follow the rke2_data_path

---
 README.md                |  9 +++++----
 defaults/main.yml        | 10 ++++++----
 tasks/first_server.yml   |  2 +-
 templates/config.yaml.j2 |  2 --
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index c29fa0b..140043c 100644
--- a/README.md
+++ b/README.md
@@ -139,6 +139,11 @@ rke2_install_bash_url: https://get.rke2.io
 # Local data directory for RKE2
 rke2_data_path: /var/lib/rancher/rke2
 
+# Extra kubelet arguments (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/)
+rke2_kubelet_arg:
+    - "root-dir=/var/lib/kubelet" # kubelet data directory (/var/lib/kubelet is the default but "{{ rke2_data_path }}/kubelet" could make more sense for you)
+#   - "system-reserved=cpu=100m,memory=100Mi"
+
 # Default URL to fetch artifacts
 rke2_artifact_url: https://github.com/rancher/rke2/releases/download/
 
@@ -322,10 +327,6 @@ rke2_wait_for_all_pods_to_be_ready: false
 # Enable debug mode (rke2-service)
 rke2_debug: false
 
-# (Optional) Customize default kubelet arguments
-# rke2_kubelet_arg:
-#   - "--system-reserved=cpu=100m,memory=100Mi"
-
 # (Optional) Customize default kube-proxy arguments
 # rke2_kube_proxy_arg:
 #   - "proxy-mode=ipvs"
diff --git a/defaults/main.yml b/defaults/main.yml
index bb19979..2d9b02b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -101,6 +101,12 @@ rke2_install_bash_url: https://get.rke2.io
 # Local data directory for RKE2
 rke2_data_path: /var/lib/rancher/rke2
 
+# Extra kubelet arguments (https://kubernetes.io/docs/reference/command-line-tools-reference/kubelet/)
+rke2_kubelet_arg:
+    - "root-dir=/var/lib/kubelet" # kubelet data directory (/var/lib/kubelet is the default)
+#   - "root-dir={{ rke2_data_path }}/kubelet" # using rke2_data_path could make more sense in your setup.
+#   - "system-reserved=cpu=100m,memory=100Mi"
+
 # Default URL to fetch artifacts
 rke2_artifact_url: https://github.com/rancher/rke2/releases/download/
 
@@ -284,10 +290,6 @@ rke2_wait_for_all_pods_to_be_ready: false
 # Enable debug mode (rke2-service)
 rke2_debug: false
 
-# (Optional) Customize default kubelet arguments
-# rke2_kubelet_arg:
-#   - "--system-reserved=cpu=100m,memory=100Mi"
-
 # (Optional) Customize default kube-proxy arguments
 # rke2_kube_proxy_arg:
 #   - "proxy-mode=ipvs"
diff --git a/tasks/first_server.yml b/tasks/first_server.yml
index a87557c..adf3708 100644
--- a/tasks/first_server.yml
+++ b/tasks/first_server.yml
@@ -6,7 +6,7 @@
     path: /etc/rancher/rke2
     owner: root
     group: root
-    mode: 0755
+    mode: 075
 
 - name: Set server taints
   ansible.builtin.set_fact:
diff --git a/templates/config.yaml.j2 b/templates/config.yaml.j2
index a5e6289..d03ae71 100644
--- a/templates/config.yaml.j2
+++ b/templates/config.yaml.j2
@@ -77,12 +77,10 @@ kube-scheduler-arg:
 {% if (rke2_debug | bool ) %}
 debug: true
 {% endif %}
-{% if ( rke2_kubelet_arg is defined ) %}
 kubelet-arg:
 {% for argument in rke2_kubelet_arg %}
   - {{ argument }}
 {% endfor %}
-{% endif %}
 {% if ( rke2_kube_proxy_arg is defined ) %}
 kube-proxy-arg:
 {% for argument in rke2_kube_proxy_arg %}