fix kubernetes role (still needs love)

4 files changed, 5 insertions, 18 deletions

diff --git a/roles/kubernetes/base/handlers/main.yml b/roles/kubernetes/base/handlers/main.yml
deleted file mode 100644
index b61c1417..00000000
--- a/roles/kubernetes/base/handlers/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: reload systemd
-  command: systemctl daemon-reload
-  args:
-    warn: no
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index e6aee41f..5d26d161 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -56,14 +56,11 @@
     name: "{{ item }}"
     selection: hold
 
-- name: install kubelet config snippets
-  with_items:
-  - 20-dns.conf
-  - 50-extra.conf
-  template:
-    src: "{{ item }}.j2"
-    dest: "/etc/systemd/system/kubelet.service.d/{{ item }}"
-  notify: reload systemd
+- name: set kubelet node-ip
+  lineinfile:
+    name: "/etc/default/kubelet"
+    regexp: '^KUBELET_EXTRA_ARGS='
+    line: 'KUBELET_EXTRA_ARGS=--node-ip={{ kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) | ipaddr(1) | ipaddr("address") }}'
 
 - name: add dummy group with gid 998
   group:
diff --git a/roles/kubernetes/base/templates/20-dns.conf.j2 b/roles/kubernetes/base/templates/20-dns.conf.j2
deleted file mode 100644
index 9b7ab32c..00000000
--- a/roles/kubernetes/base/templates/20-dns.conf.j2
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-Environment="KUBELET_DNS_ARGS=--cluster-dns={{ kubernetes.service_ip_range | ipaddr(10) | ipaddr('address') }} --cluster-domain=cluster.local"
diff --git a/roles/kubernetes/base/templates/50-extra.conf.j2 b/roles/kubernetes/base/templates/50-extra.conf.j2
deleted file mode 100644
index c722ade6..00000000
--- a/roles/kubernetes/base/templates/50-extra.conf.j2
+++ /dev/null
@@ -1,3 +0,0 @@
-{% set br_net = kubernetes.pod_ip_range | ipsubnet(kubernetes.pod_ip_range_size, kubernetes.net_index[inventory_hostname]) -%}
-[Service]
-Environment="KUBELET_EXTRA_ARGS=--node-ip={{ br_net | ipaddr(1) | ipaddr('address') }}"