Fix systemd reload and calico unit

roles/kubernetes/master/handlers/main.yml

@@ -1,25 +1,16 @@
 ---
-- name: restart systemd-kubelet
-  command: /bin/true
-  notify:
-    - reload systemd
-    - restart kubelet
 
-- name: restart systemd-kube-apiserver
+- name: restart kube-apiserver
   command: /bin/true
   notify:
     - reload systemd
-    - restart kube-apiserver
+    - reload kube-apiserver
 
 - name: reload systemd
   command: systemctl daemon-reload
+  when: init_system == "systemd"
 
-- name: restart kubelet
-  service:
-    name: kubelet
-    state: restarted
-
-- name: restart kube-apiserver
+- name: reload kube-apiserver
   service:
     name: kube-apiserver
     state: restarted

roles/kubernetes/master/tasks/main.yml

@@ -47,7 +47,7 @@
     dest: "/etc/systemd/system/kube-apiserver.service"
     backup: yes
   when: init_system == "systemd"
-  notify: restart systemd-kube-apiserver
+  notify: restart kube-apiserver
 
 - name: install | Write kube-apiserver initd script
   template:
@@ -80,6 +80,9 @@
   notify: restart kube-apiserver
   changed_when: is_gentoken_calico|default(false)
 
+# reload-systemd
+- meta: flush_handlers
+
 - name: Enable apiserver
   service:
     name: kube-apiserver

roles/kubernetes/node/handlers/main.yml

@@ -1,18 +1,19 @@
 ---
 - name: reload systemd
   command: systemctl daemon-reload
+  when: init_system == "systemd"
 
-- name: restart systemd-kubelet
+- name: restart kubelet
   command: /bin/true
   notify:
     - reload systemd
-    - restart kubelet
+    - reload kubelet
 
 - name: set is_gentoken_calico fact
   set_fact:
     is_gentoken_calico: true
 
-- name: restart kubelet
+- name: reload kubelet
   service:
     name: kubelet
     state: restarted

roles/kubernetes/node/tasks/main.yml

@@ -41,7 +41,7 @@
     - restart kubelet
 
 - name: Write proxy manifest
-  template: 
+  template:
     src: manifests/kube-proxy.manifest.j2
     dest: "{{ kube_manifest_dir }}/kube-proxy.manifest"
 
@@ -50,6 +50,9 @@
   notify: restart kubelet
   when: kubelet_copy.stdout_lines
 
+# reload-systemd
+- meta: flush_handlers
+
 - name: Enable kubelet
   service:
     name: kubelet