From 765d211546dbecc5c9d8d654b478402335708408 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Mon, 15 Aug 2022 21:06:09 +0200
Subject: kubernetes/kubeadm: move node-ip kubelet parameter to kubeadm config

---
 roles/kubernetes/kubeadm/base/tasks/main.yml                      | 8 --------
 roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml        | 1 +
 .../kubeadm/control-plane/templates/kubeadm-init.config.j2        | 4 ++++
 .../kubeadm/control-plane/templates/kubeadm-join.config.j2        | 4 ++++
 roles/kubernetes/kubeadm/worker/tasks/main.yml                    | 1 +
 roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2       | 4 ++++
 6 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/roles/kubernetes/kubeadm/base/tasks/main.yml b/roles/kubernetes/kubeadm/base/tasks/main.yml
index 56d7f8d2..3506dce9 100644
--- a/roles/kubernetes/kubeadm/base/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/base/tasks/main.yml
@@ -20,14 +20,6 @@
     state: present
     allow_downgrade: yes
 
-- name: set kubelet node-ip
-  when: kubernetes_overlay_node_ip is defined
-  lineinfile:
-    name: "/etc/default/kubelet"
-    regexp: '^KUBELET_EXTRA_ARGS='
-    line: 'KUBELET_EXTRA_ARGS=--node-ip={{ kubernetes_overlay_node_ip }}'
-    create: yes
-
 - name: add kubeadm config for shells
   loop:
   - zsh
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml b/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml
index 965fb03e..4418101a 100644
--- a/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml
+++ b/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml
@@ -29,6 +29,7 @@
   template:
     src: kubeadm-join.config.j2
     dest: /etc/kubernetes/kubeadm.config
+    mode: 0600
   register: kubeadm_config
 
 - name: join kubernetes secondary control-plane node and store log
diff --git a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2 b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
index d4fb26cf..b6743282 100644
--- a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
+++ b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
@@ -18,6 +18,10 @@ skipPhases:
 nodeRegistration:
   name: "{{ inventory_hostname }}"
   criSocket: "{{ kubernetes_cri_socket }}"
+{% if kubernetes_overlay_node_ip is defined %}
+  kubeletExtraArgs:
+    node-ip: "{{ kubernetes_overlay_node_ip }}"
+{% endif %}
 ---
 apiVersion: kubeadm.k8s.io/v1beta3
 kind: ClusterConfiguration
diff --git a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2 b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2
index 553463bb..77ad480b 100644
--- a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2
+++ b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-join.config.j2
@@ -18,3 +18,7 @@ controlPlane:
 nodeRegistration:
   name: "{{ inventory_hostname }}"
   criSocket: "{{ kubernetes_cri_socket }}"
+{% if kubernetes_overlay_node_ip is defined %}
+  kubeletExtraArgs:
+    node-ip: "{{ kubernetes_overlay_node_ip }}"
+{% endif %}
diff --git a/roles/kubernetes/kubeadm/worker/tasks/main.yml b/roles/kubernetes/kubeadm/worker/tasks/main.yml
index efd14238..1975313b 100644
--- a/roles/kubernetes/kubeadm/worker/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/worker/tasks/main.yml
@@ -3,6 +3,7 @@
   template:
     src: kubeadm.config.j2
     dest: /etc/kubernetes/kubeadm.config
+    mode: 0600
 
 - name: join kubernetes worker node and store log
   block:
diff --git a/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2 b/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2
index 664d31f1..451498cd 100644
--- a/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2
+++ b/roles/kubernetes/kubeadm/worker/templates/kubeadm.config.j2
@@ -11,3 +11,7 @@ discovery:
 nodeRegistration:
   name: "{{ inventory_hostname }}"
   criSocket: "{{ kubernetes_cri_socket }}"
+{% if kubernetes_overlay_node_ip is defined %}
+  kubeletExtraArgs:
+    node-ip: "{{ kubernetes_overlay_node_ip }}"
+{% endif %}
-- 
cgit v1.2.3